Merge pull request #2951 from bcgov/feature/wsdl-changes

WSDL Updates

Author: TayGov

src/backend/efiling-api/pom.xml

@@ -11,7 +11,7 @@
     </parent>
     <groupId>ca.bc.gov.open.jag</groupId>
     <artifactId>efiling-api</artifactId>
-    <version>2.0.13-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <name>efiling-api</name>
     <description>Demo project for Spring Boot</description>
 
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>ca.bc.gov.open.jag</groupId>
             <artifactId>efiling-commons</artifactId>
-            <version>2.0.13-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -258,7 +258,7 @@
             <dependency>
                 <groupId>ca.bc.gov.open.jag</groupId>
                 <artifactId>efiling-bom</artifactId>
-                <version>2.0.13-SNAPSHOT</version>
+                <version>2.1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -281,19 +281,19 @@
                 <dependency>
                     <groupId>ca.bc.gov.open.jag</groupId>
                     <artifactId>efiling-cso-starter</artifactId>
-                    <version>2.0.13-SNAPSHOT</version>
+                    <version>2.1.0-SNAPSHOT</version>
                 </dependency>
 
                 <dependency>
                     <groupId>ca.bc.gov.open.jag</groupId>
                     <artifactId>efiling-bambora-api-client</artifactId>
-                    <version>2.0.13-SNAPSHOT</version>
+                    <version>2.1.0-SNAPSHOT</version>
                 </dependency>
 
                 <dependency>
                     <groupId>ca.bc.gov.open.jag</groupId>
                     <artifactId>efiling-ceis-api-client</artifactId>
-                    <version>2.0.13-SNAPSHOT</version>
+                    <version>2.1.0-SNAPSHOT</version>
                 </dependency>
 
                 <!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -336,7 +336,7 @@
                 <dependency>
                     <groupId>ca.bc.gov.open.jag</groupId>
                     <artifactId>efiling-demo-starter</artifactId>
-                    <version>2.0.13-SNAPSHOT</version>
+                    <version>2.1.0-SNAPSHOT</version>
                 </dependency>
             </dependencies>
         </profile>

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";
+
 }

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<DocumentTypeDetails> getValidDocumentTypes(GetValidDocumentTypesRequest getValidDocumentTypesRequest) {
-        return efilingDocumentService.getDocumentTypes(getValidDocumentTypesRequest.getCourtLevel(), getValidDocumentTypesRequest.getCourtClassification());
+        return efilingDocumentService.getDocumentTypes(getValidDocumentTypesRequest.getCourtLevel(), getValidDocumentTypesRequest.getCourtClassification(), Keys.DEFAULT_DIVISION);
     }
 
 }

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<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass) {
-        return this.efilingDocumentService.getDocumentTypes(courtLevel, courtClass);
+        return this.efilingDocumentService.getDocumentTypes(courtLevel, courtClass, Keys.DEFAULT_DIVISION);
     }
 
     @Override

src/backend/efiling-api/src/main/java/ca/bc/gov/open/jag/efilingapi/filingpackage/service/FilingPackageServiceImpl.java

@@ -66,7 +66,7 @@ public Optional<FilingPackage> 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);

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<InitialDocument> getInitialDocuments() {
         return initialDocuments;
     }
@@ -25,13 +27,18 @@ public String getCourtClassification() {
         return courtClassification;
     }
 
+    public String getDivision() {
+        return division;
+    }
+
     public String getDocumentTypesAsString() {
         return this.initialDocuments.stream().map(InitialDocument::getType).collect(Collectors.joining(","));
     }
 
     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<InitialDocument> documents;
 
         public Builder documents(List<InitialDocument> documents) {

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,15 +171,16 @@ public List<String> getValidPartyRoles(GetValidPartyRoleRequest getValidPartyRol
         return efilingLookupService.getValidPartyRoles(
                 getValidPartyRoleRequest.getCourtLevel(),
                 getValidPartyRoleRequest.getCourtClassification(),
-                getValidPartyRoleRequest.getDocumentTypesAsString()
+                getValidPartyRoleRequest.getDocumentTypesAsString(),
+                getValidPartyRoleRequest.getDivision()
         );
 
     }
 
     @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();
 

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<String> validateParties(InitialPackage initialPackage) {
                 .courtClassification(initialPackage.getCourt().getCourtClass())
                 .courtLevel(initialPackage.getCourt().getLevel())
                 .documents(initialPackage.getDocuments())
+                .division(Keys.DEFAULT_DIVISION)
                 .create());
 
         List<String> validationResult = new ArrayList<>();

src/backend/efiling-api/src/test/java/ca/bc/gov/open/jag/efilingapi/document/DocumentServiceImplTest.java

@@ -31,7 +31,7 @@ public void beforeAll() {
         List<DocumentTypeDetails> 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);
 

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> 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);