Skip to content

Commit

Permalink
Added assigment projects for user model
Browse files Browse the repository at this point in the history
  • Loading branch information
nvborisenko committed May 13, 2019
1 parent be0a1b9 commit 806a228
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
9 changes: 8 additions & 1 deletion ReportPortal.Client.Tests/User/UserFixture.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using ReportPortal.Client.Models;
using System.Threading.Tasks;
using Xunit;

namespace ReportPortal.Client.Tests.User
Expand All @@ -11,6 +12,12 @@ public async Task GetUserInfo()
var user = await Service.GetUserAsync();
Assert.Equal("Used for Net integration check via CI", user.Fullname);
Assert.NotEmpty(user.Email);

Assert.NotNull(user.AssignedProjects);
Assert.NotEmpty(user.AssignedProjects.Keys);

Assert.Contains("ci-agents-checks", user.AssignedProjects.Keys);
Assert.Equal(ProjectRole.Member, user.AssignedProjects["ci-agents-checks"].ProjectRole);
}
}
}
32 changes: 31 additions & 1 deletion ReportPortal.Client/Models/User.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Runtime.Serialization;
using ReportPortal.Client.Converters;
using System.Collections.Generic;
using System.Runtime.Serialization;

namespace ReportPortal.Client.Models
{
Expand All @@ -10,5 +12,33 @@ public class User

[DataMember(Name = "email")]
public string Email { get; set; }

[DataMember(Name = "assigned_projects")]
public IDictionary<string, ProjectAssigment> AssignedProjects { get; set; }
}

[DataContract]
public class ProjectAssigment
{
[DataMember(Name = "projectRole")]
public string ProjectRoleString { get; set; }

public ProjectRole ProjectRole
{
get => EnumConverter.ConvertTo<ProjectRole>(ProjectRoleString);
set => ProjectRoleString = EnumConverter.ConvertFrom(value);
}
}

public enum ProjectRole
{
[DataMember(Name = "PROJECT_MANAGER")]
ProjectManager,
[DataMember(Name = "MEMBER")]
Member,
[DataMember(Name = "OPERATOR")]
Operator,
[DataMember(Name = "CUSTOMER")]
Customer
}
}

0 comments on commit 806a228

Please sign in to comment.