Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/backend/efiling-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>ca.bc.gov.open.jag</groupId>
<artifactId>efiling-api</artifactId>
<version>2.0.12-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<name>efiling-api</name>
<description>Demo project for Spring Boot</description>

Expand Down Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>ca.bc.gov.open.jag</groupId>
<artifactId>efiling-commons</artifactId>
<version>2.0.12-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -259,7 +259,7 @@
<dependency>
<groupId>ca.bc.gov.open.jag</groupId>
<artifactId>efiling-bom</artifactId>
<version>2.0.12-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -282,19 +282,19 @@
<dependency>
<groupId>ca.bc.gov.open.jag</groupId>
<artifactId>efiling-cso-starter</artifactId>
<version>2.0.12-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.12-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.12-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
Expand Down Expand Up @@ -337,7 +337,7 @@
<dependency>
<groupId>ca.bc.gov.open.jag</groupId>
<artifactId>efiling-demo-starter</artifactId>
<version>2.0.12-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ protected Keys() {}

public static final String REJECTED_DOCUMENT_CODE = "REJ";

public static final String DEFAULT_DIVISION = "I";

}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}

}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public class GetValidPartyRoleRequest {
private String courtLevel;
private String courtClassification;

private String division;

public List<InitialDocument> getInitialDocuments() {
return initialDocuments;
}
Expand All @@ -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;
}

Expand All @@ -46,6 +53,7 @@ public GetValidPartyRoleRequest create() {
}

private String courtLevel;
private String division;

public Builder courtLevel(String courtLevel) {
this.courtLevel = courtLevel;
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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();

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass) {
public List<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass, String division) {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass) {
public List<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass, String division) {
return null;
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public ServiceFees getServiceFee(SubmissionFeeRequest submissionFeeRequest) {
}

@Override
public List<String> getValidPartyRoles(String courtLevel, String courtClass, String documentTypes) {
public List<String> getValidPartyRoles(String courtLevel, String courtClass, String documentTypes, String division) {
return null;
}

Expand All @@ -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<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass) {
public List<DocumentTypeDetails> getDocumentTypes(String courtLevel, String courtClass, String division) {
return null;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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));

Expand All @@ -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(
Expand Down
Loading
Loading