diff --git a/src/main/java/org/gridsuite/useradmin/server/dto/UserProfile.java b/src/main/java/org/gridsuite/useradmin/server/dto/UserProfile.java index 9475a39..f4eec39 100644 --- a/src/main/java/org/gridsuite/useradmin/server/dto/UserProfile.java +++ b/src/main/java/org/gridsuite/useradmin/server/dto/UserProfile.java @@ -21,7 +21,7 @@ public record UserProfile( Integer maxAllowedBuilds, UUID spreadsheetConfigCollectionId, UUID networkVisualizationParameterId, - UUID diagramConfigId + UUID workspaceId ) { public static final String DEFAULT_PROFILE_NAME = "default profile"; diff --git a/src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java b/src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java index 025aebe..e597b32 100644 --- a/src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java +++ b/src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java @@ -59,7 +59,7 @@ public class UserProfileEntity { @Column(name = "networkVisualizationParameterId") private UUID networkVisualizationParameterId; - @Column(name = "diagramConfigId") - private UUID diagramConfigId; + @Column(name = "workspaceId") + private UUID workspaceId; } diff --git a/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java b/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java index 23dbabb..9cf1b53 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java @@ -65,7 +65,7 @@ public List getProfiles(String userId, boolean checkLinksValidity) e.getVoltageInitParameterId(), e.getSpreadsheetConfigCollectionId(), e.getNetworkVisualizationParameterId(), - e.getDiagramConfigId())) + e.getWorkspaceId())) .filter(Objects::nonNull) .collect(Collectors.toSet()); Set existingUuids = directoryService.getExistingElements(allUuidsInAllProfiles, userId); @@ -97,8 +97,8 @@ public List getProfiles(String userId, boolean checkLinksValidity) if (BooleanUtils.toBooleanDefaultIfNull(allLinksValid, true) && p.getNetworkVisualizationParameterId() != null) { allLinksValid = !missingUuids.contains(p.getNetworkVisualizationParameterId()); } - if (BooleanUtils.toBooleanDefaultIfNull(allLinksValid, true) && p.getDiagramConfigId() != null) { - allLinksValid = !missingUuids.contains(p.getDiagramConfigId()); + if (BooleanUtils.toBooleanDefaultIfNull(allLinksValid, true) && p.getWorkspaceId() != null) { + allLinksValid = !missingUuids.contains(p.getWorkspaceId()); } return toDto(p, allLinksValid); }) @@ -126,7 +126,7 @@ public void updateProfile(UUID profileUuid, UserProfile userProfile) { profile.setMaxAllowedBuilds(userProfile.maxAllowedBuilds()); profile.setSpreadsheetConfigCollectionId(userProfile.spreadsheetConfigCollectionId()); profile.setNetworkVisualizationParameterId(userProfile.networkVisualizationParameterId()); - profile.setDiagramConfigId(userProfile.diagramConfigId()); + profile.setWorkspaceId(userProfile.workspaceId()); } @Transactional @@ -161,7 +161,7 @@ private UserProfile toDto(final UserProfileEntity entity, Boolean allLinksValid) entity.getSecurityAnalysisParameterId(), entity.getSensitivityAnalysisParameterId(), entity.getShortcircuitParameterId(), entity.getVoltageInitParameterId(), allLinksValid, entity.getMaxAllowedCases(), entity.getMaxAllowedBuilds(), entity.getSpreadsheetConfigCollectionId(), - entity.getNetworkVisualizationParameterId(), entity.getDiagramConfigId()); + entity.getNetworkVisualizationParameterId(), entity.getWorkspaceId()); } private UserProfileEntity toEntity(final UserProfile userProfile) { @@ -178,7 +178,7 @@ private UserProfileEntity toEntity(final UserProfile userProfile) { Optional.ofNullable(userProfile.maxAllowedBuilds()).orElse(applicationProps.getDefaultMaxAllowedBuilds()), userProfile.spreadsheetConfigCollectionId(), userProfile.networkVisualizationParameterId(), - userProfile.diagramConfigId() + userProfile.workspaceId() ); } } diff --git a/src/main/resources/db/changelog/changesets/changelog_20260122T160112Z.xml b/src/main/resources/db/changelog/changesets/changelog_20260122T160112Z.xml new file mode 100644 index 0000000..4a7a906 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20260122T160112Z.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index c22dfdf..628cbc1 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -38,3 +38,6 @@ databaseChangeLog: - include: file: changesets/changelog_20251031T110224Z.xml relativeToChangelogFile: true + - include: + file: changesets/changelog_20260122T160112Z.xml + relativeToChangelogFile: true diff --git a/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java b/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java index 0cbf721..888ed67 100644 --- a/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java @@ -124,7 +124,6 @@ private void createProfile(String profileName, Integer maxAllowedCases, Integer assertEquals(maxAllowedBuilds, createdProfile.get().getMaxAllowedBuilds()); assertNull(createdProfile.get().getSpreadsheetConfigCollectionId()); assertNull(createdProfile.get().getNetworkVisualizationParameterId()); - assertNull(createdProfile.get().getDiagramConfigId()); } private void createUser(String userSub) throws Exception { diff --git a/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java b/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java index b634cc7..3cc484d 100644 --- a/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java @@ -268,7 +268,6 @@ void testGetUserProfileNotFound() throws Exception { assertNull(profile.allLinksValid()); assertNull(profile.spreadsheetConfigCollectionId()); assertNull(profile.networkVisualizationParameterId()); - assertNull(profile.diagramConfigId()); } @Test diff --git a/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java b/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java index 1e48744..b311216 100644 --- a/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java @@ -124,7 +124,6 @@ void testCreateProfile() throws Exception { assertEquals(15, userProfiles.get(0).maxAllowedBuilds()); assertNull(userProfiles.get(0).spreadsheetConfigCollectionId()); assertNull(userProfiles.get(0).networkVisualizationParameterId()); - assertNull(userProfiles.get(0).diagramConfigId()); createProfile(PROFILE_2, ADMIN_USER, USER_ADMIN_ROLE, null, null, HttpStatus.CREATED); createProfile(PROFILE_1, ADMIN_USER, USER_ADMIN_ROLE, null, null, HttpStatus.BAD_REQUEST); // profile already exists @@ -291,7 +290,6 @@ private void updateProfile(boolean validParameters) throws Exception { assertEquals(11, userProfiles.get(0).maxAllowedBuilds()); assertEquals(spreadsheetConfigCollectionUuid, userProfiles.get(0).spreadsheetConfigCollectionId()); assertEquals(networkVisualizationParametersUuid, userProfiles.get(0).networkVisualizationParameterId()); - assertEquals(diagramConfigUuid, userProfiles.get(0).diagramConfigId()); // profiles list (without validity flag) userProfiles = getProfileList(false); @@ -332,7 +330,6 @@ private UUID createProfile(String profileName, String userName, String userRole, assertNull(profile1.get().getVoltageInitParameterId()); // no voltage init params by dft assertNull(profile1.get().getSpreadsheetConfigCollectionId()); // no spreadsheet config collection by dft assertNull(profile1.get().getNetworkVisualizationParameterId()); // no network visualization params by dft - assertNull(profile1.get().getDiagramConfigId()); // no diagram config by dft return profile1.get().getId(); } return null; @@ -389,7 +386,6 @@ private void updateProfile(UserProfile newData, String userName, String userRole assertNull(updatedProfile.allLinksValid()); // validity not set in this case assertEquals(newData.spreadsheetConfigCollectionId(), updatedProfile.spreadsheetConfigCollectionId()); assertEquals(newData.networkVisualizationParameterId(), updatedProfile.networkVisualizationParameterId()); - assertEquals(newData.diagramConfigId(), updatedProfile.diagramConfigId()); } } }