Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DFPL 1609 / DFPL-1730 New Upload Document Notification- Cafcass England & Cyrmu #4774

Merged
merged 61 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f90167d
new managedDoc handler for sending document uploaded noti
chak-shing-lo-justice Aug 8, 2023
cba1a89
remove unused comment
chak-shing-lo-justice Aug 8, 2023
e0ffe38
update comment
chak-shing-lo-justice Aug 8, 2023
a0258d0
update comment
chak-shing-lo-justice Aug 8, 2023
ce330b7
update comment and default config
chak-shing-lo-justice Aug 8, 2023
518effc
update comment
chak-shing-lo-justice Aug 8, 2023
2844ccf
update interface NotifyDocumentUploaded
chak-shing-lo-justice Aug 8, 2023
73a4261
update publish event
chak-shing-lo-justice Aug 8, 2023
3c83c27
ObjectHelperTest
chak-shing-lo-justice Aug 9, 2023
d5409e8
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 11, 2023
3a30a19
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 14, 2023
f97e8b0
fix getting new document uploaded
chak-shing-lo-justice Aug 14, 2023
e322219
skip sonarqube for testing
chak-shing-lo-justice Aug 14, 2023
a30c931
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 17, 2023
f42299c
revert sonarqube
chak-shing-lo-justice Aug 17, 2023
05334d2
update notification logic
chak-shing-lo-justice Aug 17, 2023
36560f3
fix after resolving conflict
chak-shing-lo-justice Aug 17, 2023
25b5d47
update handler unit test
chak-shing-lo-justice Aug 21, 2023
17045c0
update document uploaded unit test
chak-shing-lo-justice Aug 21, 2023
f715b39
fix send by post sending hearing document
chak-shing-lo-justice Aug 22, 2023
48c664a
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 22, 2023
f8ce4f7
update handler unit test
chak-shing-lo-justice Aug 22, 2023
a6f0c48
fix code check and unit test
chak-shing-lo-justice Aug 22, 2023
a4ff5a4
update translation
chak-shing-lo-justice Aug 23, 2023
83b0705
fix bug
chak-shing-lo-justice Aug 23, 2023
95ddc4a
controller unit test
chak-shing-lo-justice Aug 23, 2023
6c3319c
update cafcass noti logic
chak-shing-lo-justice Aug 23, 2023
f11bedf
update cafcass category list
chak-shing-lo-justice Aug 23, 2023
62da755
backward compatible cafcass email provider
chak-shing-lo-justice Aug 23, 2023
f41ba62
fix cafcass doc description
chak-shing-lo-justice Aug 23, 2023
80cbd8a
update cafcass mapping
chak-shing-lo-justice Aug 24, 2023
b055206
add log for future debugging
chak-shing-lo-justice Aug 24, 2023
9038f94
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 29, 2023
40d662a
update translation
chak-shing-lo-justice Aug 29, 2023
1bca23c
fix code check
chak-shing-lo-justice Aug 29, 2023
56d4a38
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 29, 2023
2ff8fdc
fix comment
chak-shing-lo-justice Aug 30, 2023
d5be137
fix check style
chak-shing-lo-justice Aug 30, 2023
40c4f79
Merge branch 'DFPL-1464' into DFPL-1609
chak-shing-lo-justice Aug 30, 2023
0b45987
update test
chak-shing-lo-justice Aug 30, 2023
730e552
rollback toList
chak-shing-lo-justice Aug 30, 2023
0395efc
remove extra line
chak-shing-lo-justice Aug 30, 2023
b1ab719
remove temporary skip logic
chak-shing-lo-justice Aug 30, 2023
e6f8739
remove temporary skip logic in unit test
chak-shing-lo-justice Aug 30, 2023
d0cd924
fix code style check
chak-shing-lo-justice Aug 30, 2023
c820d53
update cafcass noti mapping
chak-shing-lo-justice Aug 30, 2023
e1d682f
Merge remote-tracking branch 'origin/DFPL-1464' into DFPL-1609
chak-shing-lo-justice Sep 4, 2023
ca5e9cd
Merge branch 'DFPL-1464' into DFPL-1609
Sep 6, 2023
7c89d50
Merge branch 'DFPL-1464' into DFPL-1609
Sep 12, 2023
5df13fb
Update dependency @babel/core to v7.23.2 (#4769)
renovate[bot] Oct 17, 2023
3d47ea7
Update dependency codeceptjs to v3.5.6 (#4771)
renovate[bot] Oct 17, 2023
41f247e
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jod…
renovate[bot] Oct 17, 2023
13cac8b
fix not notifying Cafcass welsh
chak-shing-lo-justice Oct 17, 2023
25a8519
Merge branch 'master' into DFPL-1609
chak-shing-lo-justice Oct 17, 2023
5f198e3
Merge remote-tracking branch 'origin/DFPL-CFVv2' into DFPL-1609
chak-shing-lo-justice Oct 17, 2023
f8a8410
fix not notifying cafcass welsh
chak-shing-lo-justice Oct 17, 2023
f5b265e
Merge branch 'DFPL-1609' of https://github.com/hmcts/fpl-ccd-configur…
chak-shing-lo-justice Oct 17, 2023
1e52293
revert changes after merge
chak-shing-lo-justice Oct 17, 2023
b4dd336
revert changes after merge
chak-shing-lo-justice Oct 17, 2023
85a0266
revert changes after merge
chak-shing-lo-justice Oct 17, 2023
b5c9cc2
revert changes after merge
chak-shing-lo-justice Oct 17, 2023
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
Prev Previous commit
Next Next commit
add log for future debugging
  • Loading branch information
chak-shing-lo-justice committed Aug 24, 2023
commit b05520623308f84ce8620292415943b858adeee5
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public class ManageDocumentsUploadedEventHandler {
private static final String LIST = "•";
public static final String FURTHER_DOCUMENTS_FOR_MAIN_APPLICATION = "Further documents for main application";
public static final String CORRESPONDENCE = "Correspondence";
public static final String ADDITIONAL_APPLICATIONS = "additional applications"; //TODO TBC obsolete in new flow?

/**
* Base on the confidential level configuration, send notification to the given recipient.
Expand Down Expand Up @@ -187,6 +186,8 @@ public void sendDocumentsToCafcass(final ManageDocumentsUploadedEvent event) {
.build());
});
}
} else {
log.info("Not notifying Cafcass england");
}
}

Expand Down Expand Up @@ -217,28 +218,59 @@ public void notifyTranslationTeam(final ManageDocumentsUploadedEvent event) {
new HashMap<>();

// designated LA
resultMap.put(furtherEvidenceNotificationService.getDesignatedLocalAuthorityRecipientsOnly(caseData),
DocumentUploadedNotificationConfiguration::getSendToDesignatedLA);
Set<String> designatedLA = furtherEvidenceNotificationService
.getDesignatedLocalAuthorityRecipientsOnly(caseData);
if (designatedLA.isEmpty()) {
log.info("No recipient found for designated LA");
} else {
resultMap.put(designatedLA,
DocumentUploadedNotificationConfiguration::getSendToDesignatedLA);
}

// secondary LA
resultMap.put(furtherEvidenceNotificationService.getSecondaryLocalAuthorityRecipientsOnly(caseData),
DocumentUploadedNotificationConfiguration::getSendToSecondaryLA);
Set<String> secondaryLA = furtherEvidenceNotificationService.getSecondaryLocalAuthorityRecipientsOnly(caseData);
if (secondaryLA.isEmpty()) {
log.info("No recipient found for secondary LA");
} else {
resultMap.put(secondaryLA,
DocumentUploadedNotificationConfiguration::getSendToSecondaryLA);
}

// legal representative
resultMap.put(furtherEvidenceNotificationService.getLegalRepresentativeOnly(caseData),
DocumentUploadedNotificationConfiguration::getSendToLegalRepresentative);
Set<String> legalRepresentative = furtherEvidenceNotificationService.getLegalRepresentativeOnly(caseData);
if (legalRepresentative.isEmpty()) {
log.info("No recipient found for legal representative");
} else {
resultMap.put(legalRepresentative,
DocumentUploadedNotificationConfiguration::getSendToLegalRepresentative);
}

// cafcass representative
resultMap.put(furtherEvidenceNotificationService.getCafcassRepresentativeEmails(caseData),
DocumentUploadedNotificationConfiguration::getSendToCafcassRepresentative);
Set<String> cafcassRepresentative = furtherEvidenceNotificationService.getCafcassRepresentativeEmails(caseData);
if (cafcassRepresentative.isEmpty()) {
log.info("No recipient found for cafcass representative");
} else {
resultMap.put(cafcassRepresentative,
DocumentUploadedNotificationConfiguration::getSendToCafcassRepresentative);
}

// respondent solicitor
resultMap.put(furtherEvidenceNotificationService.getRespondentSolicitorEmails(caseData),
DocumentUploadedNotificationConfiguration::getSendToRespondentSolicitor);
Set<String> respondentSolicitor = furtherEvidenceNotificationService.getRespondentSolicitorEmails(caseData);
if (respondentSolicitor.isEmpty()) {
log.info("No recipient found for respondent solicitor");
} else {
resultMap.put(respondentSolicitor,
DocumentUploadedNotificationConfiguration::getSendToRespondentSolicitor);
}

// child solicitor
resultMap.put(furtherEvidenceNotificationService.getChildSolicitorEmails(caseData),
DocumentUploadedNotificationConfiguration::getSendToChildSolicitor);
Set<String> childSolicitor = furtherEvidenceNotificationService.getChildSolicitorEmails(caseData);
if (childSolicitor.isEmpty()) {
log.info("No recipient found for child solicitor");
} else {
resultMap.put(childSolicitor,
DocumentUploadedNotificationConfiguration::getSendToChildSolicitor);
}

return resultMap;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,17 @@ public ManageDocumentsUploadedEvent buildManageDocumentsUploadedEvent(CaseData c
}
}


if (log.isInfoEnabled()) {
log.info("New non-confidential document found: {}", newDocuments.entrySet().stream()
.map(entry -> entry.getKey().toString() + " " + entry.getValue().size())
.collect(Collectors.joining(", ")));
log.info("New confidential document found: {}", newDocumentsLA.entrySet().stream()
.map(entry -> entry.getKey().toString() + " " + entry.getValue().size())
.collect(Collectors.joining(", ")));
log.info("New confidential (CTSC) document found: {}", newDocumentsCTSC.entrySet().stream()
.map(entry -> entry.getKey().toString() + " " + entry.getValue().size())
.collect(Collectors.joining(", ")));
}

return ManageDocumentsUploadedEvent.builder()
.caseData(caseData)
Expand Down