Enhance Flexibility of the IsSoleOwner API Endpoint (#1048)

uhawaii-system-its-ti-iam · Nov 14, 2024 · 198fb9e · 198fb9e
1 parent 5a7dcbc
commit 198fb9e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java b/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java
@@ -614,15 +614,14 @@ public ResponseEntity<String> setOptOut(
     }
 
     /**
-     * Checks if the owner of a grouping is the sole owner
+     * Get the number of owners of the group path that contains the owner with uhIdentifier
      */
-    @GetMapping(value = "/{path:.+}/owners/{uidToCheck}")
-    public ResponseEntity<String> isSoleOwner(@PathVariable String path,
-            @PathVariable String uidToCheck) {
-        logger.info("Entered REST isSoleOwner...");
+    @GetMapping(value = "/{path:.+}/owners/{uhIdentifier}/count")
+    public ResponseEntity<String> getNumberOfOwners(@PathVariable String path,
+            @PathVariable String uhIdentifier) {
+        logger.info("Entered REST getNumberOfOwners...");
         String currentUid = policy.sanitize(userContextService.getCurrentUid());
-        String baseUri = String.format(API_2_1_BASE + "/groupings/%s/owners/%s", path, uidToCheck);
-
+        String baseUri = String.format(API_2_1_BASE + "/members/%s/owners/%s/count", path, uhIdentifier);
         return httpRequestService.makeApiRequest(currentUid, baseUri, HttpMethod.GET);
     }
 

diff --git a/src/main/resources/static/javascript/mainApp/admin.controller.js b/src/main/resources/static/javascript/mainApp/admin.controller.js
@@ -41,7 +41,7 @@
             $scope.adminsList = _.sortBy(res.members, "name");
             $scope.pagedItemsAdmins = $scope.objToPageArray($scope.adminsList, PAGE_SIZE);
             $scope.loading = false;
-        }
+        };
 
         /**
          * Callback which takes the admin tab data and moves it into groupingsList, the object
@@ -51,7 +51,7 @@
             $scope.groupingsList = _.sortBy(res.groupingPaths, "name");
             $scope.pagedItemsGroupings = $scope.objToPageArray($scope.groupingsList, PAGE_SIZE);
             $scope.allGroupingsLoading = false;
-        }
+        };
 
         /**
          * Complete initialization by fetching a list of admins and list of all groupings.
@@ -79,7 +79,7 @@
             $scope.subjectList = _.sortBy(res.results, "name");
             $scope.filter($scope.subjectList, "pagedItemsSubject", "currentPageSubject", $scope.subjectQuery, true);
             $scope.user = $scope.subjectToLookup;
-            $scope.userGroupingInformationLoading = false
+            $scope.userGroupingInformationLoading = false;
         };
         $scope.searchForUserGroupingInformationOnErrorCallback = (res) => {
             $scope.subjectList = [];
@@ -151,8 +151,8 @@
                 $scope.removeFromGroupsCallbackOnSuccess(memberToRemove);
             }
             _.forEach($scope.selectedOwnedGroupings, (grouping) => {
-                    groupingsService.isSoleOwner(grouping.path, memberToRemove.uid, (res) => {
-                        if (res) {
+                    groupingsService.getNumberOfOwners(grouping.path, memberToRemove.uid, (res) => {
+                        if (res === 1) {
                             $scope.soleOwnerGroupingNames.push(grouping.name);
                         }
                         if (grouping === $scope.selectedOwnedGroupings[$scope.selectedOwnedGroupings.length - 1]) {
@@ -471,10 +471,11 @@
         };
 
         $scope.throwException = () => {
-            groupingsService.throwException(() => {}, () => {
+            groupingsService.throwException(() => {
+            }, () => {
                 $scope.displayApiErrorModal();
             });
-        }
+        };
     }
 
     UHGroupingsApp.controller("AdminJsController", AdminJsController);

diff --git a/src/main/resources/static/javascript/mainApp/groupings.service.js b/src/main/resources/static/javascript/mainApp/groupings.service.js
@@ -423,8 +423,8 @@
             /**
              * Checks if the owner of a grouping is the sole owner
              */
-            isSoleOwner(path, uidToCheck, onSuccess, onError) {
-                let endpoint = BASE_URL + path + "/owners/" + uidToCheck;
+            getNumberOfOwners(path, uidToCheck, onSuccess, onError) {
+                let endpoint = BASE_URL + path + "/owners/" + uidToCheck + "/count";
                 dataProvider.loadData(endpoint, onSuccess, onError);
             },
 

diff --git a/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerTest.java b/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerTest.java
@@ -743,8 +743,8 @@ public void setOptOut() throws Exception {
 
     @Test
     @WithMockUhUser
-    public void isSoleOwner() throws Exception {
-        String uri = REST_CONTROLLER_BASE + GROUPING + "/owners/" + UID;
+    public void getNumberOfOwners() throws Exception {
+        String uri = REST_CONTROLLER_BASE + GROUPING + "/owners/" + UID + "/count";
 
         given(httpRequestService.makeApiRequest(eq(UID), anyString(), eq(HttpMethod.GET)))
                 .willReturn(new ResponseEntity(HttpStatus.OK));