Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add by formula modification #359

Merged
merged 30 commits into from
Nov 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixes formula orders
Seddik Yengui committed Nov 2, 2023
commit e308b570fedafdc27e1aa12b01fadb26b19b2bf7
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
package org.gridsuite.modification.server.entities.equipment.modification;

import com.powsybl.iidm.network.IdentifiableType;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
@@ -29,6 +24,8 @@ public class ByFormulaModificationEntity extends ModificationEntity {
private IdentifiableType identifiableType;

@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinColumn(name = "by_formula_modification_id",
foreignKey = @ForeignKey(name = "by_formula_modification_id_fk"))
private List<FormulaEntity> formulaEntities;

public ByFormulaModificationEntity(ByFormulaModificationInfos byFormulaModificationInfos) {
Original file line number Diff line number Diff line change
@@ -28,17 +28,14 @@
@Getter
@Setter
@Entity
@Table(name = "formula")
@Table(name = "formula", indexes = @Index(name = "by_formula_modification_id_idx", columnList = "by_formula_modification_id"))
public class FormulaEntity {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id")
private UUID id;

@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinTable(
joinColumns = @JoinColumn(name = "id"),
inverseJoinColumns = @JoinColumn(name = "filterId"))
private List<VariationFilterEntity> filters;

@Column

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?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="yenguised (generated)" id="1698938664570-31">
<createTable tableName="by_formula_modification">
<column name="identifiable_type" type="SMALLINT"/>
<column name="id" type="UUID">
<constraints nullable="false" primaryKey="true" primaryKeyName="by_formula_modificationPK"/>
</column>
</createTable>
</changeSet>
<changeSet author="yenguised (generated)" id="1698938664570-32">
<createTable tableName="formula">
<column name="id" type="UUID">
<constraints nullable="false" primaryKey="true" primaryKeyName="formulaPK"/>
</column>
<column name="edited_field" type="VARCHAR(255)"/>
<column name="equipment_field1" type="VARCHAR(255)"/>
<column name="equipment_field2" type="VARCHAR(255)"/>
<column name="operator" type="SMALLINT"/>
<column name="value1" type="FLOAT(53)"/>
<column name="value2" type="FLOAT(53)"/>
<column name="by_formula_modification_id" type="UUID"/>
</createTable>
</changeSet>
<changeSet author="yenguised (generated)" id="1698938664570-33">
<createTable tableName="formula_filters">
<column name="formula_entity_id" type="UUID">
<constraints nullable="false"/>
</column>
<column name="filters_id" type="UUID">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
<changeSet author="yenguised (generated)" id="1698938664570-35">
<addUniqueConstraint columnNames="filters_id" constraintName="UC_FORMULA_FILTERSFILTERS_ID_COL" tableName="formula_filters"/>
</changeSet>
<changeSet author="yenguised (generated)" id="1698938664570-49">
<createIndex indexName="by_formula_modification_id_idx" tableName="formula">
<column name="by_formula_modification_id"/>
</createIndex>
</changeSet>
</databaseChangeLog>
6 changes: 3 additions & 3 deletions src/main/resources/db/changelog/db.changelog-master.yaml
Original file line number Diff line number Diff line change
@@ -201,12 +201,12 @@ databaseChangeLog:
- include:
file: changesets/changelog_20230801T194601Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231026T111001Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231011T120303Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231019T143032Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231102T152406Z.xml
relativeToChangelogFile: true