Skip to content

Commit ef5cbc6

Browse files
committed
Revert changes on modification
Signed-off-by: basseche <[email protected]>
1 parent c4eeeb3 commit ef5cbc6

File tree

3 files changed

+2
-79
lines changed

3 files changed

+2
-79
lines changed

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyModificationEntity.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/OperationalLimitsGroupModificationEntity.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@
1111
import lombok.Getter;
1212
import lombok.NoArgsConstructor;
1313
import lombok.NonNull;
14-
import org.gridsuite.modification.dto.LimitsPropertyInfos;
1514
import org.gridsuite.modification.dto.OperationalLimitsGroupInfos;
1615
import org.gridsuite.modification.dto.OperationalLimitsGroupModificationInfos;
1716
import org.gridsuite.modification.dto.OperationalLimitsGroupModificationType;
1817
import org.gridsuite.modification.dto.TemporaryLimitModificationType;
1918
import org.springframework.util.CollectionUtils;
2019

21-
import java.util.ArrayList;
2220
import java.util.List;
2321
import java.util.Objects;
2422
import java.util.UUID;
@@ -63,18 +61,6 @@ public class OperationalLimitsGroupModificationEntity {
6361
@Enumerated(EnumType.STRING)
6462
private OperationalLimitsGroupInfos.Applicability applicability;
6563

66-
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
67-
@JoinColumn(name = "operational_limit_group_id", foreignKey = @ForeignKey(name = "operational_limit_group_modification_id_fk"))
68-
private List<LimitsPropertyModificationEntity> limitsProperties;
69-
70-
private static List<LimitsPropertyModificationEntity> toLimitPropertyEntities(List<LimitsPropertyInfos> properties) {
71-
List<LimitsPropertyModificationEntity> result = new ArrayList<>();
72-
if (!CollectionUtils.isEmpty(properties)) {
73-
result = properties.stream().map(LimitsPropertyModificationEntity::fromLimitsPropertyInfos).toList();
74-
}
75-
return result;
76-
}
77-
7864
public static List<OperationalLimitsGroupModificationEntity> toOperationalLimitsGroupsEntities(@NonNull List<OperationalLimitsGroupModificationInfos> limitsGroups) {
7965
return limitsGroups.stream()
8066
.filter(Objects::nonNull)
@@ -85,9 +71,8 @@ public static List<OperationalLimitsGroupModificationEntity> toOperationalLimits
8571
new CurrentLimitsModificationEntity(limitsGroup.getCurrentLimits()),
8672
limitsGroup.getModificationType(),
8773
limitsGroup.getTemporaryLimitsModificationType(),
88-
limitsGroup.getApplicability(),
89-
toLimitPropertyEntities(limitsGroup.getLimitsProperties()))
90-
).toList();
74+
limitsGroup.getApplicability()
75+
)).toList();
9176
}
9277

9378
public static List<OperationalLimitsGroupModificationInfos> fromOperationalLimitsGroupsEntities(List<OperationalLimitsGroupModificationEntity> limitsGroupsEntities) {
@@ -100,8 +85,6 @@ public static List<OperationalLimitsGroupModificationInfos> fromOperationalLimit
10085
.modificationType(limitsGroupEntity.getModificationType())
10186
.temporaryLimitsModificationType(limitsGroupEntity.getTemporaryLimitsModificationType())
10287
.applicability(limitsGroupEntity.getApplicability())
103-
.limitsProperties(limitsGroupEntity.getLimitsProperties().stream().map(
104-
LimitsPropertyModificationEntity::toLimitsPropertyInfos).toList())
10588
.build()
10689
)
10790
.collect(Collectors.toList());

src/main/resources/db/changelog/changesets/changelog_20251009T130154Z.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,4 @@
1717
<changeSet author="elcheikhbas (generated)" id="1760014971491-2">
1818
<addForeignKeyConstraint baseColumnNames="operational_limit_group_id" baseTableName="limits_property" constraintName="operational_limit_group_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="uuid" referencedTableName="operational_limits_group" validate="true"/>
1919
</changeSet>
20-
<changeSet author="elcheikhbas (generated)" id="1760357420884-3">
21-
<createTable tableName="limits_property_modification">
22-
<column name="id" type="UUID">
23-
<constraints nullable="false" primaryKey="true" primaryKeyName="limits_property_modificationPK"/>
24-
</column>
25-
<column name="name" type="VARCHAR(255)">
26-
<constraints nullable="false"/>
27-
</column>
28-
<column name="value" type="VARCHAR(255)">
29-
<constraints nullable="false"/>
30-
</column>
31-
<column name="operational_limit_group_id" type="UUID"/>
32-
</createTable>
33-
</changeSet>
34-
<changeSet author="elcheikhbas (generated)" id="1760014971491-4">
35-
<addForeignKeyConstraint baseColumnNames="operational_limit_group_id" baseTableName="limits_property_modification" constraintName="operational_limit_group_modification_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="uuid" referencedTableName="operational_limits_group_modification" validate="true"/>
36-
</changeSet>
3720
</databaseChangeLog>

0 commit comments

Comments
 (0)