From e3f3ea754591bbc5f262b0b6e10d914e750ec678 Mon Sep 17 00:00:00 2001 From: maissa SOUISSI Date: Fri, 1 Mar 2024 13:59:07 +0100 Subject: [PATCH 1/2] add description for parameters Signed-off-by: maissa SOUISSI --- .../java/org/gridsuite/explore/server/ExploreController.java | 3 ++- .../org/gridsuite/explore/server/services/ExploreService.java | 4 ++-- src/test/java/org/gridsuite/explore/server/ExploreTest.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/ExploreController.java b/src/main/java/org/gridsuite/explore/server/ExploreController.java index b6bc9c95..f12d83e1 100644 --- a/src/main/java/org/gridsuite/explore/server/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/ExploreController.java @@ -313,9 +313,10 @@ public ResponseEntity updateParameters(@PathVariable UUID id, public ResponseEntity duplicateParameters(@RequestParam("duplicateFrom") UUID parentParameterId, @RequestParam("name") String parametersName, @RequestParam(name = QUERY_PARAM_PARAMETERS_TYPE, defaultValue = "") ParametersType parametersType, + @RequestParam("description") String description, @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid, @RequestHeader("userId") String userId) { - exploreService.duplicateParameters(parentParameterId, parametersType, parametersName, parentDirectoryUuid, userId); + exploreService.duplicateParameters(parentParameterId, parametersType, parametersName, description, parentDirectoryUuid, userId); return ResponseEntity.ok().build(); } diff --git a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java index bb70e4d2..4f6c4a49 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java @@ -259,10 +259,10 @@ public void updateParameters(UUID id, String parameters, ParametersType paramete updateElementName(id, name, userId); } - public void duplicateParameters(UUID parentParameterId, ParametersType parametersType, String parametersName, UUID parentDirectoryUuid, String userId) { + public void duplicateParameters(UUID parentParameterId, ParametersType parametersType, String parametersName, String description, UUID parentDirectoryUuid, String userId) { UUID parametersUuid = parametersService.createParameters(parentParameterId, parametersType); ElementAttributes elementAttributes = new ElementAttributes(parametersUuid, parametersName, parametersType.name(), - null, userId, 0L, null); + null, userId, 0L, description); directoryService.createElement(elementAttributes, parentDirectoryUuid, userId); } diff --git a/src/test/java/org/gridsuite/explore/server/ExploreTest.java b/src/test/java/org/gridsuite/explore/server/ExploreTest.java index f3211032..9c8f688e 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreTest.java @@ -568,8 +568,8 @@ public void testDuplicateStudy() throws Exception { @Test public void testDuplicateParameters() throws Exception { - mockMvc.perform(post("/v1/explore/parameters?duplicateFrom={parentParametersId}&name={parametersName}&type={type}&parentDirectoryUuid={parentDirectoryUuid}", - PARAMETERS_UUID, STUDY1, ParametersType.VOLTAGE_INIT_PARAMETERS, PARENT_DIRECTORY_UUID) + mockMvc.perform(post("/v1/explore/parameters?duplicateFrom={parentParametersId}&name={parametersName}&type={type}&description={description}&parentDirectoryUuid={parentDirectoryUuid}", + PARAMETERS_UUID, STUDY1, ParametersType.VOLTAGE_INIT_PARAMETERS, "description", PARENT_DIRECTORY_UUID) .header("userId", USER1)) .andExpect(status().isOk()); } From 56a9f99762701269de97f6eba26e756b05493050 Mon Sep 17 00:00:00 2001 From: maissa SOUISSI Date: Tue, 12 Mar 2024 11:43:47 +0100 Subject: [PATCH 2/2] requested changes Signed-off-by: maissa SOUISSI --- .../java/org/gridsuite/explore/server/ExploreController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gridsuite/explore/server/ExploreController.java b/src/main/java/org/gridsuite/explore/server/ExploreController.java index f12d83e1..691bd5c2 100644 --- a/src/main/java/org/gridsuite/explore/server/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/ExploreController.java @@ -313,7 +313,7 @@ public ResponseEntity updateParameters(@PathVariable UUID id, public ResponseEntity duplicateParameters(@RequestParam("duplicateFrom") UUID parentParameterId, @RequestParam("name") String parametersName, @RequestParam(name = QUERY_PARAM_PARAMETERS_TYPE, defaultValue = "") ParametersType parametersType, - @RequestParam("description") String description, + @RequestParam(name = "description", required = false, defaultValue = "") String description, @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid, @RequestHeader("userId") String userId) { exploreService.duplicateParameters(parentParameterId, parametersType, parametersName, description, parentDirectoryUuid, userId);