Fix duplicated column renaming, to avoid unaccepted characters

Signed-off-by: Franck LECUYER <[email protected]>

Author: FranckLecuyer

src/main/java/org/gridsuite/studyconfig/server/service/SpreadsheetConfigService.java

@@ -373,30 +373,34 @@ private static void reorderColumns(List<UUID> columnOrder, List<ColumnEntity> co
     }
 
     private String newCandidate(String base, int n) {
-        return base + '(' + n + ')';
+        return base + '_' + n;
+    }
+
+    /**
+     * Generates a unique value by appending a numeric suffix if the original value already exists.
+     *
+     * @param originalValue  the original value to make unique
+     * @param existingValues set of existing values to avoid conflicts with
+     * @return a unique value, either the original or with a numeric suffix
+     */
+    private String getUniqueValue(String originalValue, Set<String> existingValues) {
+        if (!existingValues.contains(originalValue)) {
+            return originalValue;
+        }
+
+        int i = 1;
+        while (existingValues.contains(newCandidate(originalValue, i))) {
+            ++i;
+        }
+        return newCandidate(originalValue, i);
     }
 
     private Pair<String, String> getDuplicateIdAndNameCandidate(SpreadsheetConfigEntity entity, String columnId, String columnName) {
-        String newColumnId = columnId;
-        String newColumnName = columnName;
-
         var existingColumnIds = entity.getColumns().stream().map(ColumnEntity::getId).collect(Collectors.toSet());
         var existingColumnNames = entity.getColumns().stream().map(ColumnEntity::getName).collect(Collectors.toSet());
+        String newColumnId = getUniqueValue(columnId, existingColumnIds);
+        String newColumnName = getUniqueValue(columnName, existingColumnNames);
 
-        if (existingColumnIds.contains(columnId)) {
-            int i = 1;
-            while (existingColumnIds.contains(newCandidate(columnId, i))) {
-                ++i;
-            }
-            newColumnId = newCandidate(columnId, i);
-        }
-        if (existingColumnNames.contains(columnName)) {
-            int i = 1;
-            while (existingColumnNames.contains(newCandidate(columnName, i))) {
-                ++i;
-            }
-            newColumnName = newCandidate(columnName, i);
-        }
 
         return Pair.of(newColumnId, newColumnName);
     }

src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java

@@ -329,8 +329,8 @@ void testDuplicateColumn() throws Exception {
         ColumnInfos duplicatedColumnInfos = configAfterDuplicate.columns().get(1);
 
         assertThat(columnInfos.uuid()).isNotEqualTo(duplicatedColumnInfos.uuid());
-        assertEquals(columnInfos.id() + "(1)", duplicatedColumnInfos.id());
-        assertEquals(columnInfos.name() + "(1)", duplicatedColumnInfos.name());
+        assertEquals(columnInfos.id() + "_1", duplicatedColumnInfos.id());
+        assertEquals(columnInfos.name() + "_1", duplicatedColumnInfos.name());
         assertThat(columnInfos.visible()).isEqualTo(duplicatedColumnInfos.visible());
         assertThat(columnInfos.formula()).isEqualTo(duplicatedColumnInfos.formula());
         assertThat(columnInfos.dependencies()).isEqualTo(duplicatedColumnInfos.dependencies());
@@ -342,8 +342,8 @@ void testDuplicateColumn() throws Exception {
         assertThat(configAfterDuplicate.columns()).hasSize(6);
         duplicatedColumnInfos = configAfterDuplicate.columns().get(1);
         assertThat(columnInfos.uuid()).isNotEqualTo(duplicatedColumnInfos.uuid());
-        assertEquals(columnInfos.id() + "(2)", duplicatedColumnInfos.id());
-        assertEquals(columnInfos.name() + "(2)", duplicatedColumnInfos.name());
+        assertEquals(columnInfos.id() + "_2", duplicatedColumnInfos.id());
+        assertEquals(columnInfos.name() + "_2", duplicatedColumnInfos.name());
 
         mockMvc.perform(post(URI_SPREADSHEET_CONFIG_GET_PUT + configId + URI_COLUMN_BASE + "/" + UUID.randomUUID() + "/duplicate"))
                 .andExpect(status().isNotFound());