SSCSCI-1137 - Update Docmosis address logic #4093

Ziziou91 · 2024-10-28T13:17:44Z

SSCSCI-1137 - Update Docmosis address logic for international addresses

Jira link

https://tools.hmcts.net/jira/browse/SSCSCI-1137

Change description

Move labels() to LetterUtils.java and add conditional logic to handle international addresses.

Write unit tests for labels() in LetterUtilsTest.java.

Implement labels() in following files to allow them to handle international addresses:

PlaceholderService.java
PdfLetterService.java
SendNotificationService.java
GenericLetterPlaceholderService.java
PlaceholderUtility.java

Testing done

Unit tests in LetterUtilsTest.java.

Checklist

[ x] commit messages are meaningful and follow good commit message guidelines
[ x] README and other documentation has been updated / added (if needed)
[ x] tests have been updated / new tests has been added (if needed)
Does this PR introduce a breaking change

…tes. Update references to new TB-SCS-LET-ENG-Appeal-Lodged-Representative-IB template.

github-actions · 2024-10-28T13:18:29Z

CCD diff report

No change

…tes. Update references to new TB-SCS-LET-ENG-Appeal-Lodged-Representative-IB template.

tomxelliott · 2024-10-28T17:43:33Z

cftlib_log_file_IS_UNDEFINED

is this needed? Can it be deleted?

Thanks for flagging. Wasn't needed and has been removed.

tomxelliott · 2024-10-28T17:43:42Z

dump.rdb

is this needed? Can it be deleted?

Thanks for flagging. Wasn't needed and has been deleted.

…-case-api into SSCSCI-1137

src/main/java/uk/gov/hmcts/reform/sscs/tyanotifications/service/LetterUtils.java

… name

…nceServiceIt.

benouaer · 2024-11-08T12:06:26Z

what is this cftlib_log_file_IS_UNDEFINED?

benouaer · 2024-11-08T12:11:35Z

...ain/java/uk/gov/hmcts/reform/sscs/evidenceshare/service/placeholders/PlaceholderUtility.java

@@ -4,9 +4,10 @@
 import static org.apache.commons.lang3.StringUtils.isNoneBlank;
 import static uk.gov.hmcts.reform.sscs.ccd.domain.YesNo.isYes;
 import static uk.gov.hmcts.reform.sscs.evidenceshare.service.placeholders.PlaceholderConstants.*;


hmcts style guidelines recommend not using wildcard imports

benouaer · 2024-11-08T12:21:51Z

...ov/hmcts/reform/sscs/evidenceshare/service/placeholders/GenericLetterPlaceholderService.java


+        for (int i = 0; i < lines.size(); i++) {


given that this same logic is repeated for most calls to lines(), is it worth incorporating it into the method (or creating a separate method that calls it), and passing a boolean to decide whether or not to truncate

Ziziou91 · 2024-11-08T12:26:19Z

what is this cftlib_log_file_IS_UNDEFINED?

@benouaer looks like it's being produced in directory tests are run from when a CCD test fails. See createPropertiesFolder method below:
https://github.com/hmcts/rse-cft-lib/blob/main/cftlib/lib/bootstrapper/src/main/java/uk/gov/hmcts/rse/ccd/lib/LibRunner.java

File deleted.

benouaer · 2024-11-08T12:26:47Z

src/main/java/uk/gov/hmcts/reform/sscs/tyanotifications/service/SendNotificationService.java

@@ -404,4 +416,8 @@ private static String getDocumentForType(AbstractDocument sscsDocument) {
        return null;
    }

+    private static String defaultToEmptyStringIfNull(String value) {


should this be in letterUtils?

…dcard imports.

...n/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/PersonalisationMappingConstants.java

.gitignore

This reverts commit 20c0216.

This reverts commit 0ea1d68.

* Reapply "SSCSCI-1137 - Update Docmosis address logic (#4093)" (#4131) This reverts commit 0ea1d68. * refactor getAddressPlaceholders to validate letter service. * Update .gitignore * Allow addresses without postcode outside UK * Allow blank postcode on international addresses * SSCSCI-1473 bug fix to pass international postcode through from SYA * SSCSCI-1473 test * pointing to SYA PR * fix coverletter addresses * Merge master * Fix test * repoint before merge --------- Co-authored-by: Joshua Gray <joshgray91@gmail.com> Co-authored-by: nilay <nilay.patel@hmcts.net>

Implement logic to handle international addresses for Docmosis templa…

891a28d

…tes. Update references to new TB-SCS-LET-ENG-Appeal-Lodged-Representative-IB template.

Ziziou91 requested a review from a team as a code owner October 28, 2024 13:17

Ziziou91 added 2 commits October 28, 2024 16:22

Implement logic to handle international addresses for Docmosis templa…

1233555

…tes. Update references to new TB-SCS-LET-ENG-Appeal-Lodged-Representative-IB template.

Merge branch 'master' into SSCSCI-1137

a3d21bc

hmcts-jenkins-j-to-z bot deployed to preview October 28, 2024 16:44 View deployment

hmcts-jenkins-j-to-z bot added ns:sscs prd:sscs rel:sscs-tribunals-api-pr-4093 labels Oct 28, 2024

hmcts-jenkins-j-to-z bot deployed to preview October 28, 2024 17:01 View deployment

tomxelliott reviewed Oct 28, 2024

View reviewed changes

Ziziou91 added 2 commits October 28, 2024 17:58

Remove unused files.

f06697c

Merge branch 'SSCSCI-1137' of https://github.com/hmcts/sscs-tribunals…

6589b3e

…-case-api into SSCSCI-1137

hmcts-jenkins-j-to-z bot deployed to preview October 28, 2024 18:17 View deployment

nilay913 reviewed Oct 29, 2024

View reviewed changes

src/main/java/uk/gov/hmcts/reform/sscs/tyanotifications/service/LetterUtils.java Outdated Show resolved Hide resolved

nilay913 previously approved these changes Oct 29, 2024

View reviewed changes

hmcts-jenkins-j-to-z bot deployed to preview October 29, 2024 09:54 View deployment

update path for APPEAL_RECEIVED docmosis letter template

2339f44

Ziziou91 dismissed nilay913’s stale review via 2339f44 October 29, 2024 19:28

hmcts-jenkins-j-to-z bot deployed to preview October 29, 2024 19:43 View deployment

update LetterUtils imports and revert appeal-received letter template…

66d6645

… name

hmcts-jenkins-j-to-z bot deployed to preview October 29, 2024 21:13 View deployment

benouaer added the enable_keep_helm label Oct 31, 2024

Ziziou91 added 2 commits October 31, 2024 12:20

Update appeal-received letter template name to IBA

c8d87e5

Update notification tests.

9c1b6a7

hmcts-jenkins-j-to-z bot deployed to preview October 31, 2024 13:21 View deployment

Ziziou91 added 3 commits November 1, 2024 20:11

Refactor to use Address method getFullAddress.

250b932

Refactor to use Address method getFullAddress.

04254d5

Revert back to using lines for addresses to satisfy IssueFurtherEvide…

9c49a70

…nceServiceIt.

Add 10 seconds to delay to allow respons from simulateCcdCallback

3e10e2a

hmcts-jenkins-j-to-z bot deployed to preview November 6, 2024 12:12 View deployment

linusnorton previously approved these changes Nov 7, 2024

View reviewed changes

benouaer reviewed Nov 8, 2024

View reviewed changes

Ziziou91 dismissed linusnorton’s stale review via a0b5545 November 8, 2024 12:24

benouaer reviewed Nov 8, 2024

View reviewed changes

benouaer previously approved these changes Nov 8, 2024

View reviewed changes

hmcts-jenkins-j-to-z bot deployed to preview November 8, 2024 12:38 View deployment

Ziziou91 added 2 commits November 9, 2024 19:10

Refactor letter services to use getAddressPlaceholders and remove wil…

82f19a5

…dcard imports.

Refactor letter services to use getAddressPlaceholders and remove wil…

2c3fb4b

…dcard imports.

Ziziou91 dismissed benouaer’s stale review via 2c3fb4b November 10, 2024 10:53

Ziziou91 force-pushed the SSCSCI-1137 branch from a0b5545 to 2c3fb4b Compare November 10, 2024 10:53

Merge branch 'master' into SSCSCI-1137

19a218d

hmcts-jenkins-j-to-z bot requested a deployment to preview November 10, 2024 11:16 Abandoned

hmcts-jenkins-j-to-z bot deployed to preview November 11, 2024 08:52 View deployment

nilay913 reviewed Nov 11, 2024

View reviewed changes

...n/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/PersonalisationMappingConstants.java Show resolved Hide resolved

nilay913 requested changes Nov 11, 2024

View reviewed changes

.gitignore Show resolved Hide resolved

nilay913 approved these changes Nov 11, 2024

View reviewed changes

linusnorton approved these changes Nov 11, 2024

View reviewed changes

Merge branch 'master' into SSCSCI-1137

b2bc5ff

hmcts-jenkins-j-to-z bot deployed to preview November 11, 2024 17:36 View deployment

Ziziou91 merged commit 20c0216 into master Nov 11, 2024
8 checks passed

Ziziou91 deleted the SSCSCI-1137 branch November 11, 2024 19:23

linusnorton added a commit that referenced this pull request Nov 12, 2024

Revert "SSCSCI-1137 - Update Docmosis address logic (#4093)"

75a0929

This reverts commit 20c0216.

linusnorton added a commit that referenced this pull request Nov 12, 2024

Revert "SSCSCI-1137 - Update Docmosis address logic (#4093)" (#4131)

0ea1d68

This reverts commit 20c0216.

linusnorton added a commit that referenced this pull request Nov 12, 2024

Reapply "SSCSCI-1137 - Update Docmosis address logic (#4093)" (#4131)

9e0364a

This reverts commit 0ea1d68.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SSCSCI-1137 - Update Docmosis address logic #4093

SSCSCI-1137 - Update Docmosis address logic #4093

Ziziou91 commented Oct 28, 2024 •

edited

Loading

github-actions bot commented Oct 28, 2024

tomxelliott Oct 28, 2024

Ziziou91 Oct 28, 2024

tomxelliott Oct 28, 2024

Ziziou91 Oct 28, 2024

benouaer commented Nov 8, 2024

benouaer Nov 8, 2024

benouaer Nov 8, 2024

Ziziou91 commented Nov 8, 2024 •

edited

Loading

benouaer Nov 8, 2024

SSCSCI-1137 - Update Docmosis address logic #4093

SSCSCI-1137 - Update Docmosis address logic #4093

Conversation

Ziziou91 commented Oct 28, 2024 • edited Loading

Jira link

Change description

Testing done

Checklist

github-actions bot commented Oct 28, 2024

CCD diff report

tomxelliott Oct 28, 2024

Choose a reason for hiding this comment

Ziziou91 Oct 28, 2024

Choose a reason for hiding this comment

tomxelliott Oct 28, 2024

Choose a reason for hiding this comment

Ziziou91 Oct 28, 2024

Choose a reason for hiding this comment

benouaer commented Nov 8, 2024

benouaer Nov 8, 2024

Choose a reason for hiding this comment

benouaer Nov 8, 2024

Choose a reason for hiding this comment

Ziziou91 commented Nov 8, 2024 • edited Loading

benouaer Nov 8, 2024

Choose a reason for hiding this comment

Ziziou91 commented Oct 28, 2024 •

edited

Loading

Ziziou91 commented Nov 8, 2024 •

edited

Loading