code review remarqs

gridsuite · Sep 12, 2024 · c607863 · c607863
1 parent 99ad321
commit c607863
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/StaticVarCompensatorCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/StaticVarCompensatorCreationInfos.java
@@ -67,8 +67,8 @@ public class StaticVarCompensatorCreationInfos extends InjectionCreationInfos {
     @Schema(description = "Regulating terminal voltage level id")
     private String regulatingTerminalVlId;
 
-    @Schema(description = "add standby automate")
-    private boolean standbyAutomateOn;
+    @Schema(description = "standby automaton on")
+    private boolean standbyAutomatonOn;
 
     @Schema(description = "Standby")
     private boolean standby;

diff --git a/...uite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java b/...uite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java
@@ -61,7 +61,7 @@ public class StaticCompensatorCreationEntity extends InjectionCreationEntity {
     private String regulatingTerminalVlId;
 
     @Column
-    private boolean standbyAutomateOn;
+    private boolean standbyAutomatonOn;
 
     @Column
     private boolean standby;
@@ -108,7 +108,7 @@ private void assignAttributes(StaticVarCompensatorCreationInfos creationInfos) {
         this.regulatingTerminalId = creationInfos.getRegulatingTerminalId();
         this.regulatingTerminalType = creationInfos.getRegulatingTerminalType();
         this.regulatingTerminalVlId = creationInfos.getRegulatingTerminalVlId();
-        this.standbyAutomateOn = creationInfos.isStandbyAutomateOn();
+        this.standbyAutomatonOn = creationInfos.isStandbyAutomatonOn();
         this.standby = creationInfos.isStandby();
         this.b0 = creationInfos.getB0();
         this.q0 = creationInfos.getQ0();
@@ -150,7 +150,7 @@ public StaticVarCompensatorCreationInfos toModificationInfos() {
             .regulatingTerminalType(getRegulatingTerminalType())
             .regulatingTerminalVlId(getRegulatingTerminalVlId())
             // Standby automaton
-            .standbyAutomateOn(isStandbyAutomateOn())
+            .standbyAutomatonOn(isStandbyAutomatonOn())
             .standby(isStandby())
             .b0(getB0())
             .q0(getQ0())

diff --git a/...in/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java b/...in/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java
@@ -77,7 +77,7 @@ public void apply(Network network, ReportNode subReportNode) {
         if (Objects.isNull(modificationInfos.getMinSusceptance()) && Objects.nonNull(modificationInfos.getMinQAtNominalV())) {
             modificationInfos.setMinSusceptance((modificationInfos.getMinQAtNominalV()) / Math.pow(voltageLevel.getNominalV(), 2));
         }
-        if (Boolean.TRUE.equals(modificationInfos.isStandbyAutomateOn()) && Objects.isNull(modificationInfos.getB0())
+        if (Boolean.TRUE.equals(modificationInfos.isStandbyAutomatonOn()) && Objects.isNull(modificationInfos.getB0())
             && Objects.nonNull(modificationInfos.getQ0())) {
             modificationInfos.setB0((modificationInfos.getQ0()) / Math.pow(voltageLevel.getNominalV(), 2));
         }
@@ -142,7 +142,7 @@ private void addExtensionsToStaticVarCompensator(StaticVarCompensatorCreationInf
 
     private void reportStaticVarCompensatorStandbyAutomaton(StaticVarCompensatorCreationInfos staticVarCompensatorCreationInfos,
                                                             StaticVarCompensator staticVarCompensator, ReportNode subReportNode) {
-        if (Boolean.TRUE.equals(staticVarCompensatorCreationInfos.isStandbyAutomateOn())) {
+        if (Boolean.TRUE.equals(staticVarCompensatorCreationInfos.isStandbyAutomatonOn())) {
             List<ReportNode> standbyAutomatonReports = new ArrayList<>();
             try {
                 staticVarCompensator.newExtension(StandbyAutomatonAdder.class)

diff --git a/...changesets/changelog_20240911T213241Z.xml → ...changesets/changelog_20240912T100256Z.xml b/...changesets/changelog_20240911T213241Z.xml → ...changesets/changelog_20240912T100256Z.xml
@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-    <changeSet author="rehiligha (generated)" id="1726090378366-29">
+    <changeSet author="rehiligha (generated)" id="1726135394096-29">
         <createTable tableName="static_var_compensator_creation">
             <column name="equipment_id" type="VARCHAR(255)"/>
             <column name="equipment_name" type="VARCHAR(255)"/>
@@ -26,15 +26,15 @@
             <column name="regulating_terminal_vl_id" type="VARCHAR(255)"/>
             <column name="regulation_mode" type="VARCHAR(255)"/>
             <column name="standby" type="BOOLEAN"/>
-            <column name="standby_automate_on" type="BOOLEAN"/>
+            <column name="standby_automaton_on" type="BOOLEAN"/>
             <column name="voltage_regulation_type" type="VARCHAR(255)"/>
             <column name="voltage_setpoint" type="FLOAT(53)"/>
             <column name="id" type="UUID">
                 <constraints nullable="false" primaryKey="true" primaryKeyName="static_var_compensator_creationPK"/>
             </column>
         </createTable>
     </changeSet>
-    <changeSet author="rehiligha (generated)" id="1726090378366-50">
+    <changeSet author="rehiligha (generated)" id="1726135394096-50">
         <addForeignKeyConstraint baseColumnNames="id" baseTableName="static_var_compensator_creation" constraintName="staticVarCompensatorCreation_id_fk_constraint" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="modification" validate="true"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -304,5 +304,5 @@ databaseChangeLog:
       file: changesets/changelog_20240709T090545Z.xml
       relativeToChangelogFile: true
   - include:    
-      file: changesets/changelog_20240911T213241Z.xml
+      file: changesets/changelog_20240912T100256Z.xml
       relativeToChangelogFile: true
diff --git a/...suite/modification/server/modifications/StaticVarCompensatorCreationInBusBreakerTest.java b/...suite/modification/server/modifications/StaticVarCompensatorCreationInBusBreakerTest.java
@@ -65,7 +65,7 @@ protected ModificationInfos buildModification() {
                 .regulatingTerminalVlId("v1")
                 .regulatingTerminalId("idGenerator1")
                 .regulatingTerminalType("GENERATOR")
-                .standbyAutomateOn(true)
+                .standbyAutomatonOn(true)
                 .standby(true)
                 .b0(221.0)
                 .lowVoltageSetpoint(200.0)

diff --git a/...uite/modification/server/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java b/...uite/modification/server/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java
@@ -62,7 +62,7 @@ protected ModificationInfos buildModification() {
                 .voltageSetpoint(120.0)
                 .reactivePowerSetpoint(300.0)
                 .voltageRegulationType(VoltageRegulationType.LOCAL)
-                .standbyAutomateOn(false)
+                .standbyAutomatonOn(false)
                 .properties(List.of(FreePropertyInfos.builder().name(PROPERTY_NAME).value(PROPERTY_VALUE).build()))
                 .build();
     }
@@ -73,7 +73,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .stashed(false)
                 .equipmentId("idStaticVarCompensator1Edited")
                 .equipmentName("staticVarCompensatorNameEdited")
-                .standbyAutomateOn(true)
+                .standbyAutomatonOn(true)
                 .standby(true)
                 .b0(221.0)
                 .lowVoltageSetpoint(200.0)
@@ -197,7 +197,7 @@ public void testCreateWithErrors() throws Exception {
     @Test
     public void testCreateWithStandbyAutomatonErrors() throws Exception {
         StaticVarCompensatorCreationInfos compensatorCreationInfos = (StaticVarCompensatorCreationInfos) buildModification();
-        compensatorCreationInfos.setStandbyAutomateOn(true);
+        compensatorCreationInfos.setStandbyAutomatonOn(true);
         compensatorCreationInfos.setB0(300.0);
 
         String compensatorCreationInfosJson = mapper.writeValueAsString(compensatorCreationInfos);

diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java
@@ -1311,7 +1311,7 @@ public void testStaticVarCompensatorCreation() {
                 .connectionName("Bot").connectionDirection(ConnectablePosition.Direction.BOTTOM)
                 .connectionPosition(2)
                 .regulationMode(VOLTAGE)
-                .standbyAutomateOn(true)
+                .standbyAutomatonOn(true)
                 .standby(true)
                 .build().toEntity();