Skip to content

Ensure column id and column name unicity when duplicating a column #71

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

Merged
merged 3 commits into from
Aug 7, 2025
Merged

Ensure column id and column name unicity when duplicating a column #71

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3910a7
Ensure column id and column name unicity when duplicating a column
FranckLecuyer Aug 4, 2025
b0d7d53
Fix duplicated column renaming, to avoid unaccepted characters
FranckLecuyer Aug 7, 2025
da4284e
Fix checkstyle pb
FranckLecuyer Aug 7, 2025
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
36 changes: 33 additions & 3 deletions src/main/java/org/gridsuite/studyconfig/server/service/SpreadsheetConfigService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import jakarta.persistence.EntityNotFoundException;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.tuple.Pair;
import org.gridsuite.studyconfig.server.dto.*;
import org.gridsuite.studyconfig.server.entities.ColumnEntity;
import org.gridsuite.studyconfig.server.entities.GlobalFilterEntity;
Expand Down Expand Up @@ -371,16 +372,45 @@ private static void reorderColumns(List<UUID> columnOrder, List<ColumnEntity> co
columns.sort(Comparator.comparingInt(column -> columnOrder.indexOf(column.getUuid())));
}

private String newCandidate(String base, int n) {
return base + '(' + n + ')';
}

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());

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);
}

@Transactional
public void duplicateColumn(UUID id, UUID columnId) {
SpreadsheetConfigEntity entity = findEntityById(id);
ColumnEntity columnEntity = entity.getColumns().stream().filter(col -> col.getUuid().equals(columnId))
.findFirst().orElseThrow(() -> new EntityNotFoundException(COLUMN_NOT_FOUND + columnId));
ColumnEntity columnCopy = columnEntity.toBuilder().build();
columnCopy.setUuid(UUID.randomUUID());
columnCopy.setId(columnCopy.getId() + "copy");
columnCopy.setName(columnCopy.getName() + "-copy");

Pair<String, String> idAndName = getDuplicateIdAndNameCandidate(entity, columnCopy.getId(), columnCopy.getName());
columnCopy.setId(idAndName.getLeft());
columnCopy.setName(idAndName.getRight());
List<ColumnEntity> columns = entity.getColumns();
columns.add(columns.indexOf(columnEntity) + 1, columnCopy);
entity.setColumns(columns);
Expand Down
13 changes: 12 additions & 1 deletion src/test/java/org/gridsuite/studyconfig/server/SpreadsheetConfigIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.stream.Collectors;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

Expand Down Expand Up @@ -328,12 +329,22 @@ void testDuplicateColumn() throws Exception {
ColumnInfos duplicatedColumnInfos = configAfterDuplicate.columns().get(1);

assertThat(columnInfos.uuid()).isNotEqualTo(duplicatedColumnInfos.uuid());
assertThat(columnInfos.id()).isNotEqualTo(duplicatedColumnInfos.id());
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());
assertThat(columnInfos.precision()).isEqualTo(duplicatedColumnInfos.precision());

mockMvc.perform(post(URI_SPREADSHEET_CONFIG_GET_PUT + configId + URI_COLUMN_BASE + "/" + columnId + "/duplicate"))
.andExpect(status().isNoContent());
configAfterDuplicate = getSpreadsheetConfig(configId);
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());

mockMvc.perform(post(URI_SPREADSHEET_CONFIG_GET_PUT + configId + URI_COLUMN_BASE + "/" + UUID.randomUUID() + "/duplicate"))
.andExpect(status().isNotFound());
}
Expand Down