Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: compilable version + changelogs
Browse files Browse the repository at this point in the history
Signed-off-by: LE SAULNIER Kevin <kevin.lesaulnier@rte-france.com>
LE SAULNIER Kevin committed Sep 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent c1a186f commit ae83bf8
Showing 7 changed files with 66 additions and 95 deletions.
Original file line number Diff line number Diff line change
@@ -48,6 +48,4 @@ public UUID getId() {

@Column
Boolean readOnly;

public abstract NodeType getType();
}
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ public class NetworkModificationNodeInfoEntity extends AbstractNodeInfoEntity {
protected List<TimePointNodeInfoEntity> timePointNodeInfos;

//TODO temporary, for now we are only working with one timepoint by study
@Transient
public TimePointNodeInfoEntity getFirstTimePointNodeStatusEntity() {
if (timePointNodeInfos == null || timePointNodeInfos.isEmpty()) {
return null;
@@ -44,9 +45,4 @@ public TimePointNodeInfoEntity getFirstTimePointNodeStatusEntity() {
public TimePointNodeInfoEntity toTimePointNodeInfoEntity(TimePointEntity timePoint) {
return new TimePointNodeInfoEntity(timePoint, this);
}

@Override
public NodeType getType() {
return NodeType.NETWORK_MODIFICATION;
}
}
Original file line number Diff line number Diff line change
@@ -23,9 +23,4 @@
@Entity
@SuperBuilder
@Table(name = "RootNodeInfo")
public class RootNodeInfoEntity extends AbstractNodeInfoEntity {
@Override
public NodeType getType() {
return NodeType.ROOT;
}
}
public class RootNodeInfoEntity extends AbstractNodeInfoEntity { }
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ public TimePointNodeInfoEntity(TimePointEntity timePoint, NetworkModificationNod

@Column(name = "modificationsToExclude")
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(name = "timePointNodeStatusEntity_modificationsToExclude_fk"), indexes = {@Index(name = "timePointNodeStatusEntity_modificationsToExclude_idx", columnList = "time_point_network_modification_node_info_id")})
@CollectionTable(foreignKey = @ForeignKey(name = "timePointNodeInfoEntity_modificationsToExclude_fk"), indexes = {@Index(name = "time_point_node_info_entity_modifications_to_exclude_idx", columnList = "time_point_node_info_entity_id")})
private Set<UUID> modificationsToExclude;

@Column(name = "shortCircuitAnalysisResultUuid")

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?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="lesaulnierkev (generated)" id="1725882642645-10">
<createTable tableName="time_point_node_status">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-10">
<createTable tableName="time_point_node_info">
<column name="id" type="UUID">
<constraints nullable="false" primaryKey="true" primaryKeyName="time_point_node_statusPK"/>
<constraints nullable="false" primaryKey="true" primaryKeyName="time_point_node_infoPK"/>
</column>
<column name="dynamic_simulation_result_uuid" type="UUID"/>
<column name="loadflow_result_uuid" type="UUID"/>
@@ -15,6 +15,7 @@
</column>
<column name="non_evacuated_energy_result_uuid" type="UUID"/>
<column name="one_bus_short_circuit_analysis_result_uuid" type="UUID"/>
<column name="report_uuid" type="UUID"/>
<column name="security_analysis_result_uuid" type="UUID"/>
<column name="sensitivity_analysis_result_uuid" type="UUID"/>
<column name="short_circuit_analysis_result_uuid" type="UUID"/>
@@ -23,18 +24,17 @@
<column name="voltage_init_result_uuid" type="UUID"/>
<column name="node_info_id" type="UUID"/>
<column name="time_point_id" type="UUID"/>
<column name="report_uuid" type="uuid"/>
</createTable>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-11">
<createTable tableName="time_point_node_status_entity_modifications_to_exclude">
<column name="time_point_node_status_entity_id" type="UUID">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-11">
<createTable tableName="time_point_node_info_entity_modifications_to_exclude">
<column name="time_point_node_info_entity_id" type="UUID">
<constraints nullable="false"/>
</column>
<column name="modifications_to_exclude" type="uuid"/>
<column name="modifications_to_exclude" type="UUID"/>
</createTable>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-12">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-12">
<createTable tableName="timepoint">
<column name="id" type="UUID">
<constraints nullable="false" primaryKey="true" primaryKeyName="timepointPK"/>
@@ -54,122 +54,124 @@
<column name="network_uuid" type="UUID">
<constraints nullable="false"/>
</column>
<column name="report_uuid" type="UUID"/>
<column name="study_uuid" type="UUID"/>
</createTable>
</changeSet>
<!-- DATA MIGRATION-->
<!-- <changeSet author="lesaulnierkev" id="1725882642645-100">-->
<!-- <update tableName="TABLE_A">-->
<!-- <column name="x" valueComputed="(select b.x from TABLE_B b where b.id=id)"/>-->
<!-- </update>-->
<!-- </changeSet>-->
<!-- DATA MIGRATION-->
<changeSet author="lesaulnierkev (generated)" id="1725882642645-13">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-13">
<addUniqueConstraint columnNames="non_evacuated_energy_parameters_id" constraintName="UC_NON_EVACUATED_ENERGY_PARAMETERSNON_EVACUATED_ENERGY_PARAMETE" tableName="non_evacuated_energy_parameters"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-14">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-14">
<addUniqueConstraint columnNames="dynamic_simulation_parameters_entity_id" constraintName="UC_STUDYDYNAMIC_SIMULATION_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-15">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-15">
<addUniqueConstraint columnNames="non_evacuated_energy_parameters_entity_id" constraintName="UC_STUDYNON_EVACUATED_ENERGY_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-16">
<addForeignKeyConstraint baseColumnNames="time_point_node_status_entity_id" baseTableName="time_point_node_status_entity_modifications_to_exclude" constraintName="FK9her7my2dn78h6jhc7fy2s05s" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="time_point_node_status" validate="true"/>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-16">
<createIndex indexName="time_point_node_info_entity_modifications_to_exclude_idx" tableName="time_point_node_info_entity_modifications_to_exclude">
<column name="time_point_node_info_entity_id"/>
</createIndex>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-17">
<addForeignKeyConstraint baseColumnNames="node_info_id" baseTableName="time_point_node_status" constraintName="FKamn50teo53om4ip0foaletirq" deferrable="false" initiallyDeferred="false" referencedColumnNames="id_node" referencedTableName="network_modification_node_info" validate="true"/>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-17">
<addForeignKeyConstraint baseColumnNames="node_info_id" baseTableName="time_point_node_info" constraintName="FK40i207mmx5ep57g7xnrv16t0a" deferrable="false" initiallyDeferred="false" referencedColumnNames="id_node" referencedTableName="network_modification_node_info" validate="true"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-18">
<addForeignKeyConstraint baseColumnNames="time_point_id" baseTableName="time_point_node_status" constraintName="FKb27v0dadbi19ovkg78be943l" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="timepoint" validate="true"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-19">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-18">
<addForeignKeyConstraint baseColumnNames="study_uuid" baseTableName="timepoint" constraintName="FKgjbrcsrnadr5r0elym5xt7u1q" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="study" validate="true"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-21">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-19">
<addForeignKeyConstraint baseColumnNames="time_point_id" baseTableName="time_point_node_info" constraintName="FKnccbhd7qxmvx0bs6pthbnagrb" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="timepoint" validate="true"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-20">
<addForeignKeyConstraint baseColumnNames="time_point_node_info_entity_id" baseTableName="time_point_node_info_entity_modifications_to_exclude" constraintName="timePointNodeInfoEntity_modificationsToExclude_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="time_point_node_info" validate="true"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-21">
<dropForeignKeyConstraint baseTableName="NETWORK_MODIFICATION_NODE_INFO_ENTITY_MODIFICATIONS_TO_EXCLUDE" constraintName="NETWORKMODIFICATIONNODEINFOENTITY_MODIFICATIONSTOEXCLUDE_FK"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-22">
<dropTable tableName="NETWORK_MODIFICATION_NODE_INFO_ENTITY_MODIFICATIONS_TO_EXCLUDE"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-22">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-23">
<dropColumn columnName="CASE_FORMAT" tableName="STUDY"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-23">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-24">
<dropColumn columnName="CASE_NAME" tableName="STUDY"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-24">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-25">
<dropColumn columnName="CASE_UUID" tableName="STUDY"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-25">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-26">
<dropColumn columnName="DYNAMIC_SIMULATION_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-26">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-27">
<dropColumn columnName="GLOBAL_BUILD_STATUS" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-27">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-28">
<dropColumn columnName="LOADFLOW_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-28">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-29">
<dropColumn columnName="LOCAL_BUILD_STATUS" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-29">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-30">
<dropColumn columnName="NETWORK_ID" tableName="STUDY"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-30">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-31">
<dropColumn columnName="NETWORK_UUID" tableName="STUDY"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-31">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-32">
<dropColumn columnName="NON_EVACUATED_ENERGY_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-32">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-33">
<dropColumn columnName="ONE_BUS_SHORT_CIRCUIT_ANALYSIS_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-33">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-34">
<dropColumn columnName="REPORT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-35">
<dropColumn columnName="REPORT_UUID" tableName="ROOT_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1726585358232-36">
<dropColumn columnName="SECURITY_ANALYSIS_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-34">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-37">
<dropColumn columnName="SENSITIVITY_ANALYSIS_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-35">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-38">
<dropColumn columnName="SHORT_CIRCUIT_ANALYSIS_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-36">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-39">
<dropColumn columnName="STATE_ESTIMATION_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-37">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-40">
<dropColumn columnName="VARIANT_ID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-38">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-41">
<dropColumn columnName="VOLTAGE_INIT_RESULT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-1">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-1">
<modifyDataType columnName="import_parameters" newDataType="varchar(255)" tableName="import_parameters"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-2">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-2">
<dropDefaultValue columnDataType="boolean" columnName="stashed" tableName="node"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-3">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-3">
<dropDefaultValue columnDataType="boolean" columnName="stashed" tableName="node"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-4">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-4">
<dropUniqueConstraint constraintName="UC_NON_EVACUATED_ENERGY_PARAMETERSNON_EVACUATED_ENERGY_PARAMETE" tableName="non_evacuated_energy_parameters"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-5">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-5">
<addUniqueConstraint columnNames="non_evacuated_energy_parameters_id" constraintName="UC_NON_EVACUATED_ENERGY_PARAMETERSNON_EVACUATED_ENERGY_PARAMETE" tableName="non_evacuated_energy_parameters"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-6">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-6">
<dropUniqueConstraint constraintName="UC_STUDYDYNAMIC_SIMULATION_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-7">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-7">
<addUniqueConstraint columnNames="dynamic_simulation_parameters_entity_id" constraintName="UC_STUDYDYNAMIC_SIMULATION_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-8">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-8">
<dropUniqueConstraint constraintName="UC_STUDYNON_EVACUATED_ENERGY_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-9">
<changeSet author="lesaulnierkev (generated)" id="1726585358232-9">
<addUniqueConstraint columnNames="non_evacuated_energy_parameters_entity_id" constraintName="UC_STUDYNON_EVACUATED_ENERGY_PARAMETERS_ENTITY_ID_COL" tableName="study"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-39">
<dropColumn columnName="REPORT_UUID" tableName="NETWORK_MODIFICATION_NODE_INFO"/>
</changeSet>
<changeSet author="lesaulnierkev (generated)" id="1725882642645-40">
<dropColumn columnName="REPORT_UUID" tableName="ROOT_NODE_INFO"/>
</changeSet>
</databaseChangeLog>
2 changes: 1 addition & 1 deletion src/main/resources/db/changelog/db.changelog-master.yaml
Original file line number Diff line number Diff line change
@@ -242,5 +242,5 @@ databaseChangeLog:
file: changesets/changelog_20240624T125455Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20240909T115011Z.xml
file: changesets/changelog_20240917T150210Z.xml
relativeToChangelogFile: true

0 comments on commit ae83bf8

Please sign in to comment.