Skip to content

Commit e3979b9

Browse files
ruban72ruban72
authored
Dtscci 783 claim name csv (#2985)
* DTSCCI-783: Add claim title to csv
1 parent e4c1e31 commit e3979b9

File tree

11 files changed

+51
-62
lines changed

11 files changed

+51
-62
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ allprojects {
146146
maven {
147147
url 'https://jitpack.io'
148148
}
149+
jcenter()
150+
maven {
151+
url 'https://repo1.maven.org/maven2'
152+
}
149153
}
150154

151155
dependencyManagement {

‎ccd-adapter/src/main/java/uk/gov/hmcts/cmc/ccd/mapper/CaseMapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ public Claim from(CCDCase ccdCase) {
178178
if (ccdCase.getDirectionOrderType() != null) {
179179
builder.directionOrderType(ccdCase.getDirectionOrderType());
180180
}
181-
182-
return builder.build();
181+
Claim claim = builder.build();
182+
claim.setCaseName(toCaseName.apply(claim));
183+
return claim;
183184
}
184185

185186
private YesNoOption convertCCDYesNo(CCDYesNoOption ccdYesNoOption) {

‎charts/cmc-claim-store/values.preview.template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ ccd:
113113
ccd-data-store-api:
114114
java:
115115
image: hmctspublic.azurecr.io/ccd/data-store-api:latest
116+
ingressHost: ccd-data-store-api-${SERVICE_FQDN}
116117
keyVaults: []
117118
environment:
118119
DATA_STORE_IDAM_KEY: ${DATA_STORE_S2S_KEY}

‎domain-model/src/main/java/uk/gov/hmcts/cmc/domain/models/Claim.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class Claim {
5555
private final boolean moreTimeRequested;
5656
private final String submitterEmail;
5757
private final LocalDateTime respondedAt;
58-
private final Response response;
58+
private Response response;
5959
private final String defendantEmail;
6060
private final CountyCourtJudgment countyCourtJudgment;
6161
@JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -81,8 +81,9 @@ public class Claim {
8181
private final ReviewOrder reviewOrder;
8282
private final DirectionOrder directionOrder;
8383
private final ChannelType channel;
84+
8485
@JsonFormat(shape = JsonFormat.Shape.STRING)
85-
private final LocalDate intentionToProceedDeadline;
86+
private LocalDate intentionToProceedDeadline;
8687
private final MediationOutcome mediationOutcome;
8788
private final String failedMediationReason;
8889
private final LocalDateTime mediationSettlementReachedAt;
@@ -101,6 +102,7 @@ public class Claim {
101102
private String lastEventTriggeredForHwfCase;
102103
private LocalDate paperFormServedDate;
103104
private final LocalDate paperFormIssueDate;
105+
private String caseName;
104106

105107
@SuppressWarnings("squid:S00107") // Not sure there's a lot fo be done about removing parameters here
106108
@Builder(toBuilder = true)
@@ -371,4 +373,16 @@ public String toString() {
371373
return ReflectionToStringBuilder.toString(this, ourStyle());
372374
}
373375

376+
public void setCaseName(String caseName) {
377+
this.caseName = caseName;
378+
}
379+
380+
public void setResponse(Response response) {
381+
this.response = response;
382+
}
383+
384+
public void setIntentionToProceedDeadline(LocalDate intentionToProceedDeadline) {
385+
this.intentionToProceedDeadline = intentionToProceedDeadline;
386+
}
387+
374388
}

‎domain-model/src/main/java/uk/gov/hmcts/cmc/domain/models/MediationRow.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class MediationRow implements Iterable<String> {
2424
private String checkList;
2525
private String partyStatus;
2626
private String pilot;
27+
private String claimTitle;
2728

2829
public List<String> toList() {
2930
return Arrays.asList(
@@ -38,7 +39,8 @@ public List<String> toList() {
3839
contactName,
3940
contactNumber,
4041
emailAddress,
41-
pilot
42+
pilot,
43+
claimTitle
4244
);
4345
}
4446

‎domain-sample-data/src/main/java/uk/gov/hmcts/cmc/domain/models/sampledata/SampleClaim.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ public static Claim getDefaultWithoutResponse(String defendantEmail) {
246246
return builder()
247247
.withClaimData(
248248
SampleClaimData.builder().withDefendant(
249-
SampleTheirDetails.builder()
250-
.withEmail(defendantEmail).individualDetails())
249+
SampleTheirDetails.builder()
250+
.withEmail(defendantEmail).individualDetails())
251251
.build())
252252
.withDefendantId(null)
253253
.build();
@@ -462,7 +462,7 @@ public static Claim getWithClaimantResponse(ClaimantResponse claimantResponse) {
462462
public static Claim getWithClaimantResponseRejectionForPartAdmissionAndMediation() {
463463
SampleClaimantResponse.ClaimantResponseRejection
464464
.builder();
465-
return builder()
465+
Claim claim = builder()
466466
.withClaimData(SampleClaimData.submittedByClaimant())
467467
.withResponse(
468468
SampleResponse
@@ -484,6 +484,8 @@ public static Claim getWithClaimantResponseRejectionForPartAdmissionAndMediation
484484
.withHearingLocation(pilotHearingLocation).build())
485485
.build())
486486
.build();
487+
claim.setCaseName("App vs Def");
488+
return claim;
487489
}
488490

489491
public static Claim getWithClaimantResponseRejectionForPartAdmissionNoMediation() {
@@ -684,14 +686,14 @@ public static Claim getWithClaimIssueReceiptDocument() {
684686

685687
public static Claim getWithDefendantResponseReceiptDocument() {
686688
return builder().withResponse(
687-
SampleResponse.validDefaults())
689+
SampleResponse.validDefaults())
688690
.withDefendantResponseReceiptDocument(DOCUMENT_URI)
689691
.build();
690692
}
691693

692694
public static Claim getWithCCJRequestDocument() {
693695
return builder().withCountyCourtJudgment(
694-
SampleCountyCourtJudgment.builder().ccjType(DEFAULT).build())
696+
SampleCountyCourtJudgment.builder().ccjType(DEFAULT).build())
695697
.withCountyCourtJudgmentRequestedAt(LocalDateTimeFactory.nowInLocalZone())
696698
.withCCJRequestDocument(DOCUMENT_URI)
697699
.build();
@@ -726,7 +728,7 @@ public static Claim getSampleClaimantMediationRefusal() {
726728

727729
public static Claim getWithSettlementAgreementDocument() {
728730
return builder().withSettlement(
729-
SampleSettlement.validDefaults())
731+
SampleSettlement.validDefaults())
730732
.withSettlementAgreementDocument(DOCUMENT_URI)
731733
.build();
732734
}

‎email-client/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
2121
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
2222

23+
//implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: '5.1.6'
2324
implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.4'
2425
implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: '6.1.4'
2526

‎src/main/java/uk/gov/hmcts/cmc/claimstore/services/MediationCSVGenerator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class MediationCSVGenerator {
5252
.partyStatus("PARTY_STATUS")
5353
.emailAddress("CONTACT_EMAIL")
5454
.pilot("PILOT")
55+
.claimTitle("CASE_TITLE")
5556
.build();
5657

5758
private static final Map<Integer, Function<Claim, String>> CONTACT_PERSON_EXTRACTORS =
@@ -182,7 +183,8 @@ private MediationRow createMediationRow(Claim claim, int partyType) {
182183
.apply(claim))
183184
.contactNumber(CONTACT_NUMBER_EXTRACTORS.get(partyType)
184185
.apply(claim))
185-
.pilot(isPilotCase.apply(claim.getTotalClaimAmount()));
186+
.pilot(isPilotCase.apply(claim.getTotalClaimAmount()))
187+
.claimTitle(claim.getCaseName());
186188

187189
return mediationRowBuilder.build();
188190
}

‎src/main/java/uk/gov/hmcts/cmc/claimstore/utils/CaseDetailsConverter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ public Claim extractClaim(CaseDetails caseDetails) {
5757
// Calculating the intention to proceed here rather than in the mapper as we have access
5858
// to the WorkingDayIndicator here
5959
LocalDate intendsToProceedDeadline = calculateIntentionToProceedDeadline(claim.getRespondedAt());
60-
return claim.toBuilder()
61-
.intentionToProceedDeadline(intendsToProceedDeadline)
62-
.response(updateResponseMethod(claim.getResponse().orElse(null), ccdCase))
63-
.build();
60+
claim.setIntentionToProceedDeadline(intendsToProceedDeadline);
61+
claim.setResponse((updateResponseMethod(claim.getResponse().orElse(null), ccdCase)));
62+
return claim;
6463
} catch (NullPointerException exception) {
6564
// These exceptions are thrown by requireNonNull constraints in mapper's arguments.
6665
throw new IllegalArgumentException(exception);

‎src/test/java/uk/gov/hmcts/cmc/claimstore/services/MediationCSVGeneratorTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class MediationCSVGeneratorTest {
3131
private static final String CRLF = "\r\n";
3232

3333
private static final String REPORT_HEADER = "SITE_ID,CASE_TYPE,CHECK_LIST,PARTY_STATUS,CASE_NUMBER,AMOUNT,"
34-
+ "PARTY_TYPE,COMPANY_NAME,CONTACT_NAME,CONTACT_NUMBER,CONTACT_EMAIL,PILOT" + CRLF;
34+
+ "PARTY_TYPE,COMPANY_NAME,CONTACT_NAME,CONTACT_NUMBER,CONTACT_EMAIL,PILOT,CASE_TITLE" + CRLF;
3535

3636
@Mock
3737
private CaseSearchApi caseSearchApi;
@@ -52,9 +52,9 @@ public void shouldCreateMediationForClaim() {
5252
mediationClaims.add(getWithClaimantResponseRejectionForPartAdmissionAndMediation());
5353

5454
String expected = REPORT_HEADER
55-
+ "5,1,4,5,000MC001,40.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,Yes"
55+
+ "5,1,4,5,000MC001,40.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,Yes,App vs Def"
5656
+ CRLF
57-
+ "5,1,4,5,000MC001,40.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,Yes"
57+
+ "5,1,4,5,000MC001,40.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,Yes,App vs Def"
5858
+ CRLF;
5959
mediationCSVGenerator.createMediationCSV();
6060
String mediationCSV = mediationCSVGenerator.getCsvData();
@@ -66,17 +66,18 @@ public void shouldCreateMediationForClaimWithPilot() {
6666
Claim claimWithAmountMoreThan300 = getWithClaimantResponseRejectionForPartAdmissionAndMediation()
6767
.toBuilder()
6868
.claimData(SampleClaimData.submittedWithAmountMoreThanThousand()).build();
69+
claimWithAmountMoreThan300.setCaseName("App vs Def");
6970
mediationClaims.add(getWithClaimantResponseRejectionForPartAdmissionAndMediation());
7071
mediationClaims.add(claimWithAmountMoreThan300);
7172

7273
String expected = REPORT_HEADER
73-
+ "5,1,4,5,000MC001,40.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,Yes"
74+
+ "5,1,4,5,000MC001,40.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,Yes,App vs Def"
7475
+ CRLF
75-
+ "5,1,4,5,000MC001,40.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,Yes"
76+
+ "5,1,4,5,000MC001,40.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,Yes,App vs Def"
7677
+ CRLF
77-
+ "5,1,4,5,000MC001,1000.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,No"
78+
+ "5,1,4,5,000MC001,1000.99,1,John Rambo,Mediation Contact Person,07999999999,claimant@mail.com,No,App vs Def"
7879
+ CRLF
79-
+ "5,1,4,5,000MC001,1000.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,No"
80+
+ "5,1,4,5,000MC001,1000.99,2,Dr. John Smith,Mediation Contact Person,07999999999,j.smith@example.com,No,App vs Def"
8081
+ CRLF;
8182
mediationCSVGenerator.createMediationCSV();
8283
String mediationCSV = mediationCSVGenerator.getCsvData();
@@ -85,7 +86,7 @@ public void shouldCreateMediationForClaimWithPilot() {
8586

8687
@Test
8788
public void shouldCreateMediationCSVEvenWhenNoClaimsWithMediation() {
88-
String expected = REPORT_HEADER + "null,null,null,null,null,null,null,null,null,null,null,null"
89+
String expected = REPORT_HEADER + "null,null,null,null,null,null,null,null,null,null,null,null,null"
8990
+ CRLF;
9091
mediationCSVGenerator.createMediationCSV();
9192
String mediationCSV = mediationCSVGenerator.getCsvData();

0 commit comments

Comments
 (0)