Skip to content
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

Add description in parameter element creation #109

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Add description in parameter element creation #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c9eed7
add description in parameter element creation
dbraquart Oct 28, 2024
2661940
Merge branch 'main' into add-description-in-parameter-creation
ayolab Oct 29, 2024
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
3 changes: 2 additions & 1 deletion src/main/java/org/gridsuite/explore/server/ExploreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,10 @@ public ResponseEntity<Void> updateContingencyList(
public ResponseEntity<Void> createParameters(@RequestBody String parameters,
@RequestParam("name") String parametersName,
@RequestParam(name = QUERY_PARAM_TYPE, defaultValue = "") ParametersType parametersType,
@RequestParam(QUERY_PARAM_DESCRIPTION) String description,
@RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid,
@RequestHeader(QUERY_PARAM_USER_ID) String userId) {
exploreService.createParameters(parameters, parametersType, parametersName, parentDirectoryUuid, userId);
exploreService.createParameters(parameters, parametersType, parametersName, description, parentDirectoryUuid, userId);
return ResponseEntity.ok().build();
}

Expand Down
19 changes: 7 additions & 12 deletions src/main/java/org/gridsuite/explore/server/services/ExploreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,16 @@ private void updateElementName(UUID id, String name, String userId) {
}

private String getProperPath(ContingencyListType contingencyListType) {
switch (contingencyListType) {
case SCRIPT:
return "/script-contingency-lists/{id}";
case FORM:
return "/form-contingency-lists/{id}";
case IDENTIFIERS:
return "/identifier-contingency-lists/{id}";
default:
throw new ExploreException(UNKNOWN_ELEMENT_TYPE);
}
return switch (contingencyListType) {
case SCRIPT -> "/script-contingency-lists/{id}";
case FORM -> "/form-contingency-lists/{id}";
case IDENTIFIERS -> "/identifier-contingency-lists/{id}";
};
}

public void createParameters(String parameters, ParametersType parametersType, String parametersName, UUID parentDirectoryUuid, String userId) {
public void createParameters(String parameters, ParametersType parametersType, String parametersName, String description, UUID parentDirectoryUuid, String userId) {
UUID parametersUuid = parametersService.createParameters(parameters, parametersType);
ElementAttributes elementAttributes = new ElementAttributes(parametersUuid, parametersName, parametersType.name(), userId, 0, null);
ElementAttributes elementAttributes = new ElementAttributes(parametersUuid, parametersName, parametersType.name(), userId, 0, description);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/explore/server/ExploreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ void testCreateFilter() throws Exception {

@Test
void testCreateParameters() throws Exception {
mockMvc.perform(post("/v1/explore/parameters?name={name}&type={type}&parentDirectoryUuid={parentDirectoryUuid}",
"", ParametersType.VOLTAGE_INIT_PARAMETERS.name(), PARENT_DIRECTORY_UUID)
mockMvc.perform(post("/v1/explore/parameters?name={name}&type={type}&description={description}&parentDirectoryUuid={parentDirectoryUuid}",
"paramName", ParametersType.VOLTAGE_INIT_PARAMETERS.name(), "comment", PARENT_DIRECTORY_UUID)
.header("userId", USER1)
.contentType(MediaType.APPLICATION_JSON)
.content("\"Parameters content\"")
Expand Down
Loading