Merge pull request #385 from ProgrammeVitam/vas_item_8366_adapt_saving_criteria (db00b341) · Commits · dad / Cines Vitamui

Unverified Commit db00b341 authored 3 years ago by

clmntsl Committed by GitHub 3 years ago

Merge pull request #385 from ProgrammeVitam/vas_item_8366_adapt_saving_criteria

[VAS] Vas item 8067-8366 archive units search by appraisal mgt rules and adapt saving criteria

parents c7b9a43d 3c7ddcc3

No related branches found

No related tags found

1 merge request!51Merge mis a jour vitam-ui

Hide whitespace changes

Inline Side-by-side

Showing

api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/AppraisalRuleOriginRuleCriteria.java 43 additions, 0 deletions

...search/common/common/AppraisalRuleOriginRuleCriteria.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/ArchiveSearchConsts.java 179 additions, 0 deletions

...ui/archives/search/common/common/ArchiveSearchConsts.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java 89 additions, 176 deletions

.../vitamui/archives/search/common/dsl/VitamQueryHelper.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/CriteriaValue.java 16 additions, 17 deletions

...ouv/vitamui/archives/search/common/dto/CriteriaValue.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/SearchCriteriaDto.java 0 additions, 2 deletions

...vitamui/archives/search/common/dto/SearchCriteriaDto.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/SearchCriteriaElementsDto.java 7 additions, 1 deletion

...archives/search/common/dto/SearchCriteriaElementsDto.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/SearchCriteriaEltDto.java 18 additions, 1 deletion

...amui/archives/search/common/dto/SearchCriteriaEltDto.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/SearchCriteriaHistoryDto.java 1 addition, 1 deletion

.../archives/search/common/dto/SearchCriteriaHistoryDto.java
api/api-archive-search/archive-search-commons/src/test/java/fr/gouv/vitamui/archives/search/common/util/ArchiveSearchDtoBuilder.java 18 additions, 8 deletions

.../archives/search/common/util/ArchiveSearchDtoBuilder.java
api/api-archive-search/archive-search-external-client/pom.xml 8 additions, 2 deletions

...api-archive-search/archive-search-external-client/pom.xml
api/api-archive-search/archive-search-external-client/src/test/java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClientTest.java 14 additions, 15 deletions

.../external/client/ArchiveSearchExternalRestClientTest.java
api/api-archive-search/archive-search-external/pom.xml 0 additions, 5 deletions

api/api-archive-search/archive-search-external/pom.xml
api/api-archive-search/archive-search-external/src/test/java/fr/gouv/vitamui/archives/search/external/server/ApiArchivesSearchExternalApplicationTest.java 11 additions, 11 deletions

...rnal/server/ApiArchivesSearchExternalApplicationTest.java
api/api-archive-search/archive-search-external/src/test/java/fr/gouv/vitamui/archives/search/external/server/doc/SwaggerJsonFileGenerationTest.java 5 additions, 5 deletions

...ch/external/server/doc/SwaggerJsonFileGenerationTest.java
api/api-archive-search/archive-search-external/src/test/java/fr/gouv/vitamui/archives/search/external/server/rest/ArchivesSearchExternalControllerTest.java 23 additions, 15 deletions

...nal/server/rest/ArchivesSearchExternalControllerTest.java
api/api-archive-search/archive-search-external/src/test/java/fr/gouv/vitamui/archives/search/external/server/rest/SearchCriteriaHistoryExternalControllerTest.java 11 additions, 9 deletions

...ver/rest/SearchCriteriaHistoryExternalControllerTest.java
api/api-archive-search/archive-search-internal-client/pom.xml 10 additions, 11 deletions

...api-archive-search/archive-search-internal-client/pom.xml
api/api-archive-search/archive-search-internal-client/src/test/java/fr/gouv/archive/internal/client/ArchiveInternalRestClientTest.java 14 additions, 14 deletions

...rchive/internal/client/ArchiveInternalRestClientTest.java
api/api-archive-search/archive-search-internal/pom.xml 2 additions, 8 deletions

api/api-archive-search/archive-search-internal/pom.xml
api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalController.java 19 additions, 12 deletions

...internal/server/rest/ArchiveSearchInternalController.java

with 488 additions and 313 deletions

Please register or to comment