EPMRPP-89198 organizations routing refactoring

reportportal · Feb 15, 2024 · e56c48f · e56c48f
1 parent e94e598
commit e56c48f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/model/user/UserResource.java b/src/main/java/com/epam/ta/reportportal/model/user/UserResource.java
@@ -80,6 +80,8 @@ public static class AssignedProject {
     private String projectRole;
     private String entryType;
     private String projectKey;
+    private String projectSlug;
+    private Long organizationId;
 
   }
 
@@ -88,9 +90,10 @@ public static class AssignedProject {
   @ToString
   public static class AssignedOrganization {
 
+    private Long organizationId;
     private String organizationRole;
-    private String organizationName;
     private String organizationSlug;
+    private String organizationName;
 
   }
 

diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ProjectSettingsConverter.java
@@ -49,6 +49,8 @@ private ProjectSettingsConverter() {
         resource.setLaunchesQuantity(project.getLaunchesQuantity());
         resource.setProjectId(project.getId());
         resource.setProjectName(project.getName());
+        resource.setProjectKey(project.getProjectKey());
+        resource.setProjectSlug(project.getProjectSlug());
         resource.setCreationDate(EntityUtils.TO_DATE.apply(project.getCreationDate()));
         resource.setLastRun(ofNullable(project.getLastRun()).map(EntityUtils.TO_DATE).orElse(null));
         resource.setEntryType(project.getProjectType());

diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/UserConverter.java
@@ -65,7 +65,8 @@ private UserConverter() {
             assignedProject.setEntryType(p.getProject().getProjectType().name());
             assignedProject.setProjectRole(p.getProjectRole().toString());
             assignedProject.setProjectKey(p.getProject().getKey());
-            assignedProject.setProjectKey(p.getProject().getOrganization().getSlug());
+            assignedProject.setProjectSlug(p.getProject().getSlug());
+            assignedProject.setOrganizationId(p.getProject().getOrganization().getId());
             return assignedProject;
           }));
       resource.setAssignedProjects(userProjects);
@@ -78,6 +79,7 @@ private UserConverter() {
           .collect(Collectors.toMap(orgUser -> orgUser.getOrganization().getSlug(),
               orgUser -> {
                 UserResource.AssignedOrganization assignedOrganization = new UserResource.AssignedOrganization();
+                assignedOrganization.setOrganizationId(orgUser.getOrganization().getId());
                 assignedOrganization.setOrganizationSlug(orgUser.getOrganization().getSlug());
                 assignedOrganization.setOrganizationName(orgUser.getOrganization().getName());
                 assignedOrganization.setOrganizationRole(orgUser.getOrganizationRole().name());