diff --git a/src/backend/efiling-api/pom.xml b/src/backend/efiling-api/pom.xml index 56427427c1..11a3c66c75 100644 --- a/src/backend/efiling-api/pom.xml +++ b/src/backend/efiling-api/pom.xml @@ -11,7 +11,7 @@ ca.bc.gov.open.jag efiling-api - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT efiling-api Demo project for Spring Boot @@ -66,7 +66,7 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT @@ -259,7 +259,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import @@ -282,19 +282,19 @@ ca.bc.gov.open.jag efiling-cso-starter - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT ca.bc.gov.open.jag efiling-bambora-api-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT ca.bc.gov.open.jag efiling-ceis-api-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT @@ -337,7 +337,7 @@ ca.bc.gov.open.jag efiling-demo-starter - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/Keys.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/Keys.java index 3e9dcd2ecf..0f3b8ac5db 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/Keys.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/Keys.java @@ -32,4 +32,6 @@ protected Keys() {} public static final String REJECTED_DOCUMENT_CODE = "REJ"; + public static final String DEFAULT_DIVISION = "I"; + } diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImpl.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImpl.java index 420deedbe7..2eb6346531 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImpl.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImpl.java @@ -1,5 +1,6 @@ package ca.bc.gov.open.jag.efilingapi.document; +import ca.bc.gov.open.jag.efilingapi.Keys; import ca.bc.gov.open.jag.efilingapi.document.models.GetValidDocumentTypesRequest; import ca.bc.gov.open.jag.efilingcommons.model.DocumentTypeDetails; import ca.bc.gov.open.jag.efilingcommons.service.EfilingDocumentService; @@ -16,7 +17,7 @@ public DocumentServiceImpl(EfilingDocumentService efilingDocumentService) { @Override public List getValidDocumentTypes(GetValidDocumentTypesRequest getValidDocumentTypesRequest) { - return efilingDocumentService.getDocumentTypes(getValidDocumentTypesRequest.getCourtLevel(), getValidDocumentTypesRequest.getCourtClassification()); + return efilingDocumentService.getDocumentTypes(getValidDocumentTypesRequest.getCourtLevel(), getValidDocumentTypesRequest.getCourtClassification(), Keys.DEFAULT_DIVISION); } } diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImpl.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImpl.java index de1ed81b96..76b960f23e 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImpl.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImpl.java @@ -1,5 +1,6 @@ package ca.bc.gov.open.jag.efilingapi.document; +import ca.bc.gov.open.jag.efilingapi.Keys; import ca.bc.gov.open.jag.efilingapi.submission.SubmissionKey; import ca.bc.gov.open.jag.efilingcommons.model.DocumentTypeDetails; import ca.bc.gov.open.jag.efilingcommons.service.EfilingDocumentService; @@ -38,12 +39,12 @@ public void evict(SubmissionKey submissionKey, String fileName) { @Override @Cacheable(cacheNames = "documentDetails", cacheManager = "documentTypeDetailsCacheManager", unless = "#result == null") public DocumentTypeDetails getDocumentDetails(String courtLevel, String courtClass, String documentType) { - return this.efilingDocumentService.getDocumentTypeDetails(courtLevel, courtClass, documentType); + return this.efilingDocumentService.getDocumentTypeDetails(courtLevel, courtClass, documentType, Keys.DEFAULT_DIVISION); } @Override public List getDocumentTypes(String courtLevel, String courtClass) { - return this.efilingDocumentService.getDocumentTypes(courtLevel, courtClass); + return this.efilingDocumentService.getDocumentTypes(courtLevel, courtClass, Keys.DEFAULT_DIVISION); } @Override diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/FilingPackageServiceImpl.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/FilingPackageServiceImpl.java index 3c7fdde85d..4e1b7ea039 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/FilingPackageServiceImpl.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/FilingPackageServiceImpl.java @@ -66,7 +66,7 @@ public Optional getCSOFilingPackage(String universalId, BigDecima if (!filingPackage.isPresent()) return Optional.empty(); filingPackage.get().getDocuments().forEach( - reviewDocument -> reviewDocument.setRushRequired(efilingDocumentService.getDocumentTypeDetails(filingPackage.get().getCourt().getLevel(),filingPackage.get().getCourt().getCourtClass(), reviewDocument.getDocumentTypeCd()).isRushRequired()) + reviewDocument -> reviewDocument.setRushRequired(efilingDocumentService.getDocumentTypeDetails(filingPackage.get().getCourt().getLevel(),filingPackage.get().getCourt().getCourtClass(), reviewDocument.getDocumentTypeCd(), Keys.DEFAULT_DIVISION).isRushRequired()) ); return filingPackage.map(filingPackageMapper::toResponseFilingPackage); diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/models/GetValidPartyRoleRequest.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/models/GetValidPartyRoleRequest.java index 53e492da42..826a3cdecc 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/models/GetValidPartyRoleRequest.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/models/GetValidPartyRoleRequest.java @@ -13,6 +13,8 @@ public class GetValidPartyRoleRequest { private String courtLevel; private String courtClassification; + private String division; + public List getInitialDocuments() { return initialDocuments; } @@ -25,6 +27,10 @@ public String getCourtClassification() { return courtClassification; } + public String getDivision() { + return division; + } + public String getDocumentTypesAsString() { return this.initialDocuments.stream().map(InitialDocument::getType).collect(Collectors.joining(",")); } @@ -32,6 +38,7 @@ public String getDocumentTypesAsString() { public GetValidPartyRoleRequest(Builder builder) { this.initialDocuments = builder.documents; this.courtLevel = builder.courtLevel; + this.division = builder.division; this.courtClassification = builder.courtClassification; } @@ -46,6 +53,7 @@ public GetValidPartyRoleRequest create() { } private String courtLevel; + private String division; public Builder courtLevel(String courtLevel) { this.courtLevel = courtLevel; @@ -59,6 +67,11 @@ public Builder courtClassification(String courtClassification) { return this; } + public Builder division(String division) { + this.division = division; + return this; + } + private List documents; public Builder documents(List documents) { diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/service/SubmissionServiceImpl.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/service/SubmissionServiceImpl.java index 78c1fd0eed..106ae6d07c 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/service/SubmissionServiceImpl.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/service/SubmissionServiceImpl.java @@ -1,5 +1,6 @@ package ca.bc.gov.open.jag.efilingapi.submission.service; +import ca.bc.gov.open.jag.efilingapi.Keys; import ca.bc.gov.open.jag.efilingapi.api.model.*; import ca.bc.gov.open.jag.efilingapi.config.NavigationProperties; import ca.bc.gov.open.jag.efilingapi.document.DocumentStore; @@ -170,7 +171,8 @@ public List getValidPartyRoles(GetValidPartyRoleRequest getValidPartyRol return efilingLookupService.getValidPartyRoles( getValidPartyRoleRequest.getCourtLevel(), getValidPartyRoleRequest.getCourtClassification(), - getValidPartyRoleRequest.getDocumentTypesAsString() + getValidPartyRoleRequest.getDocumentTypesAsString(), + getValidPartyRoleRequest.getDivision() ); } @@ -178,7 +180,7 @@ public List getValidPartyRoles(GetValidPartyRoleRequest getValidPartyRol @Override public Boolean isRushRequired(String documentType, String courtLevel, String courtClass) { - DocumentTypeDetails documentTypeDetails = efilingDocumentService.getDocumentTypeDetails(courtLevel, courtClass, documentType); + DocumentTypeDetails documentTypeDetails = efilingDocumentService.getDocumentTypeDetails(courtLevel, courtClass, documentType, Keys.DEFAULT_DIVISION); return documentTypeDetails.isRushRequired(); diff --git a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/validator/GenerateUrlRequestValidatorImpl.java b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/validator/GenerateUrlRequestValidatorImpl.java index f4e5944c76..ec1febc305 100644 --- a/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/validator/GenerateUrlRequestValidatorImpl.java +++ b/src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/submission/validator/GenerateUrlRequestValidatorImpl.java @@ -1,5 +1,6 @@ package ca.bc.gov.open.jag.efilingapi.submission.validator; +import ca.bc.gov.open.jag.efilingapi.Keys; import ca.bc.gov.open.jag.efilingapi.api.model.*; import ca.bc.gov.open.jag.efilingapi.court.models.GetCourtDetailsRequest; import ca.bc.gov.open.jag.efilingapi.court.models.IsValidCourtFileNumberRequest; @@ -142,6 +143,7 @@ private List validateParties(InitialPackage initialPackage) { .courtClassification(initialPackage.getCourt().getCourtClass()) .courtLevel(initialPackage.getCourt().getLevel()) .documents(initialPackage.getDocuments()) + .division(Keys.DEFAULT_DIVISION) .create()); List validationResult = new ArrayList<>(); diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImplTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImplTest.java index ccc4bdda0f..f3535cf741 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImplTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImplTest.java @@ -31,7 +31,7 @@ public void beforeAll() { List documentList = new ArrayList<>(); DocumentTypeDetails document = new DocumentTypeDetails("description", "type", BigDecimal.TEN,false, true, true); documentList.add(document); - Mockito.when(efilingDocumentServiceMock.getDocumentTypes(Mockito.eq(COURT_LEVEL), Mockito.eq(COURT_CLASSIFICATION))).thenReturn(documentList); + Mockito.when(efilingDocumentServiceMock.getDocumentTypes(Mockito.eq(COURT_LEVEL), Mockito.eq(COURT_CLASSIFICATION), Mockito.any())).thenReturn(documentList); sut = new DocumentServiceImpl(efilingDocumentServiceMock); diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImplTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImplTest.java index 114b378dd9..82be15e324 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImplTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentStoreImplTest.java @@ -32,14 +32,14 @@ public void setUp() { DocumentTypeDetails docummentDetails = new DocumentTypeDetails(DESCRIPTION, TYPE, BigDecimal.TEN, true, true, true); Mockito - .when(efilingDocumentServiceMock.getDocumentTypeDetails(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())) + .when(efilingDocumentServiceMock.getDocumentTypeDetails(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any())) .thenReturn(docummentDetails); List documentTypeDetails = Arrays.asList(new DocumentTypeDetails(DESCRIPTION, TYPE, BigDecimal.TEN, true, true, true)); Mockito - .when(efilingDocumentServiceMock.getDocumentTypes(Mockito.anyString(), Mockito.anyString())) + .when(efilingDocumentServiceMock.getDocumentTypes(Mockito.anyString(), Mockito.anyString(), Mockito.any())) .thenReturn(documentTypeDetails); sut = new DocumentStoreImpl(efilingDocumentServiceMock); diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/fakes/EfilingDocumentServiceFake.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/fakes/EfilingDocumentServiceFake.java index d44e067a8d..01e97519d7 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/fakes/EfilingDocumentServiceFake.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/fakes/EfilingDocumentServiceFake.java @@ -7,12 +7,12 @@ public class EfilingDocumentServiceFake implements EfilingDocumentService { @Override - public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType) { + public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division) { return null; } @Override - public List getDocumentTypes(String courtLevel, String courtClass) { + public List getDocumentTypes(String courtLevel, String courtClass, String division) { return null; } } diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/FilingPackageConfigTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/FilingPackageConfigTest.java index 1a67d0bcd1..5b3b7a67f9 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/FilingPackageConfigTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/FilingPackageConfigTest.java @@ -59,12 +59,12 @@ public AccountDetails createAccount(String universalId, String identityProvider public EfilingDocumentService efilingDocumentService() { return new EfilingDocumentService() { @Override - public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType) { + public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division) { return null; } @Override - public List getDocumentTypes(String courtLevel, String courtClass) { + public List getDocumentTypes(String courtLevel, String courtClass, String division) { return null; } }; diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/filingPackageServiceImpl/GetCSOFilingPackageTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/filingPackageServiceImpl/GetCSOFilingPackageTest.java index b9f7d9d28e..4de3e09699 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/filingPackageServiceImpl/GetCSOFilingPackageTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/filingPackageServiceImpl/GetCSOFilingPackageTest.java @@ -59,7 +59,7 @@ public void withValidRequestReturnFilingPackage() { Mockito.when(efilingReviewServiceMock.findStatusByPackage(ArgumentMatchers.any())).thenReturn(Optional.of(TestHelpers.createFilingPackage(true))); - Mockito.when(efilingDocumentServiceMock.getDocumentTypeDetails(any(), any(), any())).thenReturn(new DocumentTypeDetails("description", + Mockito.when(efilingDocumentServiceMock.getDocumentTypeDetails(any(), any(), any(), any())).thenReturn(new DocumentTypeDetails("description", "type", BigDecimal.TEN, true, diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/SubmissionConfigTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/SubmissionConfigTest.java index 6044e29715..b8c540af10 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/SubmissionConfigTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/SubmissionConfigTest.java @@ -117,7 +117,7 @@ public ServiceFees getServiceFee(SubmissionFeeRequest submissionFeeRequest) { } @Override - public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes) { + public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes, String division) { return null; } @@ -138,12 +138,12 @@ public SubmitPackageResponse submitFilingPackage(AccountDetails accountDetails, public static class EfilingDocumentServiceTest implements EfilingDocumentService { @Override - public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType) { + public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division) { return null; } @Override - public List getDocumentTypes(String courtLevel, String courtClass) { + public List getDocumentTypes(String courtLevel, String courtClass, String division) { return null; } } diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GenerateFromRequestTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GenerateFromRequestTest.java index a241cd8f71..d517e17144 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GenerateFromRequestTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GenerateFromRequestTest.java @@ -116,7 +116,7 @@ public void withValidAccountWithCourtFileNumberAndNoPartiesShouldReturnSubmissio Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Submission actual = sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_1_STRING, TestHelpers.CASE_1, TestHelpers.CASE_1), request); @@ -173,8 +173,8 @@ public void withValidAccountWithNoCourtFileNumberAndValidPartiesShouldReturnSubm request.getFilingPackage().setParties(parties); Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingLookupService.getValidPartyRoles(any(), any(), any())).thenReturn(TestHelpers.createValidPartyRoles()); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingLookupService.getValidPartyRoles(any(), any(), any(), any())).thenReturn(TestHelpers.createValidPartyRoles()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Submission actual = sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_1_STRING, TestHelpers.CASE_1, TestHelpers.CASE_1), request); @@ -227,7 +227,7 @@ public void withValidAccountNoRushedShouldReturnSubmission() { Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Submission actual = sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_1_STRING, TestHelpers.CASE_1, TestHelpers.CASE_1), request); @@ -287,7 +287,7 @@ public void withPackageAndRejectedDocumentShouldReturnSubmission() { Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Submission actual = sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_1_STRING, TestHelpers.CASE_1, TestHelpers.CASE_1), request); @@ -349,7 +349,7 @@ public void withPackageAndDocumentShouldReturnSubmission() { Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Submission actual = sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_1_STRING, TestHelpers.CASE_1, TestHelpers.CASE_1), request); @@ -404,7 +404,7 @@ public void withEmptySubmissionShouldThrowStoreException() { Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Assertions.assertThrows(StoreException.class, () -> sut.generateFromRequest(APP_CODE, new SubmissionKey(TestHelpers.CASE_2_STRING, TestHelpers.CASE_2, TestHelpers.CASE_2), request)); @@ -425,7 +425,7 @@ public void withEmptyCourtDescriptionShouldThrowException() { Mockito.when(efilingCourtService.checkValidLevelClassLocation(any(), any(), any(), any())).thenReturn(true); Mockito.when(efilingCourtService.checkValidCourtFileNumber(any(), any(), any(), any(), any())).thenReturn(true); - Mockito.when(efilingDocumentService.getDocumentTypes(any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); + Mockito.when(efilingDocumentService.getDocumentTypes(any(), any(), any())).thenReturn(TestHelpers.createValidDocumentTypesList()); Assertions.assertThrows( diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GetValidIndividualRolesTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GetValidIndividualRolesTest.java index 43711fb6c8..34dd3f3dc3 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GetValidIndividualRolesTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/GetValidIndividualRolesTest.java @@ -22,6 +22,8 @@ import java.util.Arrays; import java.util.List; +import static org.mockito.ArgumentMatchers.any; + @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class GetValidIndividualRolesTest { @@ -61,7 +63,8 @@ public void setUp(){ Mockito.when(efilingLookupService.getValidPartyRoles( Mockito.eq("A"), Mockito.eq("B"), - Mockito.eq("POR,ACMW"))).thenReturn(Arrays.asList(ROLE_TYPES)); + Mockito.eq("POR,ACMW"), + any())).thenReturn(Arrays.asList(ROLE_TYPES)); NavigationProperties navigationProperties = new NavigationProperties(); sut = new SubmissionServiceImpl(submissionStoreMock, cachePropertiesMock, null, new PartyMapperImpl(), efilingLookupService, efilingCourtService, efilingSubmissionServiceMock, null, documentStoreMock, paymentAdapterMock, sftpServiceMock, navigationProperties); } diff --git a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/IsRushRequiredTest.java b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/IsRushRequiredTest.java index eeba9c4052..f4d156cfd1 100644 --- a/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/IsRushRequiredTest.java +++ b/src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/submission/service/submissionServiceImpl/IsRushRequiredTest.java @@ -58,7 +58,7 @@ public void beforeAll() throws DatatypeConfigurationException { @DisplayName("Test is rushRequired") public void testRushRequired() { - Mockito.when(efilingDocumentService.getDocumentTypeDetails(any(), any(), any())).thenReturn(new DocumentTypeDetails("description", + Mockito.when(efilingDocumentService.getDocumentTypeDetails(any(), any(), any(), any())).thenReturn(new DocumentTypeDetails("description", "type", BigDecimal.TEN, true, @@ -73,7 +73,7 @@ public void testRushRequired() { @DisplayName("Test is not rushRequired") public void testRushNotRequired() { - Mockito.when(efilingDocumentService.getDocumentTypeDetails(any(), any(), any())).thenReturn(new DocumentTypeDetails("description", + Mockito.when(efilingDocumentService.getDocumentTypeDetails(any(), any(), any(), any())).thenReturn(new DocumentTypeDetails("description", "type", BigDecimal.TEN, true, diff --git a/src/backend/libs/efiling-bambora-api-client/pom.xml b/src/backend/libs/efiling-bambora-api-client/pom.xml index 446fd4f906..debfa7bbfe 100644 --- a/src/backend/libs/efiling-bambora-api-client/pom.xml +++ b/src/backend/libs/efiling-bambora-api-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ca.bc.gov.open.jag efiling-bambora-api-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT efiling-bambora-api-client Client for Bambora @@ -111,7 +111,7 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT compile @@ -128,7 +128,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-bom/pom.xml b/src/backend/libs/efiling-bom/pom.xml index 91365ce682..e802427636 100644 --- a/src/backend/libs/efiling-bom/pom.xml +++ b/src/backend/libs/efiling-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT 2.17.1 diff --git a/src/backend/libs/efiling-ceis-api-client/pom.xml b/src/backend/libs/efiling-ceis-api-client/pom.xml index 31673e7982..eebbeefa9c 100644 --- a/src/backend/libs/efiling-ceis-api-client/pom.xml +++ b/src/backend/libs/efiling-ceis-api-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ca.bc.gov.open.jag efiling-ceis-api-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT efiling-ceis-api-client Client for CEIS ORDS @@ -123,7 +123,7 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT compile @@ -140,7 +140,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-commons/pom.xml b/src/backend/libs/efiling-commons/pom.xml index 99ae17b76e..90078c6589 100644 --- a/src/backend/libs/efiling-commons/pom.xml +++ b/src/backend/libs/efiling-commons/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT efiling-commons Contains common functionality to efiling @@ -71,7 +71,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingDocumentService.java b/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingDocumentService.java index cb30ecbbb8..8b9335e838 100644 --- a/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingDocumentService.java +++ b/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingDocumentService.java @@ -13,7 +13,7 @@ public interface EfilingDocumentService { * @param documentType type code used by cso * @return All details related to request document type */ - DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType); + DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division); /** * Search for are document types(with details) by parameters @@ -21,6 +21,6 @@ public interface EfilingDocumentService { * @param courtClass class code used by cso * @return list of document types */ - List getDocumentTypes(String courtLevel, String courtClass); + List getDocumentTypes(String courtLevel, String courtClass, String division); } diff --git a/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingLookupService.java b/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingLookupService.java index 9a170c4423..e5cde3dc1c 100644 --- a/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingLookupService.java +++ b/src/backend/libs/efiling-commons/src/main/java/ca/bc/gov/open/jag/efilingcommons/service/EfilingLookupService.java @@ -10,7 +10,7 @@ public interface EfilingLookupService { ServiceFees getServiceFee(SubmissionFeeRequest submissionFeeRequest); - List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes); + List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes, String division); /** * Get countries code table lookup diff --git a/src/backend/libs/efiling-cso-client/pom.xml b/src/backend/libs/efiling-cso-client/pom.xml index a62f983f65..c57d9724ae 100644 --- a/src/backend/libs/efiling-cso-client/pom.xml +++ b/src/backend/libs/efiling-cso-client/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ca.bc.gov.open.jag efiling-cso-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT 17 @@ -59,7 +59,7 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT @@ -90,7 +90,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoDocumentServiceImpl.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoDocumentServiceImpl.java index bdf47d0bd6..cf094137c4 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoDocumentServiceImpl.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoDocumentServiceImpl.java @@ -31,13 +31,13 @@ public CsoDocumentServiceImpl(FilingStatusFacadeBean filingStatusFacadeBean) { * @return */ @Override - public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType) { + public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division) { if (StringUtils.isBlank(courtLevel)) throw new IllegalArgumentException("courtLevel is required."); if (StringUtils.isBlank(courtClass)) throw new IllegalArgumentException("courtClass level is required."); if (StringUtils.isBlank(documentType)) throw new IllegalArgumentException("documentType level is required."); - return getSoapDocumentTypes(courtLevel, courtClass).stream() + return getSoapDocumentTypes(courtLevel, courtClass, division).stream() .filter(doc -> doc.getDocumentTypeCd().equals(documentType)) .findFirst() .map(doc -> new DocumentTypeDetails(doc.getDocumentTypeDesc(), doc.getDocumentTypeCd(), doc.getDefaultStatutoryFee(), doc.isOrderDocumentYn(),doc.isRushRequiredYn(), doc.isAutoProcessYn())) @@ -45,22 +45,22 @@ public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String cour } - public List getDocumentTypes(String courtLevel, String courtClass) { + public List getDocumentTypes(String courtLevel, String courtClass, String division) { if (StringUtils.isBlank(courtLevel)) throw new IllegalArgumentException("courtLevel is required."); if (StringUtils.isBlank(courtClass)) throw new IllegalArgumentException("courtClass level is required."); - return getSoapDocumentTypes(courtLevel, courtClass).stream() + return getSoapDocumentTypes(courtLevel, courtClass, division).stream() .map(doc -> new DocumentTypeDetails(doc.getDocumentTypeDesc(), doc.getDocumentTypeCd(), doc.getDefaultStatutoryFee(), doc.isOrderDocumentYn(),doc.isRushRequiredYn(), doc.isAutoProcessYn())).collect(Collectors.toList()); } - private List getSoapDocumentTypes(String courtLevel, String courtClass) { + private List getSoapDocumentTypes(String courtLevel, String courtClass, String division) { List documentTypes; try { - documentTypes = new ArrayList<>(filingStatusFacadeBean.getDocumentTypes(courtLevel, courtClass)); + documentTypes = new ArrayList<>(filingStatusFacadeBean.getDocumentTypes(division, courtLevel, courtClass)); //Remove other document types. NOTE these are cached and redis requires a restart //TODO: consider feature flagging this documentTypes.removeIf(documentType -> documentType.getDocumentTypeCd().equals(OTHER_DOCUMENT_TYPE)); diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoLookupServiceImpl.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoLookupServiceImpl.java index 53dd15ad96..0a9e93896c 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoLookupServiceImpl.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoLookupServiceImpl.java @@ -61,9 +61,9 @@ public ServiceFees getServiceFee(SubmissionFeeRequest submissionFeeRequest) { } @Override - public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes) { + public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes, String division) { try { - List partyRolesResponse = lookupFacade.getEfilingPartyRoles(courtLevel, courtClass, documentTypes); + List partyRolesResponse = lookupFacade.getEfilingPartyRoles(division, courtLevel, courtClass, documentTypes); List validRoles = new ArrayList<>(); for (CodeValue partyRole : partyRolesResponse) { diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoSubmissionServiceImpl.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoSubmissionServiceImpl.java index 6e365f5d44..fe4238e3cf 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoSubmissionServiceImpl.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/CsoSubmissionServiceImpl.java @@ -1,5 +1,6 @@ package ca.bc.gov.open.jag.efilingcsoclient; +import ca.bc.gov.ag.csows.filing.Document; import ca.bc.gov.ag.csows.filing.NestedEjbException_Exception; import ca.bc.gov.ag.csows.filing.ProcessItemStatus; import ca.bc.gov.ag.csows.filing.*; @@ -171,9 +172,9 @@ private List buildCsoParties(AccountDetails accountDetails, FilingPack } - private List buildCivilDocuments(AccountDetails accountDetails, FilingPackage efilingPackage, XMLGregorianCalendar computedSubmittedDate) { + private List buildCivilDocuments(AccountDetails accountDetails, FilingPackage efilingPackage, XMLGregorianCalendar computedSubmittedDate) { - List documents = new ArrayList<>(); + List documents = new ArrayList<>(); for (int i = 0; i < efilingPackage.getDocuments().size(); i++) { List payments = Collections.singletonList(documentMapper.toEfilingDocumentPayment(efilingPackage.getDocuments().get(i), accountDetails, @@ -242,7 +243,7 @@ private RushOrderRequest buildRushedOrderRequest(AccountDetails accountDetails, } - private List buildSupportingDocuments(AccountDetails accountDetails, List documents) { + private List buildSupportingDocuments(AccountDetails accountDetails, List documents) { List supportDocuments = new ArrayList<>(); for (int i = 0; i < documents.size(); i++) { @@ -383,10 +384,10 @@ private void determineAutoProcessingFlagFromDocuments(FilingPackage efilingPacka String courtClass = efilingPackage.getCourt().getCourtClass(); String courtLevel = efilingPackage.getCourt().getLevel(); - List documentTypeDetailsList = efilingDocumentService.getDocumentTypes(courtLevel, courtClass); + List documentTypeDetailsList = efilingDocumentService.getDocumentTypes(courtLevel, courtClass, Keys.DEFAULT_DIVISION); - List documents = csoFilingPackage.getDocuments(); - for(CivilDocument document : documents) { + List documents = csoFilingPackage.getDocuments(); + for(Document document : documents) { String documentTypeCd = document.getDocumentTypeCd(); for(DocumentTypeDetails documentTypeDetail : documentTypeDetailsList) { if(documentTypeDetail.getType().equals(documentTypeCd) && documentTypeDetail.isAutoProcessing()) { @@ -402,7 +403,7 @@ private void determineAutoProcessingFlagFromDocuments(FilingPackage efilingPacka } - private Boolean determineDelayProcessing(CivilDocument document) { + private Boolean determineDelayProcessing(Document document) { List milestones = document.getMilestones(); Calendar actualSubmittedCalendar = Calendar.getInstance(); diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/Keys.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/Keys.java index e2250df69b..fbc1945828 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/Keys.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/Keys.java @@ -66,4 +66,6 @@ private Keys() {} public static final String OTHER_DOCUMENT_TYPE = "OTH"; + public static final String DEFAULT_DIVISION = "I"; + } diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/DocumentMapper.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/DocumentMapper.java index aad2eeb6a1..828bbc6db5 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/DocumentMapper.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/DocumentMapper.java @@ -35,7 +35,7 @@ public interface DocumentMapper { @Mapping(target = "payments", source = "payments") @Mapping(target = "statuses", source = "statuses") @Mapping(target = "parentDocumentId", source = "document.documentId") - CivilDocument toEfilingDocument( + ca.bc.gov.ag.csows.filing.Document toEfilingDocument( Integer index, Document document, AccountDetails accountDetails, diff --git a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/FilingPackageMapper.java b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/FilingPackageMapper.java index d5e52c1cbc..e587eac393 100644 --- a/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/FilingPackageMapper.java +++ b/src/backend/libs/efiling-cso-client/src/main/java/ca/bc/gov/open/jag/efilingcsoclient/mappers/FilingPackageMapper.java @@ -1,6 +1,6 @@ package ca.bc.gov.open.jag.efilingcsoclient.mappers; -import ca.bc.gov.ag.csows.filing.CivilDocument; +import ca.bc.gov.ag.csows.filing.Document; import ca.bc.gov.ag.csows.filing.CsoParty; import ca.bc.gov.ag.csows.filing.FilingPackage; import ca.bc.gov.ag.csows.filing.PackageAuthority; @@ -46,7 +46,7 @@ FilingPackage toFilingPackage( AccountDetails accountDetails, BigDecimal serviceId, XMLGregorianCalendar submittedDate, - List documents, + List documents, List csoParties, List packageControls); } diff --git a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingFacade.wsdl b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingFacade.wsdl index 0b11dd5aa5..1744d28e19 100644 --- a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingFacade.wsdl +++ b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingFacade.wsdl @@ -13,8 +13,6 @@ - - @@ -61,8 +59,8 @@ - - + + @@ -85,7 +83,7 @@ - + @@ -116,7 +114,7 @@ - + @@ -601,6 +599,16 @@ + + + + + + + + + + @@ -700,26 +708,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -779,7 +767,7 @@ - + @@ -920,7 +908,7 @@ - + @@ -992,7 +980,7 @@ - + @@ -1001,7 +989,7 @@ - + @@ -1040,6 +1028,9 @@ + + + @@ -1061,9 +1052,6 @@ - - - @@ -1076,9 +1064,6 @@ - - - @@ -1124,9 +1109,6 @@ - - - @@ -1151,15 +1133,15 @@ - - - + + + @@ -1236,6 +1218,11 @@ + + + + + @@ -1266,16 +1253,6 @@ - - - - - - - - - - @@ -1429,36 +1406,36 @@ - + - + - + - + - + - + - + - + - + @@ -1477,48 +1454,36 @@ - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + diff --git a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingStatusFacade.wsdl b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingStatusFacade.wsdl index 9e6decc210..c778ea6bd2 100644 --- a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingStatusFacade.wsdl +++ b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/FilingStatusFacade.wsdl @@ -120,6 +120,7 @@ + diff --git a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/LookupFacade.wsdl b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/LookupFacade.wsdl index 2b172c75ff..5b31d0057b 100644 --- a/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/LookupFacade.wsdl +++ b/src/backend/libs/efiling-cso-client/src/main/resources/wsdl/LookupFacade.wsdl @@ -47,6 +47,8 @@ + + @@ -180,6 +182,7 @@ + @@ -440,6 +443,14 @@ + + + + + + + + @@ -531,6 +542,9 @@ + + + @@ -678,6 +692,9 @@ + + + @@ -848,6 +865,11 @@ + + + + + @@ -1250,6 +1272,18 @@ + + + + + + + + + + + + diff --git a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentDetailsTest.java b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentDetailsTest.java index fe2ce467e9..789ffee4be 100644 --- a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentDetailsTest.java +++ b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentDetailsTest.java @@ -45,10 +45,10 @@ public void setUp() throws NestedEjbException_Exception { documentType.setAutoProcessYn(false); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(COURT_LEVEL),any())).thenReturn(Arrays.asList(documentType)); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(NODOC),any())).thenReturn(new ArrayList<>()); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(COURT_LEVEL),any())).thenReturn(Arrays.asList(documentType)); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(NODOC),any())).thenReturn(new ArrayList<>()); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(EXCEPTION),any())).thenThrow(NestedEjbException_Exception.class); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(EXCEPTION),any())).thenThrow(NestedEjbException_Exception.class); sut = new CsoDocumentServiceImpl(filingStatusFacadeBean); } @@ -56,7 +56,7 @@ public void setUp() throws NestedEjbException_Exception { @DisplayName("OK: test returns document ") @Test public void testWithFoundResult() { - DocumentTypeDetails result = sut.getDocumentTypeDetails(COURT_LEVEL, COURT_CLASS, DOCUMENT_TYPE_CD); + DocumentTypeDetails result = sut.getDocumentTypeDetails(COURT_LEVEL, COURT_CLASS, DOCUMENT_TYPE_CD, ""); Assertions.assertEquals(DESCRIPTION, result.getDescription()); Assertions.assertEquals(BigDecimal.TEN, result.getStatutoryFeeAmount()); Assertions.assertTrue(result.isOrderDocument()); @@ -68,23 +68,23 @@ public void testWithFoundResult() { @Test public void whenNotFindingDocumentsShouldThrowError() { - Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypeDetails(NODOC, COURT_CLASS, NODOC)); + Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypeDetails(NODOC, COURT_CLASS, NODOC, "")); } @DisplayName("Failure: when SOAP service throws NestedEjbException_Exception, service should throw EfilingDocumentServiceException") @Test public void testThrowException() throws NestedEjbException_Exception { - Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypeDetails(EXCEPTION, COURT_CLASS,"type")); + Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypeDetails(EXCEPTION, COURT_CLASS,"type", "")); } @DisplayName("Exception: courtLevel is required") @Test public void whenCourtLevelIsBlankShouldThrowIllegalArgumentException() { - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails(null, "class", "type")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("", "class", "type")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails(" ", "class", "type")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails(null, "class", "type", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("", "class", "type", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails(" ", "class", "type", "")); } @@ -92,9 +92,9 @@ public void whenCourtLevelIsBlankShouldThrowIllegalArgumentException() { @Test public void whenCourtClassIsBlankShouldThrowIllegalArgumentException() { - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", null, "type")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "", "type")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", " ", "type")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", null, "type", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "", "type", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", " ", "type", "")); } @@ -103,9 +103,9 @@ public void whenCourtClassIsBlankShouldThrowIllegalArgumentException() { @Test public void whenDocumentTypeIsBlankShouldThrowIllegalArgumentException() { - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", null)); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", "")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", " ")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", null, "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", "", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypeDetails("level", "class", " ", "")); } diff --git a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentTypesTest.java b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentTypesTest.java index 307d33e99e..80aa5289a8 100644 --- a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentTypesTest.java +++ b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoDocumentServiceImpl/GetDocumentTypesTest.java @@ -38,10 +38,10 @@ public void setUp() throws NestedEjbException_Exception { MockitoAnnotations.openMocks(this); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(COURT_LEVEL),any())).thenReturn(createDocumentTypeList()); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(NODOC),any())).thenReturn(new ArrayList<>()); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(COURT_LEVEL),any())).thenReturn(createDocumentTypeList()); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(NODOC),any())).thenReturn(new ArrayList<>()); - Mockito.when(filingStatusFacadeBean.getDocumentTypes(Mockito.eq(EXCEPTION),any())).thenThrow(NestedEjbException_Exception.class); + Mockito.when(filingStatusFacadeBean.getDocumentTypes(any(), Mockito.eq(EXCEPTION),any())).thenThrow(NestedEjbException_Exception.class); sut = new CsoDocumentServiceImpl(filingStatusFacadeBean); } @@ -49,7 +49,7 @@ public void setUp() throws NestedEjbException_Exception { @DisplayName("OK: test returns document ") @Test public void testWithFoundResult() { - List result = sut.getDocumentTypes(COURT_LEVEL, COURT_CLASS); + List result = sut.getDocumentTypes(COURT_LEVEL, COURT_CLASS, ""); Assertions.assertEquals(1, result.size()); Assertions.assertEquals(DESCRIPTION, result.get(0).getDescription()); @@ -61,7 +61,7 @@ public void testWithFoundResult() { @Test public void testThrowException() throws NestedEjbException_Exception { - Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypes(EXCEPTION, COURT_CLASS)); + Assertions.assertThrows(EfilingDocumentServiceException.class, () -> sut.getDocumentTypes(EXCEPTION, COURT_CLASS, "")); } @@ -69,9 +69,9 @@ public void testThrowException() throws NestedEjbException_Exception { @Test public void whenCourtLevelIsBlankShouldThrowIllegalArgumentException() { - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes(null, "class")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("", "class")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes(" ", "class")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes(null, "class", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("", "class", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes(" ", "class", "")); } @@ -79,9 +79,9 @@ public void whenCourtLevelIsBlankShouldThrowIllegalArgumentException() { @Test public void whenCourtClassIsBlankShouldThrowIllegalArgumentException() { - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", null)); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", "")); - Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", " ")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", null, "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", "", "")); + Assertions.assertThrows(IllegalArgumentException.class, () -> sut.getDocumentTypes("level", " ", "")); } diff --git a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoSubmissionServiceImpl/SubmitFilingPackageTest.java b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoSubmissionServiceImpl/SubmitFilingPackageTest.java index 5a517c489d..9c6a5acd0e 100644 --- a/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoSubmissionServiceImpl/SubmitFilingPackageTest.java +++ b/src/backend/libs/efiling-cso-client/src/test/java/ca/bc/gov/open/jag/efilingcsoclient/csoSubmissionServiceImpl/SubmitFilingPackageTest.java @@ -121,7 +121,7 @@ public void beforeEach() throws NestedEjbException_Exception, ca.bc.gov.ag.csows DocumentTypeDetails documentTypeDetailsNoAutoProcessing = new DocumentTypeDetails("description", "type1", BigDecimal.ONE, false, false, false); DocumentTypeDetails documentTypeDetailsAutoProcessing = new DocumentTypeDetails("description", "type2", BigDecimal.ONE, false, false, true); List documentTypeDetailsList = Arrays.asList(documentTypeDetailsNoAutoProcessing, documentTypeDetailsAutoProcessing); - Mockito.when(efilingDocumentServiceMock.getDocumentTypes(Mockito.anyString(), Mockito.anyString())).thenReturn(documentTypeDetailsList); + Mockito.when(efilingDocumentServiceMock.getDocumentTypes(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(documentTypeDetailsList); sut = new CsoSubmissionServiceImpl(filingFacadeBeanMock, serviceFacadeBean, new ServiceMapperImpl(), new FilingPackageMapperImpl(), new FinancialTransactionMapperImpl(), csoPropertiesMock, documentMapper, csoPartyMapper, new PackageAuthorityMapperImpl(), efilingDocumentServiceMock); diff --git a/src/backend/libs/efiling-cso-starter/pom.xml b/src/backend/libs/efiling-cso-starter/pom.xml index 627a96270d..22f44beca5 100644 --- a/src/backend/libs/efiling-cso-starter/pom.xml +++ b/src/backend/libs/efiling-cso-starter/pom.xml @@ -13,7 +13,7 @@ ca.bc.gov.open.jag efiling-cso-starter - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT 17 @@ -79,13 +79,13 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT ca.bc.gov.open.jag efiling-cso-client - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT @@ -95,7 +95,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-demo-starter/pom.xml b/src/backend/libs/efiling-demo-starter/pom.xml index c068a2d3b7..540c99ffa5 100644 --- a/src/backend/libs/efiling-demo-starter/pom.xml +++ b/src/backend/libs/efiling-demo-starter/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.open.jag efiling-demo-starter - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT 17 @@ -61,7 +61,7 @@ ca.bc.gov.open.jag efiling-commons - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT @@ -83,7 +83,7 @@ ca.bc.gov.open.jag efiling-bom - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT pom import diff --git a/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImpl.java b/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImpl.java index 5d2b14e88d..6dd093c471 100644 --- a/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImpl.java +++ b/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImpl.java @@ -9,12 +9,12 @@ public class EfilingDocumentServiceDemoImpl implements EfilingDocumentService { @Override - public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType) { + public DocumentTypeDetails getDocumentTypeDetails(String courtLevel, String courtClass, String documentType, String division) { return new DocumentTypeDetails("This is a doc", documentType, BigDecimal.valueOf(7), true, true, false); } @Override - public List getDocumentTypes(String courtLevel, String courtClass) { + public List getDocumentTypes(String courtLevel, String courtClass, String division) { return Arrays.asList(new DocumentTypeDetails("Description1", "AFF", BigDecimal.valueOf(7),true, true, false), new DocumentTypeDetails("Description2", "Type2", BigDecimal.valueOf(7),true, true, false), new DocumentTypeDetails("Description2", "POR", BigDecimal.valueOf(7),true, true, false)); } } diff --git a/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingLookupServiceDemoImpl.java b/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingLookupServiceDemoImpl.java index 4b67406535..996158343a 100644 --- a/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingLookupServiceDemoImpl.java +++ b/src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingLookupServiceDemoImpl.java @@ -30,7 +30,7 @@ public ServiceFees getServiceFee(SubmissionFeeRequest submissionFeeRequest) { } @Override - public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes) { + public List getValidPartyRoles(String courtLevel, String courtClass, String documentTypes, String division) { List validRoles = new ArrayList<>(); validRoles.add("APP"); diff --git a/src/backend/libs/efiling-demo-starter/src/test/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImplTest.java b/src/backend/libs/efiling-demo-starter/src/test/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImplTest.java index b37e722597..561a1cbf3c 100644 --- a/src/backend/libs/efiling-demo-starter/src/test/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImplTest.java +++ b/src/backend/libs/efiling-demo-starter/src/test/java/ca/bc/gov/open/jag/efiling/demo/EfilingDocumentServiceDemoImplTest.java @@ -21,7 +21,7 @@ public void testDemoLookupServiceTest() { EfilingDocumentServiceDemoImpl service = new EfilingDocumentServiceDemoImpl(); String serviceId = "TestServiceId"; - DocumentTypeDetails actual = service.getDocumentTypeDetails(serviceId, "", ""); + DocumentTypeDetails actual = service.getDocumentTypeDetails(serviceId, "", "", ""); Assertions.assertEquals("This is a doc", actual.getDescription()); Assertions.assertEquals(BigDecimal.valueOf(7), actual.getStatutoryFeeAmount()); @@ -36,7 +36,7 @@ public void testDemoDocumentServiceTest() { EfilingDocumentServiceDemoImpl service = new EfilingDocumentServiceDemoImpl(); - List actual = service.getDocumentTypes("", ""); + List actual = service.getDocumentTypes("", "", ""); Assertions.assertEquals(3, actual.size()); Assertions.assertEquals("Description1", actual.get(0).getDescription()); diff --git a/src/backend/pom.xml b/src/backend/pom.xml index b60e2a7ed4..8e9b7eb397 100644 --- a/src/backend/pom.xml +++ b/src/backend/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.open jag-efiling-backend - 2.0.12-SNAPSHOT + 2.1.0-SNAPSHOT EfilingHub Backend services