feat(api): project members & teams: add roles support + tests

src/main/java/com/crowdin/client/core/model/LanguageAccessRule.java

@@ -0,0 +1,9 @@
+package com.crowdin.client.core.model;
+
+import lombok.Data;
+
+@Data
+public class LanguageAccessRule {
+    private boolean allContent;
+    private Object workflowStepIds;
+}

src/main/java/com/crowdin/client/teams/model/AddTeamToProjectRequest.java

@@ -1,12 +1,16 @@
 package com.crowdin.client.teams.model;
 
+import com.crowdin.client.users.model.TranslatorRole;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AddTeamToProjectRequest {
 
     private Long teamId;
     private Boolean accessToAllWorkflowSteps;
     private Boolean managerAccess;
     private Object permissions;
+    private List<TranslatorRole> roles;
 }

src/main/java/com/crowdin/client/teams/model/ProjectTeamResource.java

@@ -1,12 +1,16 @@
 package com.crowdin.client.teams.model;
 
+import com.crowdin.client.users.model.TranslatorRole;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProjectTeamResource {
 
     private Long id;
     private boolean hasManagerAccess;
     private boolean hasAccessToAllWorkflowSteps;
     private Object permissions;
+    private List<TranslatorRole> roles;
 }

src/main/java/com/crowdin/client/users/model/AddProjectMemberRequest.java

@@ -12,4 +12,5 @@ public class AddProjectMemberRequest {
     private Boolean accessToAllWorkflowSteps;
     private Boolean managerAccess;
     private Map<String, LanguagePermission> permissions;
+    private List<TranslatorRole> roles;
 }

src/main/java/com/crowdin/client/users/model/ProjectMember.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -16,5 +17,6 @@ public class ProjectMember {
     private ManagerOfGroup managerOfGroup;
     private boolean accessToAllWorkflowSteps;
     private Map<String, LanguagePermission> permissions;
+    private List<TranslatorRole> roles;
     private Date lastSeen;
 }

src/main/java/com/crowdin/client/users/model/ReplaceProjectMemberPermissionsRequest.java

@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -10,4 +11,5 @@ public class ReplaceProjectMemberPermissionsRequest {
     private Boolean accessToAllWorkflowSteps;
     private Boolean managerAccess;
     private Map<String, LanguagePermission> permissions;
+    private List<TranslatorRole> roles;
 }

src/main/java/com/crowdin/client/users/model/TranslatorRole.java

@@ -0,0 +1,9 @@
+package com.crowdin.client.users.model;
+
+import lombok.Data;
+
+@Data
+public class TranslatorRole {
+    private TranslatorRoleName name;
+    private TranslatorRolePermissions permissions;
+}

src/main/java/com/crowdin/client/users/model/TranslatorRoleName.java

@@ -0,0 +1,16 @@
+package com.crowdin.client.users.model;
+
+import com.crowdin.client.core.model.EnumConverter;
+
+public enum TranslatorRoleName implements EnumConverter<TranslatorRoleName> {
+    TRANSLATOR, PROOFREADER;
+
+    public static TranslatorRoleName from(String value){
+        return TranslatorRoleName.valueOf(value.toUpperCase());
+    }
+
+    @Override
+    public Object to(TranslatorRoleName v) {
+        return v.name().toLowerCase();
+    }
+}

src/main/java/com/crowdin/client/users/model/TranslatorRolePermissions.java

@@ -0,0 +1,12 @@
+package com.crowdin.client.users.model;
+
+import com.crowdin.client.core.model.LanguageAccessRule;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class TranslatorRolePermissions {
+    private boolean allLanguages;
+    private Map<String, LanguageAccessRule> languagesAccess;
+}

src/test/java/com/crowdin/client/teams/TeamsApiTest.java

@@ -1,5 +1,6 @@
 package com.crowdin.client.teams;
 
+import com.crowdin.client.core.model.LanguageAccessRule;
 import com.crowdin.client.core.model.PatchOperation;
 import com.crowdin.client.core.model.PatchRequest;
 import com.crowdin.client.core.model.ResponseList;
@@ -13,17 +14,23 @@
 import com.crowdin.client.teams.model.ProjectTeamResources;
 import com.crowdin.client.teams.model.Team;
 import com.crowdin.client.teams.model.TeamMember;
+import com.crowdin.client.users.model.TranslatorRole;
+import com.crowdin.client.users.model.TranslatorRoleName;
+import com.crowdin.client.users.model.TranslatorRolePermissions;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPatch;
 import org.apache.http.client.methods.HttpPost;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TeamsApiTest extends TestClient {
 
@@ -52,8 +59,32 @@ public List<RequestMock> getMocks() {
     public void addTeamToProjectTest() {
         AddTeamToProjectRequest request = new AddTeamToProjectRequest();
         request.setTeamId(teamId);
+        request.setRoles(Collections.singletonList(new TranslatorRole() {{
+            setName(TranslatorRoleName.TRANSLATOR);
+            setPermissions(new TranslatorRolePermissions(){{
+                setAllLanguages(false);
+                setLanguagesAccess(new HashMap<String, LanguageAccessRule>() {{
+                    put("uk", new LanguageAccessRule(){{
+                        setAllContent(false);
+                        setWorkflowStepIds(Collections.singletonList(882));
+                    }});
+                    put("it", new LanguageAccessRule(){{
+                        setAllContent(true);
+                    }});
+                }});
+            }});
+        }}));
         ProjectTeamResources projectTeamResources = this.getTeamsApi().addTeamToProject(projectId, request);
         assertEquals(projectTeamResources.getAdded().getId(), teamId);
+
+        TranslatorRole responseRole = projectTeamResources.getAdded().getRoles().get(0);
+        assertEquals(responseRole.getName(), TranslatorRoleName.TRANSLATOR);
+        assertFalse(responseRole.getPermissions().isAllLanguages());
+
+        Map<String, LanguageAccessRule> responseRules = responseRole.getPermissions().getLanguagesAccess();
+        assertFalse(responseRules.get("uk").isAllContent());
+        assertEquals(responseRules.get("uk").getWorkflowStepIds(), Collections.singletonList(882));
+        assertTrue(responseRules.get("it").isAllContent());
     }
 
     @Test

src/test/java/com/crowdin/client/users/UsersApiTest.java

@@ -1,5 +1,6 @@
 package com.crowdin.client.users;
 
+import com.crowdin.client.core.model.LanguageAccessRule;
 import com.crowdin.client.core.model.PatchOperation;
 import com.crowdin.client.core.model.PatchRequest;
 import com.crowdin.client.core.model.ResponseList;
@@ -14,10 +15,10 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class UsersApiTest extends TestClient {
 
@@ -61,12 +62,32 @@ public void listProjectTeamMembersEnterpriseTest() {
         assertNotNull(responseList);
         assertEquals(responseList.getData().size(), 1);
         assertEquals(responseList.getData().get(0).getData().getId(), this.userId);
+
+        TranslatorRole role = responseList.getData().get(0).getData().getRoles().get(0);
+        assertEquals(role.getName(), TranslatorRoleName.TRANSLATOR);
+        assertTrue(role.getPermissions().isAllLanguages());
     }
 
     @Test
     public void addProjectTeamMemberTest() {
         AddProjectMemberRequest request = new AddProjectMemberRequest();
         request.setUserIds(singletonList(userId));
+        request.setRoles(Collections.singletonList(new TranslatorRole() {{
+            setName(TranslatorRoleName.TRANSLATOR);
+            setPermissions(new TranslatorRolePermissions(){{
+                setAllLanguages(false);
+                setLanguagesAccess(new HashMap<String, LanguageAccessRule>() {{
+                    put("uk", new LanguageAccessRule(){{
+                        setAllContent(false);
+                        setWorkflowStepIds(Collections.singletonList(882));
+                    }});
+                    put("it", new LanguageAccessRule(){{
+                        setAllContent(true);
+                    }});
+                }});
+            }});
+        }}));
+
         LanguagePermission languagePermission = new LanguagePermission();
         languagePermission.setWorkflowStepIds("all");
         request.setPermissions(Collections.singletonMap(
@@ -75,6 +96,15 @@ public void addProjectTeamMemberTest() {
         ProjectMembersResponse projectMembersResponse = this.getUsersApi().addProjectMember(projectId, request);
         assertEquals(projectMembersResponse.getAdded().size(), 1);
         assertEquals(projectMembersResponse.getAdded().get(0).getData().getId(), userId);
+
+        TranslatorRole responseRole = projectMembersResponse.getAdded().get(0).getData().getRoles().get(0);
+        assertEquals(responseRole.getName(), TranslatorRoleName.TRANSLATOR);
+        assertFalse(responseRole.getPermissions().isAllLanguages());
+
+        Map<String, LanguageAccessRule> responseRules = responseRole.getPermissions().getLanguagesAccess();
+        assertFalse(responseRules.get("uk").isAllContent());
+        assertEquals(responseRules.get("uk").getWorkflowStepIds(), Collections.singletonList(882));
+        assertTrue(responseRules.get("it").isAllContent());
     }
 
     @Test
@@ -97,10 +127,34 @@ public void replaceProjectMemberPermissionsTest() {
                     setWorkflowStepIds("all");
                 }});
             }});
+            setRoles(Collections.singletonList(new TranslatorRole() {{
+                setName(TranslatorRoleName.PROOFREADER);
+                setPermissions(new TranslatorRolePermissions(){{
+                    setAllLanguages(false);
+                    setLanguagesAccess(new HashMap<String, LanguageAccessRule>() {{
+                        put("uk", new LanguageAccessRule(){{
+                            setAllContent(false);
+                            setWorkflowStepIds(Collections.singletonList(882));
+                        }});
+                        put("it", new LanguageAccessRule(){{
+                            setAllContent(true);
+                        }});
+                    }});
+                }});
+            }}));
         }};
         ResponseObject<ProjectMember> response = this.getUsersApi().replaceProjectMemberPermissions(this.projectId, this.memberId, request);
         assertNotNull(response);
         assertNotNull(response.getData());
+
+        TranslatorRole responseRole = response.getData().getRoles().get(0);
+        assertEquals(responseRole.getName(), TranslatorRoleName.PROOFREADER);
+        assertFalse(responseRole.getPermissions().isAllLanguages());
+
+        Map<String, LanguageAccessRule> responseRules = responseRole.getPermissions().getLanguagesAccess();
+        assertFalse(responseRules.get("uk").isAllContent());
+        assertEquals(responseRules.get("uk").getWorkflowStepIds(), Collections.singletonList(882));
+        assertTrue(responseRules.get("it").isAllContent());
     }
 
     @Test

src/test/resources/api/teams/addTeamToProjectRequest.json

@@ -1,3 +1,20 @@
 {
-  "teamId": 1
+  "teamId": 1,
+  "roles": [
+    {
+      "name": "translator",
+      "permissions": {
+        "allLanguages": false,
+        "languagesAccess": {
+          "uk": {
+            "allContent": false,
+            "workflowStepIds": [ 882 ]
+          },
+          "it": {
+            "allContent": true
+          }
+        }
+      }
+    }
+  ]
 }

src/test/resources/api/teams/projectTeamResources.json

@@ -10,6 +10,23 @@
           313
         ]
       }
-    }
+    },
+    "roles": [
+      {
+        "name": "translator",
+        "permissions": {
+          "allLanguages": false,
+          "languagesAccess": {
+            "uk": {
+              "allContent": false,
+              "workflowStepIds": [ 882 ]
+            },
+            "it": {
+              "allContent": true
+            }
+          }
+        }
+      }
+    ]
   }
 }

src/test/resources/api/users/addProjectMember.json

@@ -6,5 +6,22 @@
     "de": {
       "workflowStepIds": "all"
     }
-  }
+  },
+  "roles": [
+    {
+      "name": "translator",
+      "permissions": {
+        "allLanguages": false,
+        "languagesAccess": {
+          "uk": {
+            "allContent": false,
+            "workflowStepIds": [ 882 ]
+          },
+          "it": {
+            "allContent": true
+          }
+        }
+      }
+    }
+  ]
 }

src/test/resources/api/users/listProjectMembersEnterprise.json

@@ -19,6 +19,14 @@
             ]
           }
         },
+        "roles": [
+          {
+            "name": "translator",
+            "permissions": {
+              "allLanguages": true
+            }
+          }
+        ],
         "givenAccessAt": "2019-10-23T11:44:02+00:00"
       }
     }

src/test/resources/api/users/projectTeamMembers.json

@@ -43,6 +43,23 @@
             ]
           }
         },
+        "roles": [
+          {
+            "name": "translator",
+            "permissions": {
+              "allLanguages": false,
+              "languagesAccess": {
+                "uk": {
+                  "allContent": false,
+                  "workflowStepIds": [ 882 ]
+                },
+                "it": {
+                  "allContent": true
+                }
+              }
+            }
+          }
+        ],
         "lastSeen": "2019-10-23T11:44:02+00:00"
       }
     }