From 38b332868df1c0e7576d569abe544d71af40d438 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Mon, 23 Feb 2026 20:16:51 +0100 Subject: [PATCH 1/2] update modifications Signed-off-by: SOUISSI Maissa (Externe) --- .../server/entities/ModificationEntity.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java index 9abc8c373..06cda090a 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java @@ -121,10 +121,16 @@ public void update(ModificationInfos modificationInfos) { @SneakyThrows private void assignAttributes(ModificationInfos modificationInfos) { - this.setType(modificationInfos.getType().name()); - this.setMessageType(modificationInfos.getType().name()); - this.setDescription(modificationInfos.getDescription()); - this.setMessageValues(new ObjectMapper().writeValueAsString(modificationInfos.getMapMessageValues())); + if (modificationInfos.getType() != null) { + this.setType(modificationInfos.getType().name()); + this.setMessageType(modificationInfos.getType().name()); + } + if (modificationInfos.getDescription() != null) { + this.setDescription(modificationInfos.getDescription()); + } + if (modificationInfos.getMessageValues() != null) { + this.setMessageValues(new ObjectMapper().writeValueAsString(modificationInfos.getMapMessageValues())); + } } public static ModificationEntity fromDTO(ModificationInfos dto) { From 10719544d0ca5f1bd0b21e6438023929b509dd71 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Mon, 23 Feb 2026 20:30:42 +0100 Subject: [PATCH 2/2] check if description is null before updating modification Signed-off-by: SOUISSI Maissa (Externe) --- .../server/entities/ModificationEntity.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java index 06cda090a..00ce7b330 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java @@ -121,16 +121,12 @@ public void update(ModificationInfos modificationInfos) { @SneakyThrows private void assignAttributes(ModificationInfos modificationInfos) { - if (modificationInfos.getType() != null) { - this.setType(modificationInfos.getType().name()); - this.setMessageType(modificationInfos.getType().name()); - } + this.setType(modificationInfos.getType().name()); + this.setMessageType(modificationInfos.getType().name()); if (modificationInfos.getDescription() != null) { this.setDescription(modificationInfos.getDescription()); } - if (modificationInfos.getMessageValues() != null) { - this.setMessageValues(new ObjectMapper().writeValueAsString(modificationInfos.getMapMessageValues())); - } + this.setMessageValues(new ObjectMapper().writeValueAsString(modificationInfos.getMapMessageValues())); } public static ModificationEntity fromDTO(ModificationInfos dto) {