SSCSCI-1356 fixing draft appeals for IBC

charts/sscs-tribunals-api/values.preview.template.yaml

@@ -538,7 +538,7 @@ elastic:
 sscs-tribunals-frontend:
   enabled: true
   nodejs:
-    image: hmctspublic.azurecr.io/sscs/tribunals-frontend:latest
+    image: hmctspublic.azurecr.io/sscs/tribunals-frontend:pr-1563
     ingressHost: sya-${SERVICE_FQDN}
     registerAdditionalDns:
       enabled: true

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionAppellantIbcRole.java

@@ -0,0 +1,8 @@
+package uk.gov.hmcts.reform.sscs.model.draft;
+
+import lombok.Value;
+
+@Value
+public class SessionAppellantIbcRole {
+    String ibcRole;
+}

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionAppellantIbcaReference.java

@@ -0,0 +1,8 @@
+package uk.gov.hmcts.reform.sscs.model.draft;
+
+import lombok.Value;
+
+@Value
+public class SessionAppellantIbcaReference {
+    String ibcaReference;
+}

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionContactDetails.java

@@ -10,7 +10,9 @@ public class SessionContactDetails {
     private String addressLine2;
     private String townCity;
     private String county;
+    private String country;
     private String postCode;
+    private String portOfEntry;
     private String phoneNumber;
     private String emailAddress;
     private String postcodeLookup;

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionDraft.java

@@ -66,9 +66,21 @@ public class SessionDraft {
     @JsonProperty("AppellantNINO")
     SessionAppellantNino appellantNino;
 
+    @JsonProperty("AppellantIBCAReference")
+    SessionAppellantIbcaReference appellantIbcaReference;
+
+    @JsonProperty("AppellantRole")
+    SessionAppellantIbcRole appellantIbcRole;
+
+    @JsonProperty("AppellantInMainlandUk")
+    SessionInMainlandUk appellantInMainlandUk;
+
     @JsonProperty("AppellantContactDetails")
     SessionContactDetails appellantContactDetails;
 
+    @JsonProperty("AppellantInternationalContactDetails")
+    SessionContactDetails appellantInternationalContactDetails;
+
     @JsonProperty("SameAddress")
     SessionSameAddress sameAddress;
 
@@ -87,6 +99,12 @@ public class SessionDraft {
     @JsonProperty("Representative")
     SessionRepresentative representative;
 
+    @JsonProperty("RepresentativeInMainlandUk")
+    SessionInMainlandUk representativeInMainlandUk;
+
+    @JsonProperty("RepresentativeInternationalDetails")
+    SessionRepresentativeDetails representativeInternationalDetails;
+
     @JsonProperty("RepresentativeDetails")
     SessionRepresentativeDetails representativeDetails;
 

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionInMainlandUk.java

@@ -0,0 +1,8 @@
+package uk.gov.hmcts.reform.sscs.model.draft;
+
+import lombok.Value;
+
+@Value
+public class SessionInMainlandUk {
+    String inMainlandUk;
+}

src/main/java/uk/gov/hmcts/reform/sscs/model/draft/SessionRepresentativeDetails.java

@@ -11,6 +11,7 @@ public class SessionRepresentativeDetails {
     private String addressLine2;
     private String townCity;
     private String county;
+    private String country;
     private String postCode;
     private String phoneNumber;
     private String emailAddress;

src/main/java/uk/gov/hmcts/reform/sscs/service/converter/ConvertSscsCaseDataIntoSessionDraft.java

@@ -45,19 +45,25 @@ public SessionDraft convert(SscsCaseData caseData) {
             .dwpIssuingOfficeEsa(buildDwpIssuingOfficeEsa(appeal))
             .appointeeName(buildName(getAppointeeName(appeal)))
             .appointeeDob(buildDob(getAppointeeIdentity(appeal)))
-            .appointeeContactDetails(buildContactDetails(getAppointeeAddress(appeal), getAppointeeContact(appeal)))
+            .appointeeContactDetails(buildContactDetails(getAppointeeAddress(appeal), getAppointeeContact(appeal), YesNo.NO))
             .appointee(buildAppointee(appeal))
             .appellantName(buildName(getAppellantName(appeal)))
             .appellantDob(buildDob(getAppellantIdentity(appeal)))
             .appellantNino(buildAppellantNino(appeal))
-            .appellantContactDetails(buildContactDetails(getAppellantAddress(appeal), getAppellantContact(appeal)))
+            .appellantIbcaReference(getAppellantIbcaReference(appeal))
+            .appellantIbcRole(getAppellantIbcRole(appeal))
+            .appellantInMainlandUk(getAppellantInMainlandUk(appeal))
+            .appellantContactDetails(buildContactDetails(getAppellantAddress(appeal), getAppellantContact(appeal), YesNo.NO))
+            .appellantInternationalContactDetails(buildContactDetails(getAppellantAddress(appeal), getAppellantContact(appeal), YesNo.YES))
             .sameAddress(buildSameAddress(appeal))
             .textReminders(buildTextReminders(caseData.getSubscriptions()))
             .sendToNumber(buildSendToNumber(caseData))
             .enterMobile(buildEnterMobile(caseData))
             .smsConfirmation(buildSmsConfirmation(caseData))
             .representative(buildRepresentative(appeal))
-            .representativeDetails(buildRepresentativeDetails(appeal))
+            .representativeInMainlandUk(getRepresentativeInMainlandUk(appeal))
+            .representativeDetails(buildRepresentativeDetails(appeal, YesNo.NO))
+            .representativeInternationalDetails(buildRepresentativeDetails(appeal, YesNo.YES))
             .reasonForAppealing(buildReasonForAppealing(appeal))
             .otherReasonForAppealing(buildOtherReasonForAppealing(appeal))
             .evidenceProvide(buildEvidenceProvide(caseData.getEvidencePresent()))
@@ -287,7 +293,15 @@ private SessionRepresentative buildRepresentative(Appeal appeal) {
         return new SessionRepresentative(StringUtils.lowerCase(appeal.getRep().getHasRepresentative()));
     }
 
-    private SessionRepresentativeDetails buildRepresentativeDetails(Appeal appeal) {
+    private SessionInMainlandUk getRepresentativeInMainlandUk(Appeal appeal) {
+        if (!hasRep(appeal) || appeal.getRep().getAddress() == null || appeal.getRep().getAddress().getInMainlandUk() == null) {
+            return null;
+        }
+
+        return new SessionInMainlandUk(appeal.getRep().getAddress().getInMainlandUk().getValue().toLowerCase());
+    }
+
+    private SessionRepresentativeDetails buildRepresentativeDetails(Appeal appeal, YesNo international) {
         SessionRepresentative sessionRepresentative = buildRepresentative(appeal);
         if (!hasRep(appeal)
             || sessionRepresentative == null
@@ -307,12 +321,16 @@ private SessionRepresentativeDetails buildRepresentativeDetails(Appeal appeal) {
         boolean hasAddress = appeal.getRep().getAddress() != null;
         boolean hasContact = appeal.getRep().getContact() != null;
 
+        if (hasAddress && international.equals(appeal.getRep().getAddress().getInMainlandUk())) {
+            return null;
+        }
         return new SessionRepresentativeDetails(
             repName,
             hasAddress ? appeal.getRep().getAddress().getLine1() : null,
             hasAddress ? appeal.getRep().getAddress().getLine2() : null,
             hasAddress ? appeal.getRep().getAddress().getTown() : null,
             hasAddress ? appeal.getRep().getAddress().getCounty() : null,
+            hasAddress ? appeal.getRep().getAddress().getCountry() : null,
             hasAddress ? appeal.getRep().getAddress().getPostcode() : null,
             hasContact ? appeal.getRep().getContact().getMobile() : null,
             hasContact ? appeal.getRep().getContact().getEmail() : null,
@@ -512,6 +530,35 @@ private SessionAppellantNino buildAppellantNino(Appeal appeal) {
         return new SessionAppellantNino(appeal.getAppellant().getIdentity().getNino());
     }
 
+    private SessionAppellantIbcaReference getAppellantIbcaReference(Appeal appeal) {
+        if (appeal.getAppellant() == null
+            || appeal.getAppellant().getIdentity() == null
+            || appeal.getAppellant().getIdentity().getIbcaReference() == null) {
+            return null;
+        }
+
+        return new SessionAppellantIbcaReference(appeal.getAppellant().getIdentity().getIbcaReference());
+    }
+
+    private SessionAppellantIbcRole getAppellantIbcRole(Appeal appeal) {
+        if (appeal.getAppellant() == null
+            || appeal.getAppellant().getIbcRole() == null) {
+            return null;
+        }
+
+        return new SessionAppellantIbcRole(appeal.getAppellant().getIbcRole());
+    }
+
+    private SessionInMainlandUk getAppellantInMainlandUk(Appeal appeal) {
+        if (appeal.getAppellant() == null
+            || appeal.getAppellant().getAddress() == null
+            || appeal.getAppellant().getAddress().getInMainlandUk() == null) {
+            return null;
+        }
+
+        return new SessionInMainlandUk(appeal.getAppellant().getAddress().getInMainlandUk().getValue().toLowerCase());
+    }
+
     private Address getAppellantAddress(Appeal appeal) {
         if (appeal.getAppellant() == null) {
             return null;
@@ -544,16 +591,18 @@ private Contact getAppointeeContact(Appeal appeal) {
         return appeal.getAppellant().getAppointee().getContact();
     }
 
-    private SessionContactDetails buildContactDetails(Address address, Contact contact) {
-        if (address == null || address.getLine1() == null) {
+    private SessionContactDetails buildContactDetails(Address address, Contact contact, YesNo international) {
+        if (address == null || address.getLine1() == null || international.equals(address.getInMainlandUk())) {
             return null;
         }
         return new SessionContactDetails(
             address.getLine1(),
             address.getLine2(),
             address.getTown(),
             address.getCounty(),
+            address.getCountry(),
             address.getPostcode(),
+            address.getPortOfEntry(),
             contact.getMobile(),
             contact.getEmail(),
             StringUtils.isEmpty(address.getPostcodeLookup()) ? null : address.getPostcodeLookup(),

src/test/java/uk/gov/hmcts/reform/sscs/controller/AbstractSyaControllerTest.java

@@ -387,7 +387,9 @@ public void givenGetDraftIsCalled_shouldReturn200AndTheDraft() throws Exception
                     "line2",
                     "town-city",
                     "county",
+                    null,
                     "AP1 4NT",
+                    null,
                     "07000000000",
                     "appellant@test.com",
                     null,
@@ -478,7 +480,9 @@ public void givenGetDraftWithRepIsCalled_shouldReturn200AndTheDraft() throws Exc
                     "line2",
                     "town-city",
                     "county",
+                    null,
                     "AP1 4NT",
+                    null,
                     "07000000000",
                     "appellant@test.com",
                     null,
@@ -500,6 +504,7 @@ public void givenGetDraftWithRepIsCalled_shouldReturn200AndTheDraft() throws Exc
                     "rep-line2",
                     "rep-town-city",
                     "rep-county",
+                    null,
                     "RE7 7ES",
                     "07222222222",
                     "representative@test.com",
@@ -577,7 +582,9 @@ public void givenGetDraftWithAppointeeIsCalled_shouldReturn200AndTheDraft() thro
                     "tee-line2",
                     "tee-town-city",
                     "tee-county",
+                    null,
                     "AP1 33T",
+                    null,
                     "07111111111",
                     "appointee@test.com",
                     null,