Cleanup columns that were used before generalized extensions (#71)

Signed-off-by: BOUHOURS Antoine <[email protected]>
powsybl · Oct 14, 2024 · c9f0954 · c9f0954
1 parent ac3a010
commit c9f0954
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/...rk-store-server/src/main/resources/db/changelog/changesets/changelog_20241011T120000Z.xml b/...rk-store-server/src/main/resources/db/changelog/changesets/changelog_20241011T120000Z.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="bouhoursant" id="2986331049400-1">
+        <dropColumn tableName="battery" columnName="activepowercontrol"/>
+        <dropColumn tableName="generator" columnName="activepowercontrol"/>
+        <dropColumn tableName="generator" columnName="generatorstartup"/>
+        <dropColumn tableName="line" columnName="operatingstatus"/>
+        <dropColumn tableName="hvdcline" columnName="operatingstatus"/>
+        <dropColumn tableName="tieline" columnName="operatingstatus"/>
+        <dropColumn tableName="danglingline" columnName="operatingstatus"/>
+        <dropColumn tableName="twowindingstransformer" columnName="operatingstatus"/>
+        <dropColumn tableName="threewindingstransformer" columnName="operatingstatus"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/network-store-server/src/main/resources/db/changelog/db.changelog-master.yaml b/network-store-server/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -79,3 +79,7 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20240924T110000Z.xml
       relativeToChangelogFile: true
+
+  - include:
+      file: changesets/changelog_20241011T120000Z.xml
+      relativeToChangelogFile: true
diff --git a/...store-server/src/test/java/com/powsybl/network/store/server/NetworkStoreControllerIT.java b/...store-server/src/test/java/com/powsybl/network/store/server/NetworkStoreControllerIT.java
@@ -498,12 +498,12 @@ public void test() throws Exception {
             .andExpect(jsonPath("data[0].id").value("idLine"))
             .andExpect(jsonPath("data[0].attributes.p1").value(100.))
             .andExpect(jsonPath("data[0].attributes.properties[\"property1\"]").value("newValue1"))
-            .andExpect(jsonPath("data[1].id").value("idLine2"))
-            .andExpect(jsonPath("data[1].attributes.p1").value(30.))
-            .andExpect(jsonPath("data[1].attributes.properties[\"property12\"]").value("value12"))
-            .andExpect(jsonPath("data[2].id").value("idLineWithoutFirstPosition"))
-            .andExpect(jsonPath("data[2].attributes.p1").value(0.))
-            .andExpect(jsonPath("data[2].attributes.properties[\"property1\"]").value("value1"));
+            .andExpect(jsonPath("data[1].id").value("idLineWithoutFirstPosition"))
+            .andExpect(jsonPath("data[1].attributes.p1").value(0.))
+            .andExpect(jsonPath("data[1].attributes.properties[\"property1\"]").value("value1"))
+            .andExpect(jsonPath("data[2].id").value("idLine2"))
+            .andExpect(jsonPath("data[2].attributes.p1").value(30.))
+            .andExpect(jsonPath("data[2].attributes.properties[\"property12\"]").value("value12"));
 
         mvc.perform(get("/" + VERSION + "/networks/" + NETWORK_UUID + "/" + Resource.INITIAL_VARIANT_NUM + "/voltage-levels/vl1/lines")
             .contentType(APPLICATION_JSON))