fix: add toEntity method

Signed-off-by: Joris Mancini <joris.mancini_externe@rte-france.com>
gridsuite · Jan 11, 2024 · e70c13f · e70c13f
1 parent fe3eeaf
commit e70c13f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/FreePropertyInfos.java b/src/main/java/org/gridsuite/modification/server/dto/FreePropertyInfos.java
@@ -10,6 +10,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import org.gridsuite.modification.server.entities.equipment.modification.FreePropertyEntity;
 
 /**
  * @author Joris Mancini <joris.mancini_externe at rte-france.com>
@@ -33,4 +34,13 @@ public class FreePropertyInfos {
 
     @Schema(description = "property added in current modification")
     private boolean added = false;
+
+    public FreePropertyEntity toEntity() {
+        return FreePropertyEntity.builder()
+            .name(getName())
+            .value(getValue())
+            .deletionMark(isDeletionMark())
+            .added(isAdded())
+            .build();
+    }
 }
diff --git a/...uite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java b/...uite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java
@@ -10,6 +10,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.server.dto.EquipmentModificationInfos;
+import org.gridsuite.modification.server.dto.FreePropertyInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.entities.ModificationEntity;
 
@@ -45,12 +46,7 @@ private void assignAttributes(EquipmentModificationInfos equipmentModificationIn
         equipmentId = equipmentModificationInfos.getEquipmentId();
         List<FreePropertyEntity> newProperties = equipmentModificationInfos.getProperties() == null ? null :
             equipmentModificationInfos.getProperties().stream()
-                .map(prop -> (FreePropertyEntity) FreePropertyEntity.builder()
-                    .name(prop.getName())
-                    .value(prop.getValue())
-                    .deletionMark(prop.isDeletionMark())
-                    .added(prop.isAdded())
-                    .build())
+                .map(FreePropertyInfos::toEntity)
                 .toList();
         if (this.properties != null) {
             // update using the same reference with clear/add (to avoid JPA exception)