Skip to content

move element exists to explore server #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mathieu-Deharbe merged 8 commits into from
Oct 30, 2026
Merged

move element exists to explore server #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77e6f02
move element exists to explore server
EtienneLt Oct 27, 2026
c4a2692
Merge branch 'main' into move-elements-exist-to-explore-server
EtienneLt Oct 27, 2026
5d59b14
Merge branch 'main' into move-elements-exist-to-explore-server
EtienneLt Oct 27, 2026
49391e7
fix tests
EtienneLt Oct 27, 2026
477c5a2
Merge branch 'main' into move-elements-exist-to-explore-server
EtienneLt Oct 29, 2026
c0f31fe
Merge branch 'main' into move-elements-exist-to-explore-server
EtienneLt Oct 29, 2026
8370f7e
Merge branch 'main' into move-elements-exist-to-explore-server
EtienneLt Oct 29, 2026
990d7c0
Merge branch 'main' into move-elements-exist-to-explore-server
Mathieu-Deharbe Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/main/java/org/gridsuite/study/server/controller/DirectoryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,4 @@ public ResponseEntity<String> getElements(@RequestParam("ids") List<UUID> ids,
@RequestHeader("userId") String userId) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(directoryService.getElements(ids, elementTypes, strictMode, userId));
}

@RequestMapping(method = RequestMethod.HEAD, value = "/directories/{directoryUuid}/elements/{elementName}/types/{type}")
public ResponseEntity<Void> elementExists(@PathVariable UUID directoryUuid,
@PathVariable String elementName,
@PathVariable String type) {
return directoryService.elementExists(directoryUuid, elementName, type) ? ResponseEntity.ok().build() : ResponseEntity.noContent().build();
}
}
23 changes: 0 additions & 23 deletions src/test/java/org/gridsuite/study/server/controller/DirectoryControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.head;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

Expand Down Expand Up @@ -59,26 +58,4 @@ void testGetElements() throws Exception {

verify(directoryService).getElements(List.of(elementUuid), List.of("STUDY"), false, USER_ID);
}

@Test
void testElementExists() throws Exception {
UUID directoryUuid = UUID.randomUUID();
when(directoryService.elementExists(directoryUuid, "elementName", "STUDY")).thenReturn(true);

mockMvc.perform(head(BASE_URL + "/directories/{directoryUuid}/elements/{elementName}/types/{type}", directoryUuid, "elementName", "STUDY"))
.andExpect(status().isOk())
.andExpect(content().string(""));

verify(directoryService).elementExists(directoryUuid, "elementName", "STUDY");
}

@Test
void testElementDoesNotExist() throws Exception {
UUID directoryUuid = UUID.randomUUID();
when(directoryService.elementExists(directoryUuid, "elementName", "STUDY")).thenReturn(false);

mockMvc.perform(head(BASE_URL + "/directories/{directoryUuid}/elements/{elementName}/types/{type}", directoryUuid, "elementName", "STUDY"))
.andExpect(status().isNoContent())
.andExpect(content().string(""));
}
}
Loading