Pagination / filter / ordering #86

klesaulnier · 2023-10-13T14:15:26Z

No description provided.

Signed-off-by: LE SAULNIER Kevin <[email protected]>

…ering

Signed-off-by: LE SAULNIER Kevin <[email protected]>

…ering

Signed-off-by: LE SAULNIER Kevin <[email protected]>

… be empty" This reverts commit f618f82.

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Tristan-WorkGH

just some (optional) updates on javadoc, still good for me

Tristan-WorkGH · 2023-11-08T09:34:54Z

.../java/org/gridsuite/securityanalysis/server/repositories/CommonLimitViolationRepository.java

@@ -7,12 +13,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+/**
+ * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
+ */

 public interface CommonLimitViolationRepository<T> {
    /**
     * Returns specification depending on {filters}


Suggested change

* Returns specification depending on {filters}

* Returns specification depending on {@code filters}<br/>

Tristan-WorkGH · 2023-11-08T09:39:01Z

.../java/org/gridsuite/securityanalysis/server/repositories/CommonLimitViolationRepository.java

+     * This interface is common for both SubjectLimitViolationRepository and ContingencyRepository
+     * except for <i>addPredicate</i> which need to be implemented


Suggested change

* This interface is common for both SubjectLimitViolationRepository and ContingencyRepository

* except for <i>addPredicate</i> which need to be implemented

* This interface is common for both {@link SubjectLimitViolationRepository} and {@link ContingencyRepository}

* except for {@link #addPredicate(CriteriaBuilder, Root, List, ResourceFilterDTO) addPredicate}

* which need to be implemented

Tristan-WorkGH · 2023-11-08T09:45:29Z

src/main/java/org/gridsuite/securityanalysis/server/dto/ResourceFilterDTO.java

+/**
+ * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
+ */
+
+/**
+ * An object that can be used to filter data with the JPA Criteria API (via Spring Specification)
+ * @param dataType the type of data we want to filter (text, number)
+ * @param type the type of filter (contains, startsWith...)
+ * @param value the value of the filter
+ * @param column the column / field on which the filter will be applied
+ */


Dangling Javadoc comment

You can't have 2 javadoc blocks on same element

Suggested change

/**

* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>

*/

/**

* An object that can be used to filter data with the JPA Criteria API (via Spring Specification)

* @param dataType the type of data we want to filter (text, number)

* @param type the type of filter (contains, startsWith...)

* @param value the value of the filter

* @param column the column / field on which the filter will be applied

*/

/**

* An object that can be used to filter data with the JPA Criteria API (via Spring Specification)

* @param dataType the type of data we want to filter (text, number)

* @param type the type of filter (contains, startsWith...)

* @param value the value of the filter

* @param column the column / field on which the filter will be applied

*

* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>

*/

Tristan-WorkGH · 2023-11-08T09:47:08Z

.../java/org/gridsuite/securityanalysis/server/repositories/CommonLimitViolationRepository.java

+/**
+ * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
+ */
+


Suggested change

/**

* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>

*/

/**

* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>

*/

Tristan-WorkGH · 2023-11-08T09:48:18Z

src/main/java/org/gridsuite/securityanalysis/server/repositories/ContingencyRepository.java

-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+
 /**
 * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
 */



Suggested change

Tristan-WorkGH · 2023-11-08T09:51:52Z

src/main/java/org/gridsuite/securityanalysis/server/repositories/CriteriaUtils.java

+    }
+
+    /**
+     * returns atomic predicate depending on filter.dataType() and filter.type()


Suggested change

* returns atomic predicate depending on filter.dataType() and filter.type()

* Returns atomic {@link Predicate} depending on {@code filter.dataType()} and {@code filter.type()}

Tristan-WorkGH · 2023-11-08T09:56:24Z

src/main/java/org/gridsuite/securityanalysis/server/repositories/CriteriaUtils.java

+     */
+    private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) {


Suggested change

*/

private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) {

* @throws UnsupportedOperationException if {@link ResourceFilterDTO.DataType filter.type} not supported or {@code filter.value} is {@code null}

*/

private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) throws UnsupportedOperationException {

Tristan-WorkGH · 2023-11-08T09:57:20Z

src/main/java/org/gridsuite/securityanalysis/server/repositories/CriteriaUtils.java

+                case EQUALS -> criteriaBuilder.equal(criteriaBuilder.upper(stringExpression), stringValue.toUpperCase());
+            };
+        } else {
+            throw new UnsupportedOperationException("Not implemented");


Suggested change

throw new UnsupportedOperationException("Not implemented");

throw new UnsupportedOperationException("Not supported type " + filter.dataType());

Tristan-WorkGH · 2023-11-08T09:57:39Z

...java/org/gridsuite/securityanalysis/server/repositories/SubjectLimitViolationRepository.java


 import java.util.List;
 import java.util.UUID;
+
 /**
 * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
 */



Suggested change

Tristan-WorkGH · 2023-11-08T09:59:43Z

src/test/java/org/gridsuite/securityanalysis/server/FindSubjectLimitViolationsTest.java

+import static com.vladmihalcea.sql.SQLStatementCountValidator.reset;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.gridsuite.securityanalysis.server.SecurityAnalysisProviderMock.*;
+/**


Suggested change

/**

/**

achour94

test OK

Signed-off-by: LE SAULNIER Kevin <[email protected]>

sonarqubecloud · 2023-11-09T09:45:50Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

86.8% Coverage
0.0% Duplication

LE SAULNIER Kevin added 30 commits October 4, 2023 09:54

fix: new entities creation

3d76860

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: find / insert result fixed with new structure

12f4da9

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: changed repository by service which is more accurate

321a978

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: removed old entities

4ebac81

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: changed table name

f641099

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: tests, one last to fix

b1bb6ca

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: add Lazy to ManyToOne relations

d22aaec

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: first implementation of new endpoints

943d87d

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: all tests fixed, elements id/type added to DTO

9e30312

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove old changelog

a3274a9

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove unused repository

612b8c5

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

6f2b461

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: sonar bugs

8531e89

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: switch left to prepare future developments

8d07b01

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: add @Getter to DTO

004dccd

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Merge remote-tracking branch 'origin/main' into fix_data_structure

2e3a91a

fix: remove unused method

4b09f16

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: status now saved even if result does not exist yet

ceae040

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

b49e364

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: changelog

9c62720

Signed-off-by: LE SAULNIER Kevin <[email protected]>

feat: removed webflux - some tests not working yet

fa7e55b

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove webflux from supervision test class

f673bfc

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: async stop test

39f167a

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

e3d1441

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: tests

d5c3f8f

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

a7f5ff0

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: test

60ebf6d

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: mock had been removed by mistake

ce3830f

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: interruption exception handling

f47a2db

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove fixme

165ebc6

Signed-off-by: LE SAULNIER Kevin <[email protected]>

achour94 approved these changes Oct 31, 2023

View reviewed changes

LE SAULNIER Kevin added 6 commits November 3, 2023 11:31

fix: pagination is now made correctly instead of being made in memory

e25701d

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: n+1 requests byu fetching ManyToOne relation in specification

b1c74b8

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Merge remote-tracking branch 'origin/main' into pagination_filter_ord…

a6e285c

…ering

fix: filter some more limit types

ddc9101

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: make string filters case insensitive

ea6431f

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

e98a21b

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Tristan-WorkGH approved these changes Nov 3, 2023

View reviewed changes

LE SAULNIER Kevin added 16 commits November 6, 2023 10:09

fix: sonar code smells and bugs

35eb775

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: circular reference

0be8e5a

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

28bce8b

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Merge remote-tracking branch 'origin/main' into pagination_filter_ord…

4e4867d

…ering

fix: checkstyle

4ea92b4

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: sonar bug

89572df

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: enum was not excluded properly

8adaba3

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: filtering children now filters parents if they happen to be empty

f618f82

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Revert "fix: filtering children now filters parents if they happen to…

929b7f0

… be empty" This reverts commit f618f82.

fix: remove children filtering because of unwanted behaviour

9aebfd1

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove obsolete code

2885266

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: remove obsolete endpoints + add test

570fced

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: checkstyle

4e1d90b

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: copyright/author header + checkstyle

3ea3e72

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: add entitygraph option to prevent n+1 fetching

9955ae3

Signed-off-by: LE SAULNIER Kevin <[email protected]>

fix: add select count to prevent future problems

c70af99

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Tristan-WorkGH approved these changes Nov 8, 2023

View reviewed changes

achour94 approved these changes Nov 8, 2023

View reviewed changes

fix: improve javadoc according to PR remarks

c408ebc

Signed-off-by: LE SAULNIER Kevin <[email protected]>

klesaulnier merged commit c6fcec8 into main Nov 9, 2023
4 checks passed

klesaulnier deleted the pagination_filter_ordering branch November 9, 2023 13:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pagination / filter / ordering #86

Pagination / filter / ordering #86

klesaulnier commented Oct 13, 2023

Tristan-WorkGH left a comment

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

klesaulnier Nov 9, 2023

Tristan-WorkGH Nov 8, 2023

Tristan-WorkGH Nov 8, 2023

achour94 left a comment

sonarqubecloud bot commented Nov 9, 2023

	* Returns specification depending on {filters}
	* Returns specification depending on {@code filters}<br/>

		* This interface is common for both SubjectLimitViolationRepository and ContingencyRepository
		* except for <i>addPredicate</i> which need to be implemented

-     * This interface is common for both SubjectLimitViolationRepository and ContingencyRepository
-     * except for <i>addPredicate</i> which need to be implemented
+     * This interface is common for both {@link SubjectLimitViolationRepository} and {@link ContingencyRepository}
+     * except for {@link #addPredicate(CriteriaBuilder, Root, List, ResourceFilterDTO) addPredicate}
+     * which need to be implemented

	* returns atomic predicate depending on filter.dataType() and filter.type()
	* Returns atomic {@link Predicate} depending on {@code filter.dataType()} and {@code filter.type()}

		*/
		private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) {

-     */
-    private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) {
+     * @throws UnsupportedOperationException if {@link ResourceFilterDTO.DataType filter.type} not supported or {@code filter.value} is {@code null}
+     */
+    private static Predicate filterToAtomicPredicate(CriteriaBuilder criteriaBuilder, Expression<?> expression, ResourceFilterDTO filter, Object value) throws UnsupportedOperationException {

	throw new UnsupportedOperationException("Not implemented");
	throw new UnsupportedOperationException("Not supported type " + filter.dataType());

Pagination / filter / ordering #86

Pagination / filter / ordering #86

Conversation

klesaulnier commented Oct 13, 2023

Tristan-WorkGH left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

achour94 left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Nov 9, 2023