rename branch status modif by operational status modif

src/main/java/org/gridsuite/modification/server/ModificationType.java

@@ -39,7 +39,7 @@ public enum ModificationType {
     LINES_ATTACH_TO_SPLIT_LINES(PreloadingStrategy.NONE),
     GENERATOR_SCALING(PreloadingStrategy.COLLECTION),
     LOAD_SCALING(PreloadingStrategy.COLLECTION),
-    BRANCH_STATUS_MODIFICATION(PreloadingStrategy.NONE),
+    OPERATIONAL_STATUS_MODIFICATION(PreloadingStrategy.NONE),
     DELETE_VOLTAGE_LEVEL_ON_LINE(PreloadingStrategy.NONE),
     DELETE_ATTACHING_LINE(PreloadingStrategy.NONE),
     GENERATION_DISPATCH(PreloadingStrategy.COLLECTION),

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

@@ -9,7 +9,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.IdentifiableType;
 import lombok.NonNull;
-import org.gridsuite.modification.server.dto.BranchStatusModificationInfos;
+import org.gridsuite.modification.server.dto.OperationalStatusModificationInfos;
 import org.springframework.http.HttpStatus;
 
 import java.util.Objects;
@@ -74,10 +74,10 @@ public enum Type {
         TWO_WINDINGS_TRANSFORMER_CREATION_ERROR(HttpStatus.BAD_REQUEST),
         CONNECTION_POSITION_ERROR(HttpStatus.BAD_REQUEST),
         MODIFY_BATTERY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
-        BRANCH_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
-        BRANCH_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty branch action type"),
-        BRANCH_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
-        BRANCH_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_STATUS_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_STATUS_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty equipment action type"),
+        OPERATIONAL_STATUS_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
+        OPERATIONAL_STATUS_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
         LINE_SPLIT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         LINE_SPLIT_NOT_FOUND(HttpStatus.NOT_FOUND),
         LINE_ATTACH_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
@@ -150,8 +150,12 @@ public static NetworkModificationException createEquipmentTypeUnknown(@NonNull S
         return new NetworkModificationException(Type.UNKNOWN_EQUIPMENT_TYPE, "The equipment type : " + type + " is unknown");
     }
 
-    public static NetworkModificationException createBranchActionTypeUnsupported(@NonNull BranchStatusModificationInfos.ActionType type) {
-        return new NetworkModificationException(Type.BRANCH_ACTION_TYPE_UNSUPPORTED, "The branch action type : " + type + " is unsupported");
+    public static NetworkModificationException createEquipmentTypeNotSupported(@NonNull String type) {
+        return new NetworkModificationException(Type.OPERATIONAL_STATUS_TYPE_UNSUPPORTED, "The equipment type : " + type + " is not supported");
+    }
+
+    public static NetworkModificationException createOperationalStatusActionTypeUnsupported(@NonNull OperationalStatusModificationInfos.ActionType type) {
+        return new NetworkModificationException(Type.OPERATIONAL_STATUS_TYPE_UNSUPPORTED, "The operational status action type : " + type + " is unsupported");
     }
 
     public static NetworkModificationException createEquipementAttributeNotEditable(@NonNull IdentifiableType equipmentType, @NonNull String attributeName) {

src/main/java/org/gridsuite/modification/server/dto/ModificationInfos.java

@@ -56,7 +56,7 @@
     @JsonSubTypes.Type(value = LineSplitWithVoltageLevelInfos.class),
     @JsonSubTypes.Type(value = LineAttachToVoltageLevelInfos.class),
     @JsonSubTypes.Type(value = LinesAttachToSplitLinesInfos.class),
-    @JsonSubTypes.Type(value = BranchStatusModificationInfos.class),
+    @JsonSubTypes.Type(value = OperationalStatusModificationInfos.class),
     @JsonSubTypes.Type(value = EquipmentAttributeModificationInfos.class),
     @JsonSubTypes.Type(value = GeneratorScalingInfos.class),
     @JsonSubTypes.Type(value = LoadScalingInfos.class),

src/main/java/org/gridsuite/modification/server/dto/BranchStatusModificationInfos.java → src/main/java/org/gridsuite/modification/server/dto/OperationalStatusModificationInfos.java

@@ -17,13 +17,13 @@
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.NetworkModificationException;
 import org.gridsuite.modification.server.dto.annotation.ModificationErrorTypeName;
-import org.gridsuite.modification.server.entities.equipment.modification.BranchStatusModificationEntity;
+import org.gridsuite.modification.server.entities.equipment.modification.OperationalStatusModificationEntity;
 import org.gridsuite.modification.server.modifications.AbstractModification;
-import org.gridsuite.modification.server.modifications.BranchStatusModification;
+import org.gridsuite.modification.server.modifications.OperationalStatusModification;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_ACTION_TYPE_EMPTY;
+import static org.gridsuite.modification.server.NetworkModificationException.Type.OPERATIONAL_STATUS_TYPE_EMPTY;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
@@ -33,10 +33,10 @@
 @Getter
 @Setter
 @ToString(callSuper = true)
-@Schema(description = "Branch status modification")
-@JsonTypeName("BRANCH_STATUS_MODIFICATION")
-@ModificationErrorTypeName("BRANCH_ACTION_ERROR")
-public class BranchStatusModificationInfos extends EquipmentModificationInfos {
+@Schema(description = "Operational status modification")
+@JsonTypeName("OPERATIONAL_STATUS_MODIFICATION")
+@ModificationErrorTypeName("OPERATIONAL_STATUS_ERROR")
+public class OperationalStatusModificationInfos extends EquipmentModificationInfos {
     @Schema(description = "Action type")
     private ActionType action;
 
@@ -52,43 +52,43 @@ public enum ActionType {
     }
 
     @Override
-    public BranchStatusModificationEntity toEntity() {
-        return new BranchStatusModificationEntity(this);
+    public OperationalStatusModificationEntity toEntity() {
+        return new OperationalStatusModificationEntity(this);
     }
 
     @Override
     public AbstractModification toModification() {
-        return new BranchStatusModification(this);
+        return new OperationalStatusModification(this);
     }
 
     @Override
     public Reporter createSubReporter(ReporterModel reporter) {
         String defaultName;
         switch (action) {
             case LOCKOUT:
-                defaultName = "Lockout ${branchId}";
+                defaultName = "Lockout ${equipmentId}";
                 break;
             case TRIP:
-                defaultName = "Trip ${branchId}";
+                defaultName = "Trip ${equipmentId}";
                 break;
             case ENERGISE_END_ONE:
             case ENERGISE_END_TWO:
-                defaultName = "Energise ${branchId}";
+                defaultName = "Energise ${equipmentId}";
                 break;
             case SWITCH_ON:
-                defaultName = "Switch on ${branchId}";
+                defaultName = "Switch on ${equipmentId}";
                 break;
             default:
                 defaultName = "";
         }
-        return reporter.createSubReporter(getType().name() + "_" + action, defaultName, "branchId", this.getEquipmentId());
+        return reporter.createSubReporter(getType().name() + "_" + action, defaultName, "equipmentId", this.getEquipmentId());
     }
 
     @Override
     public void check() {
         super.check();
         if (action == null) {
-            throw new NetworkModificationException(BRANCH_ACTION_TYPE_EMPTY);
+            throw new NetworkModificationException(OPERATIONAL_STATUS_TYPE_EMPTY);
         }
     }
 

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java → src/main/java/org/gridsuite/modification/server/entities/equipment/modification/OperationalStatusModificationEntity.java

@@ -9,7 +9,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import org.gridsuite.modification.server.dto.BranchStatusModificationInfos;
+import org.gridsuite.modification.server.dto.OperationalStatusModificationInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 
 import jakarta.persistence.*;
@@ -20,36 +20,36 @@
 @NoArgsConstructor
 @Getter
 @Entity
-@Table(name = "branchStatusModification")
-@PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "branchStatusModification_id_fk_constraint"))
-public class BranchStatusModificationEntity extends EquipmentModificationEntity {
+@Table(name = "operationalStatusModification")
+@PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "operationalStatusModification_id_fk_constraint"))
+public class OperationalStatusModificationEntity extends EquipmentModificationEntity {
 
     @Column(name = "action")
     @Enumerated(EnumType.STRING)
-    private BranchStatusModificationInfos.ActionType action;
+    private OperationalStatusModificationInfos.ActionType action;
 
     @Column
     private String energizedVoltageLevelId;
 
-    public BranchStatusModificationEntity(@NonNull BranchStatusModificationInfos branchStatusModificationInfos) {
-        super(branchStatusModificationInfos);
-        assignAttributes(branchStatusModificationInfos);
+    public OperationalStatusModificationEntity(@NonNull OperationalStatusModificationInfos operationalStatusModificationInfos) {
+        super(operationalStatusModificationInfos);
+        assignAttributes(operationalStatusModificationInfos);
     }
 
     @Override
     public void update(@NonNull ModificationInfos modificationInfos) {
         super.update(modificationInfos);
-        assignAttributes((BranchStatusModificationInfos) modificationInfos);
+        assignAttributes((OperationalStatusModificationInfos) modificationInfos);
     }
 
-    private void assignAttributes(BranchStatusModificationInfos branchStatusModificationInfos) {
-        action = branchStatusModificationInfos.getAction();
-        energizedVoltageLevelId = branchStatusModificationInfos.getEnergizedVoltageLevelId();
+    private void assignAttributes(OperationalStatusModificationInfos operationalStatusModificationInfos) {
+        action = operationalStatusModificationInfos.getAction();
+        energizedVoltageLevelId = operationalStatusModificationInfos.getEnergizedVoltageLevelId();
     }
 
     @Override
-    public BranchStatusModificationInfos toModificationInfos() {
-        return BranchStatusModificationInfos
+    public OperationalStatusModificationInfos toModificationInfos() {
+        return OperationalStatusModificationInfos
             .builder()
             .uuid(getId())
             .date(getDate())