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

Migrate criteria filters to expert filters #137

Merged
merged 35 commits into from
Dec 3, 2024

Conversation

basseche
Copy link
Contributor

@basseche basseche commented Nov 14, 2024

migration all criteria based filters to expert filters, code clean will be done in the next PR

@basseche basseche changed the title WIP : Migration equipment filter - first phase Ok WIP : Migration equipment filter Nov 14, 2024
@basseche basseche self-assigned this Nov 14, 2024
@basseche basseche changed the title WIP : Migration equipment filter Migration equipment filter Nov 19, 2024
@basseche basseche force-pushed the migration-equipment-filter branch from 66b3f16 to 03e5f84 Compare November 19, 2024 15:08
pom.xml Show resolved Hide resolved
@basseche basseche force-pushed the migration-equipment-filter branch from 793b434 to 594fd42 Compare November 22, 2024 14:58
@basseche basseche force-pushed the migration-equipment-filter branch from 594fd42 to 8807198 Compare November 22, 2024 15:00
@etiennehomer etiennehomer changed the title Migration equipment filter Migrate criteria filters to expert filters Nov 27, 2024
@thangqp thangqp self-requested a review November 28, 2024 12:54
etiennehomer
etiennehomer previously approved these changes Nov 29, 2024
@etiennehomer etiennehomer self-requested a review November 29, 2024 12:00
@etiennehomer etiennehomer dismissed their stale review November 29, 2024 12:00

Some problems with the tests

}

@Test
public void testExportFilters() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

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

You should keep the parts that test identifier list filters

UUID filterId3 = UUID.fromString("42b70a4d-e0c4-413a-8e3e-78e9027d300c");
UUID filterId4 = UUID.fromString("42b70a4d-e0c4-413a-8e3e-78e9027d300d");

LineFilter lineFilter = LineFilter.builder().equipmentID("NHV1_NHV2_1").substationName1("P1").substationName2("P2")
Copy link
Contributor

Choose a reason for hiding this comment

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

should be replaced by some other filter type

UUID filterId2 = UUID.randomUUID();
UUID filterId3 = UUID.randomUUID();

LineFilter lineFilter1 = LineFilter.builder().equipmentID("NHV1_NHV2_1").substationName1("P1").substationName2("P2")
Copy link
Contributor

Choose a reason for hiding this comment

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

should be replaced by some other filter type

@@ -2148,120 +1409,4 @@ public void testExpertFilterLoadLinkToOtherFilterWithIsPartOfOperator() throws E
checkFilterEvaluating(expertFilter, expectedResultJson);
}

@Test
public void testLineFiltersCrudInBatch() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

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

@thangqp this test should be kept also nope ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

but there are only criteria Filters inside

Copy link
Contributor

Choose a reason for hiding this comment

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

In my opinion, every ancient tests for general features, but using criteria-based filters, should be replaced by equivalent expert filters

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

@@ -220,565 +219,6 @@ public String joinWithComma(Object... array) {
return join(array, ",");
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Remove all ununsed methods

Copy link

sonarqubecloud bot commented Dec 3, 2024

@etiennehomer etiennehomer merged commit c63ac27 into main Dec 3, 2024
5 checks passed
@etiennehomer etiennehomer deleted the migration-equipment-filter branch December 3, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants