From 1c05384b527d779ab5515d6baa9fb572001e3395 Mon Sep 17 00:00:00 2001 From: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:43:22 +0000 Subject: [PATCH] CIV-11205 CIV-10754 Initiate GA about to sumit and updated written Rep templates for local (#3566) * CIV-11205 populated full address for after sdo scenarios * CIV-11205 update TriggerGenApp to update address * CIV-11205 Updated address during TriggerLocationUpdate Event * CIV-11205 Unit tests covered for location update * CIV-11205 updated templates with court full address * CIV-11205 Code smell corrected * CIV-11205 Updated written representation templates with location * CIV-11205 updated locationName to courtName * CIV-10754 updated with the changes * CIV-10754 removed duplicate assignment * CIV-10754 check style issue corrected * CIV-10754 checkstyle issues corrected * CIV-10754 Setting up the id only when caseRole is not null * CIV-10754 checkstyle issues corrected * CIV-10754 Added condition to avoid users having multiple roles * CIV-10754 updated tests * CIV-10754 updated unit test data * CIV-10754 Added condition to avoid null pointer * CIV-10754 added condition for adding respondent solicitors * CIV-10754 Log to verify ccd userroles --- .../templates/CV-UNS-GAP-ENG-01070.docx | Bin 23869 -> 23962 bytes .../templates/CV-UNS-GAP-ENG-01071.docx | Bin 23762 -> 23842 bytes ...itiateGeneralApplicationServiceHelper.java | 34 ++++++++++++------ ...teGeneralApplicationServiceHelperTest.java | 8 +++++ .../GeneralApplicationDetailsBuilder.java | 1 + 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01070.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01070.docx index 3e9445b398d0c286ba8d292ef6435082af7ad8cd..df4bdf5e8744cf5c359fc9d7090f6e0eb44fc1c2 100644 GIT binary patch delta 8007 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 OqBBH?>(Tiium1&2g;@9i delta 7971 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 &3g@wCu0%C+b25c(+uM|Sb3n5Ta2 zixcu@;nS{?IRDE%h7Pg=U#r8_4W2G9fi@5C*Y4!&FD9%s8}iN zr$S!PtXW+4;hMvr#U>5X6U#tAhSXG<6EK<&Vl^so$Mkc$0Dd$glpAb1&p3mpv)RzNG8W(i+$|a7bqP zyG%UX6tY=^7>fJtECY9%ER=AX2*qX(aE_$9azGUN&Pr?ak(J9}SYI+#5vY|mcu_R~ z=!AuzSF=_k@F1B{zwu%(oXwqn)y5289KBIYWNMn%R#7S=$Cl#I+SZ(-1u>)2-oiD% z&_fBDaL;BilIS_SJ2<0{SssN-?yuU8C6wNLjx%T9;U+ElLqN5A$wN#-!r5U6_-Wax zgcGAViJ(%PfNUbsg7mo){b$6=YF)<6VWw(!NmNJN_3+o+%+Q0_4nCN1=KjW4FQIK1 zf3isMblQ;el?uqIvQH4a0uxlv93t(;WEw8duN~T{8Y?nyjZMJTbrq>3{0LH+R!qkA zQczi_OiCf@$16gZghZe`)L^>-AF1QJwc5Q**SGWo8^#`MFKQ>5Gy~Pd*tN`)>X$^a zjY3q0P6S~4>8{>Sj*oXUIq4LrhgJU{WiiQX>e z4B6fL;cNeg(76*h?SBbf8Jay0lQYj*({cX$`!yt-YcmcXYnQ4(ROIdQJP-GNaHT7- z18F?oO6jFF^@(pi?HiJ4^s9(rQEll@yE_VVO`7go}&aAG#T(ycb_$ib{A~SjrQ&`vk zI)a^_c))#hNw%vR`0+4(B6RcU415?whE7kbYG^|!m{CG*-VcD4w<^Bl~> z99OdL=4<-E+t~1J1nKgtkansKwJS2C$UJERuPi5^yu36gY>do&!ndBTluGMsI0|cW zh=G=_g6`69Te1jH#yuD6r_p^}^>=G1mJRyVb3~e!7K=lM#7!{kX@qKJ1w_;u3Ge(- zxW>}DCkQ9`fSPylb)cHcLVFL#!EZ7LOQ=17@Eu&saEAe+F)?)F*G*))$>QG*3u8_0 z1FDx|leiu_SjaIu4VJgCln7WUlJH60Cb;ZuW6H4Z{yfy9D)Ij9 zkTZgLfH`Gl0o5f*pJXesE5$x>NS=>VO#MOL7SmvOYyAD^4<{nO;wE=hUsLLU zj``qvlVi9ACWizDR$wK3@2AFR(S{YhgfT>GJX7q)(G*WB?Ru8A%hgb3w*t1JbQZJ8 zuX3D>Q-tf;-hIOsn>V~fC7MX4S+jJkufHkxz&qOdrSM@>T^xG2qVYtElS{%Zbw)a; z8EqC<+CmYGnZfJG;7VTM7^y)?F4TLnTzE$>#8bebfpTU<0T7jG9=6u+KmM~qE-0{d zk=|HX9BvG!*}PuYE*=33hwL!zlV4&}0?am~r6W!_r zZ)~)mE-Vq)q{y;;C3Fa%w)O21Sv~(lCxj+v85=4czY%sujw0|SQfRPFjI(BEOjf=H zTJ(6HlAWb!9{7Hps(T`#YiZEgV>M@~y{NW@Y^k|7YcUU&S12aY9kbX%BhmHV5y+TJ zRLoY!!N+@nn1!TU3H2_Psx9FxlTdOe4G|^JD3vPpM+d$u@M1H|ub8cHHz@bRhj8b_ zK>Ps?#F*E4YN9(jN{LrTUj9%J)c=4z{b2Yy=Yn3YD$GbrYXogWuw;Fr&0f-0@b*BIJ1gjG<@Tm3x8u;14N_ zqO)nzlFIKKJ*4hv%GJpRV>{%Ka=)+vtOQ{UsPHFILUAy2;Z1@LP*GU)cIeZuQq=fm zY1j*el3Y;fWpkmRgwz|@Nu}z;n0oU9FkhzN z-sxC9zkA;M&-!;7%*5#q9Ie3qZCU~Tm!;V^n)h05q0pcK0aGsjOr;0^NED%GEPZQ0 z4mDnUw`jcB8AVV2J9ArFoCdYHOJaxVcDYuqN3N##7k$>47WBBy)t`8>u@io}O}|U5 zVENC9e|5zRuM{@A=%uQ4%IIGfSGT0~KJ)Ogb`-eOyBZ^CvE~r}1^6RvgSnDO2lE2C(%)ejTY~<-D?S{&&YmQ}Ax_1!!&a~l||5{%8j3cKSPxNet z8~!)b)nKqPv`U!KFqdrq1ZISe)~6K~f5t7KS zJxzoayQn4Ir{$v~uxpba!8G1e-_9+LIP95tzf=SrAkQ{k{b)f#sD~^9?SZF_ug#y5 z@8oJ>(U=j%lEG?djg9a|M{yzkyXhi*;w`yDAY6t#!760IOtd)&9c?|E zHx0Cz!aliCL~|a8?pDA%cJL{eWYBs~3=Tb#Z3~sHEGE+d!Z*!&XakR4x}1~W*>Xz^ zRJ#PLlc$%y-5{z*0A*upFWo)F{egajdCITrJLcr+6*)oEj@JiqYnnJjL`U3U28xU7 zaJv?fEpJlp!#n`}Mn*VEw8p3bpC%ZBlyBLJut-h~fGI?9TNt&;Km7L{SW{mWL7ws5d_Twg#!f#h44?366!zh_aD9BKYGmnmP0v% zSqwx#f?y{DVd!-#aIJw5$On96APm9*(;7;EKwx`AdgA|UOaA|IIB=bz2=urx_{>lc zR0yUw5(k074n{O2|7UCb)Aj%Dc%=faHTp>MAA0{;D{C-NQ2(5{|0|l+!6!yS(EVCq YdSg*&9$j#QE-^UL7z55i?_bsb0PXiANB{r; diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01071.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01071.docx index 57e6930dbe339b25dee82139e86d06fcf15e8163..3b9258c333f29a5fe68f361840cd43a641ba8c9e 100644 GIT binary patch delta 8181 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 delta 8051 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 U>hy)d$2CE>`t;CGTL0evAL2uSGynhq diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationServiceHelper.java b/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationServiceHelper.java index d6d35fe839d..57bb35d38bd 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationServiceHelper.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationServiceHelper.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -39,6 +40,7 @@ public class InitiateGeneralApplicationServiceHelper { private final AuthTokenGenerator authTokenGenerator; private final UserService userService; private final CrossAccessUserConfiguration crossAccessUserConfiguration; + public CaseAssignedUserRolesResource userRoles; public boolean isGAApplicantSameAsPCClaimant(CaseData caseData, String organisationIdentifier) { @@ -56,14 +58,12 @@ public GeneralApplication setRespondentDetailsIfPresent(CaseData.CaseDataBuilder || (YES.equals(caseData.getAddRespondent2()) && caseData.getRespondent2OrganisationPolicy() == null)) { throw new IllegalArgumentException("Solicitor Org details are not set correctly."); } - GeneralApplication.GeneralApplicationBuilder applicationBuilder = generalApplication.toBuilder(); String parentCaseId = caseData.getCcdCaseReference().toString(); - String applicant1OrgCaseRole = caseData.getApplicant1OrganisationPolicy().getOrgPolicyCaseAssignedRole(); String respondent1OrgCaseRole = caseData.getRespondent1OrganisationPolicy().getOrgPolicyCaseAssignedRole(); - CaseAssignedUserRolesResource userRoles = getUserRoles(parentCaseId); + userRoles = getUserRoles(parentCaseId); /*Filter the case users to collect solicitors whose ID doesn't match with GA Applicant Solicitor's ID*/ List respondentSolicitors = userRoles.getCaseAssignedUserRoles().stream() @@ -119,7 +119,7 @@ public GeneralApplication setRespondentDetailsIfPresent(CaseData.CaseDataBuilder } } } - + GeneralApplication.GeneralApplicationBuilder applicationBuilder = generalApplication.toBuilder(); applicationBuilder .generalAppApplnSolicitor(applicantBuilder.build()); String applicantPartyName = null; @@ -133,13 +133,13 @@ public GeneralApplication setRespondentDetailsIfPresent(CaseData.CaseDataBuilder GASolicitorDetailsGAspec.GASolicitorDetailsGAspecBuilder specBuilder = GASolicitorDetailsGAspec .builder(); - specBuilder.id(respSol.getUserId()); - if (respSol.getCaseRole() != null) { + log.info(respSol.getCaseRole(), "**", respSol.getUserId()); /*Populate the GA respondent solicitor details in accordance with civil case Applicant Solicitor 1 details if case role of collected user matches with case role of Applicant 1*/ if (respSol.getCaseRole().equals(applicant1OrgCaseRole)) { if (caseData.getApplicantSolicitor1UserDetails() != null) { + specBuilder.id(respSol.getUserId()); specBuilder.email(caseData.getApplicantSolicitor1UserDetails().getEmail()); specBuilder.organisationIdentifier(caseData.getApplicant1OrganisationPolicy() .getOrganisation().getOrganisationID()); @@ -147,14 +147,19 @@ public GeneralApplication setRespondentDetailsIfPresent(CaseData.CaseDataBuilder /*Populate the GA respondent solicitor details in accordance with civil case Respondent Solicitor 1 details if caserole of collected user matches with caserole Respondent Solicitor 1*/ } else if (respSol.getCaseRole().equals(respondent1OrgCaseRole)) { + specBuilder.id(respSol.getUserId()); specBuilder.email(caseData.getRespondentSolicitor1EmailAddress()); specBuilder.organisationIdentifier(getRespondent1SolicitorOrgId(caseData)); /*Populate the GA respondent solicitor details in accordance with civil case Respondent Solicitor 2 details if it's 1 V 2 Different Solicitor scenario*/ } else { - specBuilder.email(caseData.getRespondentSolicitor2EmailAddress()); - specBuilder.organisationIdentifier(getRespondent2SolicitorOrgId(caseData)); + if (Objects.nonNull(caseData.getAddRespondent2()) + && caseData.getAddRespondent2().equals(YES)) { + specBuilder.id(respSol.getUserId()); + specBuilder.email(caseData.getRespondentSolicitor2EmailAddress()); + specBuilder.organisationIdentifier(getRespondent2SolicitorOrgId(caseData)); + } } /*Set the GA Respondent solicitor details to Empty if above checks are failed*/ } else { @@ -167,7 +172,10 @@ public GeneralApplication setRespondentDetailsIfPresent(CaseData.CaseDataBuilder } GASolicitorDetailsGAspec gaSolicitorDetailsGAspec = specBuilder.build(); - respondentSols.add(element(gaSolicitorDetailsGAspec)); + if (Objects.nonNull(gaSolicitorDetailsGAspec.getId())) { + respondentSols.add(element(gaSolicitorDetailsGAspec)); + } + }); applicantPartyName = getApplicantPartyName(userRoles, userDetails, caseData); applicationBuilder.applicantPartyName(applicantPartyName); @@ -252,8 +260,12 @@ public boolean isGAApplicantSameAsParentCaseClaimant(CaseData caseData, String a } public CaseAssignedUserRolesResource getUserRoles(String parentCaseId) { - return caseAccessDataStoreApi.getUserRoles( - getCaaAccessToken(), authTokenGenerator.generate(), List.of(parentCaseId)); + if (Objects.isNull(userRoles)) { + userRoles = caseAccessDataStoreApi.getUserRoles( + getCaaAccessToken(), authTokenGenerator.generate(), List.of(parentCaseId)); + } + log.info("UserRoles from API :" + userRoles); + return userRoles; } public String getCaaAccessToken() { diff --git a/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/InitiateGeneralApplicationServiceHelperTest.java b/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/InitiateGeneralApplicationServiceHelperTest.java index 9f2c10dcfc0..a7d8476c88f 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/InitiateGeneralApplicationServiceHelperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/handler/callback/user/InitiateGeneralApplicationServiceHelperTest.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.civil.handler.callback.user; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -95,6 +96,11 @@ void setup() { .caseAssignedUserRoles(getCaseAssignedApplicantUserRoles()).build()); } + @AfterEach + void setUserRolesAsNull() { + helper.userRoles = null; + } + public List getCaseAssignedApplicantUserRoles() { return List.of( CaseAssignedUserRole.builder().caseDataId("1").userId(STRING_NUM_CONSTANT) @@ -268,6 +274,7 @@ void shouldSetApplicantSolicitorOrgIDTo200() { .respondentSolicitor1EmailAddress(RESPONDENT_EMAIL_ID_CONSTANT) .applicant1(Party.builder().type(COMPANY).companyName("Applicant1").build()) .respondent2(Party.builder().type(COMPANY).companyName("Respondent1").build()) + .addRespondent2(YesOrNo.YES) .applicant1OrganisationPolicy(OrganisationPolicy.builder() .organisation(Organisation.builder().organisationID("200").build()) .orgPolicyCaseAssignedRole(APPLICANTSOLICITORONE.getFormattedName()) @@ -309,6 +316,7 @@ void shouldSetApplicantSolicitorOrgIDTo100() { .applicant2(Party.builder().type(COMPANY).companyName("Applicant2").build()) .respondent1(Party.builder().type(COMPANY).companyName("Respondent1").build()) .respondent2(Party.builder().type(COMPANY).companyName("Respondent2").build()) + .addRespondent2(YesOrNo.YES) .applicant1OrganisationPolicy(OrganisationPolicy.builder() .organisation(Organisation.builder().organisationID("200").build()) .orgPolicyCaseAssignedRole(APPLICANTSOLICITORONE.getFormattedName()) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/sampledata/GeneralApplicationDetailsBuilder.java b/src/test/java/uk/gov/hmcts/reform/civil/sampledata/GeneralApplicationDetailsBuilder.java index cdd3e35fc73..0caef94ebf2 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/sampledata/GeneralApplicationDetailsBuilder.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/sampledata/GeneralApplicationDetailsBuilder.java @@ -1588,6 +1588,7 @@ public CaseData getVaryJudgmentWithN245TestData() { .ccdCaseReference(1L) .applicant1(Party.builder().type(Party.Type.COMPANY).companyName("Applicant1").build()) .respondent1(Party.builder().type(Party.Type.COMPANY).companyName("Respondent1").build()) + .addRespondent2(NO) .courtLocation(CourtLocation.builder() .caseLocation(CaseLocationCivil.builder() .region("2")