diff --git a/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java b/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java index 55aefd075..962813dfa 100644 --- a/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java +++ b/src/main/java/edu/hawaii/its/api/controller/GroupingsRestController.java @@ -574,7 +574,7 @@ public ResponseEntity updateDescription( * This allows an owner of a Grouping to enable/disable that a Grouping connected to a given sync * destination. */ - @PostMapping(value = "/groupings/{path}/syncDests/{syncDestId}/{status:true|false}") + @PostMapping(value = "/groupings/{path}/syncDests/{syncDestId}/{status}") public ResponseEntity updateSyncDest( @PathVariable String path, @PathVariable String syncDestId, diff --git a/src/main/resources/static/javascript/mainApp/groupings.service.js b/src/main/resources/static/javascript/mainApp/groupings.service.js index 58a26f31b..75e7c49f6 100644 --- a/src/main/resources/static/javascript/mainApp/groupings.service.js +++ b/src/main/resources/static/javascript/mainApp/groupings.service.js @@ -391,8 +391,8 @@ /** * Toggle the given sync destination. */ - updateSyncDest(path, syncDestId, turnOn, onSuccess, onError) { - let endpoint = `${BASE_URL}groupings/${path}/syncDests/${syncDestId}/${turnOn}`; + updateSyncDest(path, syncDestId, status, onSuccess, onError) { + let endpoint = `${BASE_URL}groupings/${path}/syncDests/${syncDestId}/${status}`; dataProvider.updateData(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 index 414b00cd9..b101d5f7a 100644 --- a/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerTest.java +++ b/src/test/java/edu/hawaii/its/api/controller/GroupingsRestControllerTest.java @@ -669,36 +669,30 @@ public void updateDescriptionTest() throws Exception { @Test @WithMockUhUser - public void enableSyncDestTest() throws Exception { - String uri = REST_CONTROLLER_BASE + "groupings/" + GROUPING + "/syncDests/listserv/enable"; + public void updateSyncDestTest() throws Exception { + String uri = REST_CONTROLLER_BASE + "groupings/" + GROUPING + "/syncDests/listserv/"; + String enableUri = uri + "true"; given(httpRequestService.makeApiRequest(eq(UID), anyString(), eq(HttpMethod.PUT))) - .willReturn(new ResponseEntity(HttpStatus.OK)); + .willReturn(new ResponseEntity<>(HttpStatus.OK)); - assertNotNull(mockMvc.perform(post(uri).with(csrf())) + assertNotNull(mockMvc.perform(post(enableUri).with(csrf())) .andExpect(status().isOk()) .andReturn()); verify(httpRequestService, times(1)) .makeApiRequest(eq(UID), anyString(), eq(HttpMethod.PUT)); - } - - @Test - @WithMockUhUser - public void disableSyncDestTest() throws Exception { - String uri = REST_CONTROLLER_BASE + "groupings/" + GROUPING + "/syncDests/listserv/disable"; - + String disableUri = uri + "false"; given(httpRequestService.makeApiRequest(eq(UID), anyString(), eq(HttpMethod.PUT))) - .willReturn(new ResponseEntity(HttpStatus.OK)); + .willReturn(new ResponseEntity<>(HttpStatus.OK)); - assertNotNull(mockMvc.perform(post(uri).with(csrf())) + assertNotNull(mockMvc.perform(post(disableUri).with(csrf())) .andExpect(status().isOk()) .andReturn()); - verify(httpRequestService, times(1)) + verify(httpRequestService, times(2)) .makeApiRequest(eq(UID), anyString(), eq(HttpMethod.PUT)); } - @Test @WithMockUhUser public void setOptInTrueTest() throws Exception {