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.

Sign up for GitHub

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

Jump to bottom

Get modifications from metadata #345

Merged
merged 34 commits into from
Nov 6, 2023
Merged

Get modifications from metadata #345

merged 34 commits into from
Nov 6, 2023

Conversation

souissimai
Copy link
Contributor

No description provided.

@souissimai souissimai changed the title Get modifications from metadata [WIP] Get modifications from metadata Oct 11, 2023
@souissimai souissimai changed the title [WIP] Get modifications from metadata Get modifications from metadata Oct 13, 2023
@Meklo Meklo self-requested a review October 16, 2023 13:27
@Meklo
Copy link
Contributor

Meklo commented Oct 16, 2023 •
edited
Loading

How come onlyMetadata param for getNetworkModifications endpoint you added in the study-server PR is not present in this one ?
EDIT : It was alreay there, my bad

@Meklo
Copy link
Contributor

Meklo commented Oct 17, 2023

I think we should handle data migration otherwise older studies will be broken

@Meklo
Copy link
Contributor

Meklo commented Oct 17, 2023

I reckon it would be worth to add a test to check a modification properties when we specify or not onlyMetadata

@souissimai souissimai requested a review from Meklo October 25, 2023 07:34
@Tristan-WorkGH Tristan-WorkGH self-requested a review October 30, 2023 09:24
@Tristan-WorkGH Tristan-WorkGH marked this pull request as draft October 30, 2023 09:24
@souissimai souissimai marked this pull request as ready for review October 30, 2023 09:27
@souissimai souissimai changed the title Get modifications from metadata [WIP]Get modifications from metadata Oct 30, 2023
@souissimai
merge main , resolve conflicts
b099c62 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
fix checkstyle
86cc965 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
migration metadata solution
931388a 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
clean sql scripts
eb9db41 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
tabular modification case
dff0d46 
Signed-off-by: Maissa SOUISSI <[email protected]>
souissimai and others added 15 commits November 2, 2023 15:49
@souissimai
delete non useful sql file
9af610e 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
add tests
95e053b 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
revert
796689e 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
put only metadata true by default
ac795dc 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
fix test
dc35d54 
Signed-off-by: Maissa SOUISSI <[email protected]>
@SlimaneAmar
Save modification type in database
f754a12 
Signed-off-by: Slimane AMAR <[email protected]>
@souissimai
update tests
8c23f2d 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
Merge branch 'get_modifications_from_metadata' of https://github.com/…
a62e076 
…gridsuite/network-modification-server into get_modifications_from_metadata
@souissimai
fix
d4d61c0 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
Merge branch 'main' into get_modifications_from_metadata
12858cc
@souissimai
other tests
4114b1b 
Signed-off-by: Maissa SOUISSI <[email protected]>
@souissimai
Merge branch 'get_modifications_from_metadata' of https://github.com/…
fafd4df 
…gridsuite/network-modification-server into get_modifications_from_metadata
@SlimaneAmar
Revert dafault value for 'onlyMetadata'
f2f9df9 
Signed-off-by: Slimane AMAR <[email protected]>
@SlimaneAmar
Merge branch 'get_modifications_from_metadata' of https://github.com/…
e59f2aa 
…gridsuite/network-modification-server into get_modifications_from_metadata
@SlimaneAmar
Remove code smell
8ec6c37 
Signed-off-by: Slimane AMAR <[email protected]>
@souissimai souissimai requested review from Tristan-WorkGH and removed request for Tristan-WorkGH November 6, 2023 07:34
Tristan-WorkGH
Tristan-WorkGH approved these changes Nov 6, 2023
View reviewed changes
Copy link
Contributor

@Tristan-WorkGH Tristan-WorkGH left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last review: 2 remaining

src/main/resources/db/changelog/changesets/changelog_20231010T120459Z.xml Outdated
Comment on lines 19 to 24
<sqlFile
encoding="UTF-8"
path="migrationMetadataModifications.sql"
relativeToChangelogFile="true"
splitStatements="true"
stripComments="true"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't add unnecessary files, add sql in changeset directly

src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java Outdated
status().isOk(), content().contentType(MediaType.APPLICATION_JSON))
.andReturn();

List<VoltageInitModificationInfos> modificationsInfos2 = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { });
assertEquals(1, modificationsInfos2.size());
assertThat(modificationsInfos2.get(0)).recursivelyEquals(modificationsInfos1);
// assertThat(modificationsInfos2.get(0)).recursivelyEquals(modificationsInfos1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what problem did you encounter for disabling this assertion?

@souissimai
fixes
09e2e08 
Signed-off-by: Maissa SOUISSI <[email protected]>
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Nov 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

98.4% 98.4% Coverage
0.0% 0.0% Duplication

@souissimai souissimai merged commit 8d9fe7e into main Nov 6, 2023
4 checks passed
@souissimai souissimai deleted the get_modifications_from_metadata branch November 6, 2023 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tristan-WorkGH Tristan-WorkGH Tristan-WorkGH approved these changes

@SlimaneAmar SlimaneAmar SlimaneAmar approved these changes

@Meklo Meklo Meklo approved these changes

Assignees

@souissimai souissimai

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@souissimai @Meklo @SlimaneAmar @Tristan-WorkGH