Skip to content

Commit c7d2760

Browse files
committed
support merge models
Signed-off-by: David BRAQUART <[email protected]>
1 parent 599a139 commit c7d2760

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ private SpreadsheetConfigEntity duplicateSpreadsheetConfigEntity(UUID id) {
6363
.name(entity.getName())
6464
.sheetType(entity.getSheetType())
6565
.build();
66-
duplicate.setNodeAliases(new ArrayList<>(entity.getNodeAliases()));
66+
if (entity.getNodeAliases() != null) {
67+
duplicate.setNodeAliases(new ArrayList<>(entity.getNodeAliases()));
68+
}
6769
List<ColumnEntity> columns = entity.getColumns().stream()
6870
.map(column -> ColumnEntity.builder()
6971
.name(column.getName())
@@ -124,7 +126,9 @@ public void updateSpreadsheetConfig(UUID id, SpreadsheetConfigInfos dto) {
124126

125127
entity.setSheetType(dto.sheetType());
126128
entity.setName(dto.name());
127-
entity.setNodeAliases(dto.nodeAliases());
129+
if (dto.nodeAliases() != null) {
130+
entity.setNodeAliases(new ArrayList<>(dto.nodeAliases()));
131+
}
128132
entity.getColumns().clear();
129133
if (dto.columns() != null) {
130134
entity.getColumns().addAll(dto.columns().stream()
@@ -178,6 +182,8 @@ public UUID createSpreadsheetConfigCollectionFromConfigs(List<UUID> configUuids)
178182
return clone;
179183
})
180184
.toList());
185+
List<String> allConfigsUniqueAliases = entity.getSpreadsheetConfigs().stream().map(SpreadsheetConfigEntity::getNodeAliases).flatMap(Collection::stream).collect(Collectors.toSet()).stream().toList();
186+
entity.setNodeAliases(new ArrayList<>(allConfigsUniqueAliases));
181187
return spreadsheetConfigCollectionRepository.save(entity).getId();
182188
}
183189

@@ -267,7 +273,9 @@ public UUID duplicateSpreadsheetConfigCollection(UUID id) {
267273
.name(config.getName())
268274
.sheetType(config.getSheetType())
269275
.build();
270-
configDuplicate.setNodeAliases(new ArrayList<>(config.getNodeAliases()));
276+
if (config.getNodeAliases() != null) {
277+
configDuplicate.setNodeAliases(new ArrayList<>(config.getNodeAliases()));
278+
}
271279
configDuplicate.setColumns(config.getColumns().stream()
272280
.map(column -> ColumnEntity.builder()
273281
.name(column.getName())

0 commit comments

Comments
 (0)