Skip to content

Commit

Permalink
More clean up.
Browse files Browse the repository at this point in the history 
Signed-off-by: AAJELLAL <[email protected]>
  • Loading branch information
@AAJELLAL
AAJELLAL committed May 23, 2024
1 parent e743605 commit 48aa888
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 66 deletions.
24 changes: 0 additions & 24 deletions src/main/java/org/gridsuite/explore/server/dto/AccessRightsAttributes.java
View file

This file was deleted.

6 changes: 2 additions & 4 deletions src/main/java/org/gridsuite/explore/server/dto/ElementAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ public class ElementAttributes {

private String type;

private AccessRightsAttributes accessRights;

private String owner;

private Long subdirectoriesCount;
Expand All @@ -36,7 +34,7 @@ public class ElementAttributes {

private Map<String, Object> specificMetadata = new HashMap<>();

public ElementAttributes(UUID elementUuid, String elementName, String type, AccessRightsAttributes accessRights, String owner, long subdirectoriesCount, String description) {
this(elementUuid, elementName, type, accessRights, owner, subdirectoriesCount, description, null);
public ElementAttributes(UUID elementUuid, String elementName, String type, String owner, long subdirectoriesCount, String description) {
this(elementUuid, elementName, type, owner, subdirectoriesCount, description, null);
}
}
26 changes: 10 additions & 16 deletions src/main/java/org/gridsuite/explore/server/services/ExploreService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public ExploreService(
}

public void createStudy(String studyName, CaseInfo caseInfo, String description, String userId, UUID parentDirectoryUuid, Map<String, Object> importParams, Boolean duplicateCase) {
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), studyName, STUDY, null, userId, 0L, description);
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), studyName, STUDY, userId, 0L, description);
studyService.insertStudyWithExistingCaseFile(elementAttributes.getElementUuid(), userId, caseInfo.caseUuid(), caseInfo.caseFormat(), importParams, duplicateCase);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}
Expand All @@ -79,7 +79,7 @@ public void duplicateStudy(UUID sourceStudyUuid, UUID targetDirectoryId, String

public void createCase(String caseName, MultipartFile caseFile, String description, String userId, UUID parentDirectoryUuid) {
UUID uuid = caseService.importCase(caseFile);
directoryService.createElement(new ElementAttributes(uuid, caseName, CASE, null, userId, 0L, description),
directoryService.createElement(new ElementAttributes(uuid, caseName, CASE, userId, 0L, description),
parentDirectoryUuid, userId);
}

Expand All @@ -89,8 +89,7 @@ public void duplicateCase(UUID sourceCaseUuid, UUID targetDirectoryId, String us
}

public void createScriptContingencyList(String listName, String content, String description, String userId, UUID parentDirectoryUuid) {
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST,
null, userId, 0L, description);
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST, userId, 0L, description);
contingencyListService.insertScriptContingencyList(elementAttributes.getElementUuid(), content);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}
Expand All @@ -105,8 +104,7 @@ public void duplicateContingencyList(UUID contingencyListsId, UUID targetDirecto
}

public void createFormContingencyList(String listName, String content, String description, String userId, UUID parentDirectoryUuid) {
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST,
null, userId, 0L, description);
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST, userId, 0L, description);
contingencyListService.insertFormContingencyList(elementAttributes.getElementUuid(), content);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}
Expand All @@ -117,7 +115,7 @@ public void newScriptFromFormContingencyList(UUID id, String scriptName, String
throw new ExploreException(NOT_ALLOWED);
}
ElementAttributes newElementAttributes = new ElementAttributes(UUID.randomUUID(), scriptName,
CONTINGENCY_LIST, new AccessRightsAttributes(elementAttribute.getAccessRights().isPrivate()), userId, 0L, null);
CONTINGENCY_LIST, userId, 0L, null);
contingencyListService.newScriptFromFormContingencyList(id, newElementAttributes.getElementUuid());
directoryService.createElement(newElementAttributes, parentDirectoryUuid, userId);
}
Expand All @@ -135,15 +133,13 @@ public void replaceFormContingencyListWithScript(UUID id, String userId) {
}

public void createIdentifierContingencyList(String listName, String content, String description, String userId, UUID parentDirectoryUuid) {
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST,
null, userId, 0L, description);
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST, userId, 0L, description);
contingencyListService.insertIdentifierContingencyList(elementAttributes.getElementUuid(), content);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}

public void createFilter(String filter, String filterName, String description, UUID parentDirectoryUuid, String userId) {
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), filterName, FILTER,
null, userId, 0, description);
ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), filterName, FILTER, userId, 0, description);
filterService.insertFilter(filter, elementAttributes.getElementUuid(), userId);
directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
}
Expand All @@ -159,7 +155,7 @@ public void newScriptFromFilter(UUID filterId, String scriptName, String userId,
throw new ExploreException(NOT_ALLOWED);
}
ElementAttributes newElementAttributes = new ElementAttributes(UUID.randomUUID(), scriptName,
FILTER, new AccessRightsAttributes(elementAttribute.getAccessRights().isPrivate()), userId, 0, null);
FILTER, userId, 0, null);
filterService.insertNewScriptFromFilter(filterId, newElementAttributes.getElementUuid());
directoryService.createElement(newElementAttributes, parentDirectoryUuid, userId);
}
Expand Down Expand Up @@ -239,8 +235,7 @@ private String getProperPath(ContingencyListType contingencyListType) {

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

Expand All @@ -267,8 +262,7 @@ public void createNetworkModifications(List<ElementAttributes> modificationAttri
final UUID newId = newModificationsUuids.get(m.getElementUuid());
if (newId != null) {
// an Id may be null if a duplication could not succeed (ex: we provide a bad uuid)
ElementAttributes elementAttributes = new ElementAttributes(newId, m.getElementName(), MODIFICATION,
null, userId, 0L, m.getDescription());
ElementAttributes elementAttributes = new ElementAttributes(newId, m.getElementName(), MODIFICATION, userId, 0L, m.getDescription());
directoryService.createElementWithNewName(elementAttributes, parentDirectoryUuid, userId, true);
}
});
Expand Down
39 changes: 19 additions & 20 deletions src/test/java/org/gridsuite/explore/server/ExploreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import okio.Buffer;
import org.gridsuite.explore.server.dto.AccessRightsAttributes;
import org.gridsuite.explore.server.dto.ElementAttributes;
import org.gridsuite.explore.server.services.*;
import org.gridsuite.explore.server.utils.ContingencyListType;
Expand Down Expand Up @@ -130,21 +129,21 @@ public void setup() throws IOException {
caseService.setBaseUri(baseUrl);
remoteServicesProperties.getServices().forEach(s -> s.setBaseUri(baseUrl));

String privateStudyAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PRIVATE_STUDY_UUID, STUDY1, "STUDY", new AccessRightsAttributes(true), USER1, 0, null));
String listOfPrivateStudyAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(PRIVATE_STUDY_UUID, STUDY1, "STUDY", new AccessRightsAttributes(true), USER1, 0, null)));
String publicStudyAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PUBLIC_STUDY_UUID, STUDY1, "STUDY", new AccessRightsAttributes(false), USER1, 0, null));
String invalidElementAsString = mapper.writeValueAsString(new ElementAttributes(INVALID_ELEMENT_UUID, "invalidElementName", "INVALID", new AccessRightsAttributes(false), USER1, 0, null));
String formContingencyListAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CONTINGENCY_LIST_UUID, FILTER_CONTINGENCY_LIST, "CONTINGENCY_LIST", new AccessRightsAttributes(true), USER1, 0, null));
String listOfFormContingencyListAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(CONTINGENCY_LIST_UUID, FILTER_CONTINGENCY_LIST, "CONTINGENCY_LIST", new AccessRightsAttributes(true), USER1, 0, null)));
String filterAttributesAsString = mapper.writeValueAsString(new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, new AccessRightsAttributes(true), USER1, 0, null));
String filter2AttributesAsString = mapper.writeValueAsString(new ElementAttributes(FILTER_UUID_2, FILTER_CONTINGENCY_LIST_2, FILTER, new AccessRightsAttributes(true), USER1, 0, null));
String listOfFilterAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, new AccessRightsAttributes(true), USER1, 0, null)));
String directoryAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PARENT_DIRECTORY_UUID, "directory", "DIRECTORY", new AccessRightsAttributes(true), USER1, 0, null));
String caseElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CASE_UUID, "case", "CASE", new AccessRightsAttributes(true), USER1, 0L, null));
String parametersElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PARAMETERS_UUID, "voltageInitParametersName", ParametersType.VOLTAGE_INIT_PARAMETERS.name(), new AccessRightsAttributes(true), USER1, 0, null));
String privateStudyAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PRIVATE_STUDY_UUID, STUDY1, "STUDY", USER1, 0, null));
String listOfPrivateStudyAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(PRIVATE_STUDY_UUID, STUDY1, "STUDY", USER1, 0, null)));
String publicStudyAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PUBLIC_STUDY_UUID, STUDY1, "STUDY", USER1, 0, null));
String invalidElementAsString = mapper.writeValueAsString(new ElementAttributes(INVALID_ELEMENT_UUID, "invalidElementName", "INVALID", USER1, 0, null));
String formContingencyListAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CONTINGENCY_LIST_UUID, FILTER_CONTINGENCY_LIST, "CONTINGENCY_LIST", USER1, 0, null));
String listOfFormContingencyListAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(CONTINGENCY_LIST_UUID, FILTER_CONTINGENCY_LIST, "CONTINGENCY_LIST", USER1, 0, null)));
String filterAttributesAsString = mapper.writeValueAsString(new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, USER1, 0, null));
String filter2AttributesAsString = mapper.writeValueAsString(new ElementAttributes(FILTER_UUID_2, FILTER_CONTINGENCY_LIST_2, FILTER, USER1, 0, null));
String listOfFilterAttributesAsString = mapper.writeValueAsString(List.of(new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, USER1, 0, null)));
String directoryAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PARENT_DIRECTORY_UUID, "directory", "DIRECTORY", USER1, 0, null));
String caseElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CASE_UUID, "case", "CASE", USER1, 0L, null));
String parametersElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(PARAMETERS_UUID, "voltageInitParametersName", ParametersType.VOLTAGE_INIT_PARAMETERS.name(), USER1, 0, null));
String listElementsAttributesAsString = "[" + filterAttributesAsString + "," + privateStudyAttributesAsString + "," + formContingencyListAttributesAsString + "]";
String caseInfosAttributesAsString = mapper.writeValueAsString(List.of(caseSpecificMetadata));
String modificationElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(MODIFICATION_UUID, "one modif", "MODIFICATION", new AccessRightsAttributes(true), USER1, 0L, null));
String modificationElementAttributesAsString = mapper.writeValueAsString(new ElementAttributes(MODIFICATION_UUID, "one modif", "MODIFICATION", USER1, 0L, null));
String modificationInfosAttributesAsString = mapper.writeValueAsString(List.of(modificationSpecificMetadata));
String modificationIdsAsString = mapper.writeValueAsString(Map.of(MODIFICATION_UUID, MODIFICATION_COPY_UUID));
String newStudyUuidAsString = mapper.writeValueAsString(STUDY_COPY_UUID);
Expand Down Expand Up @@ -545,8 +544,8 @@ public void testGetElementsMetadata() throws Exception {
.header("userId", USER1)
).andExpectAll(status().isOk());

ElementAttributes filter1 = new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, new AccessRightsAttributes(true), USER1, 0L, null, specificMetadata);
ElementAttributes filter2 = new ElementAttributes(FILTER_UUID_2, FILTER_CONTINGENCY_LIST_2, FILTER, new AccessRightsAttributes(true), USER1, 0L, null, specificMetadata2);
ElementAttributes filter1 = new ElementAttributes(FILTER_UUID, FILTER_CONTINGENCY_LIST, FILTER, USER1, 0L, null, specificMetadata);
ElementAttributes filter2 = new ElementAttributes(FILTER_UUID_2, FILTER_CONTINGENCY_LIST_2, FILTER, USER1, 0L, null, specificMetadata2);

mockMvc.perform(get("/v1/explore/elements/metadata?ids=" + FILTER_UUID + "," + FILTER_UUID_2 + "&equipmentTypes=&elementTypes=FILTER")
.header("userId", USER1))
Expand Down Expand Up @@ -715,7 +714,7 @@ public void testGetMetadata() throws Exception {
String res = result.getResponse().getContentAsString();
List<ElementAttributes> elementsMetadata = mapper.readValue(res, new TypeReference<>() {
});
String caseAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CASE_UUID, "case", "CASE", new AccessRightsAttributes(true), USER1, 0L, null, caseSpecificMetadata));
String caseAttributesAsString = mapper.writeValueAsString(new ElementAttributes(CASE_UUID, "case", "CASE", USER1, 0L, null, caseSpecificMetadata));
assertEquals(1, elementsMetadata.size());
assertEquals(mapper.writeValueAsString(elementsMetadata.get(0)), caseAttributesAsString);
}
Expand All @@ -724,8 +723,8 @@ public void testGetMetadata() throws Exception {
@SneakyThrows
public void testcreateNetworkModifications() {
final String body = mapper.writeValueAsString(List.of(
new ElementAttributes(MODIFICATION_UUID, "one modif", "", null, USER1, 0L, "a description"),
new ElementAttributes(UUID.randomUUID(), "2nd modif", "", null, USER1, 0L, "a description")
new ElementAttributes(MODIFICATION_UUID, "one modif", "", USER1, 0L, "a description"),
new ElementAttributes(UUID.randomUUID(), "2nd modif", "", USER1, 0L, "a description")
)
);
mockMvc.perform(post("/v1/explore/modifications?parentDirectoryUuid={parentDirectoryUuid}", PARENT_DIRECTORY_UUID)
Expand All @@ -738,7 +737,7 @@ public void testcreateNetworkModifications() {
@Test
@SneakyThrows
public void testGetModificationMetadata() {
final String expectedResult = mapper.writeValueAsString(new ElementAttributes(MODIFICATION_UUID, "one modif", "MODIFICATION", new AccessRightsAttributes(true), USER1, 0L, null, modificationSpecificMetadata));
final String expectedResult = mapper.writeValueAsString(new ElementAttributes(MODIFICATION_UUID, "one modif", "MODIFICATION", USER1, 0L, null, modificationSpecificMetadata));
MvcResult result = mockMvc.perform(get("/v1/explore/elements/metadata?ids=" + MODIFICATION_UUID)
.header("userId", USER1))
.andExpect(status().isOk())
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/explore/server/SupervisionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class SupervisionTest {
@MockBean
RestTemplate restTemplate;

ElementAttributes filter = new ElementAttributes(UUID.randomUUID(), "filter", "FILTER", null, "userId", 0L, null, null);
ElementAttributes filter = new ElementAttributes(UUID.randomUUID(), "filter", "FILTER", "userId", 0L, null, null);

ElementAttributes study = new ElementAttributes(UUID.randomUUID(), "study", "STUDY", null, "userId", 0L, null, null);
ElementAttributes study = new ElementAttributes(UUID.randomUUID(), "study", "STUDY", "userId", 0L, null, null);

@Test
void testDeleteElements() {
Expand Down

0 comments on commit 48aa888

Please sign in to comment.