WIP for #599

Author: oharsta

server/src/main/java/invite/internal/InternalInviteController.java

@@ -92,6 +92,7 @@ public InternalInviteController(RoleRepository roleRepository,
 
     @GetMapping("/roles")
     @PreAuthorize("hasAnyRole('SP_DASHBOARD','ACCESS')")
+    @Transactional(readOnly = true)
     @Hidden
     public ResponseEntity<List<Role>> rolesByApplication(@Parameter(hidden = true) @AuthenticationPrincipal RemoteUser remoteUser) {
         LOG.debug(String.format("/roles for user %s", remoteUser.getName()));
@@ -105,6 +106,19 @@ public ResponseEntity<List<Role>> rolesByApplication(@Parameter(hidden = true) @
         return ResponseEntity.ok(roles);
     }
 
+    @GetMapping("/roles/{organizationGUID}/{manageId}")
+    @PreAuthorize("hasRole('ACCESS')")
+    @Transactional(readOnly = true)
+    public ResponseEntity<List<Role>> rolesPerOrganizationApplicationId(@PathVariable("organizationGUID") String organizationGUID,
+                                                                        @PathVariable("manageId") String manageId,
+                                                                        @Parameter(hidden = true) @AuthenticationPrincipal RemoteUser remoteUser) {
+        LOG.debug(String.format("/rolesPerApplicationId for remoteUser %s", remoteUser.getName()));
+
+        List<Role> roles = roleRepository
+                .findByOrganizationGUIDAndApplicationUsagesApplicationManageId(organizationGUID, manageId);
+        return ResponseEntity.ok(roles);
+    }
+
     @GetMapping("/roles/{id}")
     @PreAuthorize("hasAnyRole('SP_DASHBOARD','ACCESS')")
     @Hidden

server/src/test/java/invite/internal/InternalInviteControllerTest.java

@@ -210,4 +210,26 @@ void userRolesByRole() {
         assertEquals(2, userRoles.size());
     }
 
+    @Test
+    void rolesPerOrganizationApplicationId() {
+        List<Role> roles = given()
+                .when()
+                .auth().preemptive().basic("access", "secret")
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .pathParam("organizationGUID", ORGANISATION_GUID)
+                //See Role research in AbstractTest#doSeed
+                .pathParam("manageId", "4")
+                .get("/api/external/v1/internal/invite/roles/{organizationGUID}/{manageId}")
+                .as(new TypeRef<>() {
+                });
+
+        assertEquals(1, roles.size());
+
+        Role role = roles.getFirst();
+        assertEquals("Research", role.getName());
+        assertEquals(2L, role.getUserRoleCount());
+    }
+
+
 }