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.

Sign up for GitHub

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

DFR-3565 Email template with env links #2126

Merged
merged 15 commits into from
Feb 12, 2025
Merged

DFR-3565 Email template with env links #2126

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ab217a8
Set a new template id for the affected template.
Feb 4, 2025
f1d1490
TEST
Feb 4, 2025
e1f8f51
Bumping chart version/ fixing aliases
hmcts-jenkins-d-to-i[bot] Feb 4, 2025
c30b643
dot
Feb 5, 2025
b9b50f4
TEST
Feb 5, 2025
9324888
Revert "TEST"
Feb 5, 2025
8c2b873
UPDATE
Feb 5, 2025
445677f
Fix test case
Feb 5, 2025
a85cf39
add debug message
Feb 5, 2025
61b9f01
update template id
Feb 5, 2025
56c04a6
Remove debug message and add a test case.
Feb 5, 2025
da49936
Merge branch 'master' into DFR-3565-email_template_with_env_links
so99y Feb 6, 2025
32241af
Merge branch 'master' into DFR-3565-email_template_with_env_links
so99y Feb 11, 2025
bffdc55
Merge branch 'master' into DFR-3565-email_template_with_env_links
so99y Feb 12, 2025
7ec4598
Merge branch 'master' into DFR-3565-email_template_with_env_links
so99y Feb 12, 2025
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
2 changes: 1 addition & 1 deletion charts/finrem-cos/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: finrem-cos
apiVersion: v2
home: https://github.com/hmcts/finrem-case-orchestration-service
version: 0.2.35
version: 0.2.36
description: Financial Remedy Case Orchestration Service
maintainers:
- name: HMCTS Financial Remedy Team
Expand Down
1 change: 1 addition & 0 deletions charts/finrem-cos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ java:
PAYMENT_API_URL: "http://payment-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
FEES_API_URL: "http://fees-register-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
CASE_DOCUMENT_AM_URL: "http://ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
MANAGE_CASE_UI_BASE_URL: "https://manage-case.platform.hmcts.net"
autoscaling:
enabled: true
maxReplicas: 4
Expand Down
5 changes: 5 additions & 0 deletions ...java/uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class EmailService {
@Value("#{${uk.gov.notify.email.contestedContactEmails}}")
private Map<String, Map<String, String>> contestedContactEmails;

@Value("${finrem.manageCase.baseurl}")
private String manageCaseBaseUrl;

public static final String CONTESTED = "contested";
public static final String CONSENTED = "consented";
private static final String FR_ASSIGNED_TO_JUDGE = "FR_ASSIGNED_TO_JUDGE";
Expand All @@ -56,6 +59,7 @@ public class EmailService {
public static final String INTERVENER_SOLICITOR_REMOVED_EMAIL = "FR_INTERVENER_SOLICITOR_REMOVED_EMAIL";
private static final String PHONE_OPENING_HOURS = "phoneOpeningHours";
private static final String HEARING_DATE = "hearingDate";
private static final String MANAGE_CASE_BASE_URL = "manageCaseBaseUrl";

public void sendConfirmationEmail(NotificationRequest notificationRequest, EmailTemplateNames template) {
Map<String, Object> templateVars = buildTemplateVars(notificationRequest, template.name());
Expand Down Expand Up @@ -129,6 +133,7 @@ protected Map<String, Object> buildTemplateVars(NotificationRequest notification
if (EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE.name().equals(templateName)
|| EmailTemplateNames.FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_ADMIN.name().equals(templateName)) {
templateVars.put(HEARING_DATE, notificationRequest.getHearingDate());
templateVars.put(MANAGE_CASE_BASE_URL, manageCaseBaseUrl);
}

setIntervenerSolicitorDetails(notificationRequest, templateName, templateVars);
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ finrem.system_update.username=${FINREM_SYSTEMUPDATE_USERNAME:DUMMY_USERNAME}
finrem.system_update.password=${FINREM_SYSTEMUPDATE_PASSWORD:DUMMY_PASSWORD}
# Defaults
finrem.default.assignedToJudgeDefault=${ASSIGNED_TO_JUDGE_DEFAULT_EMAIL:[email protected]}
finrem.manageCase.baseurl=${MANAGE_CASE_UI_BASE_URL:http://localhost:3000}
# Document
document.miniFormTemplate=FL-FRM-APP-ENG-00002.docx
document.miniFormHighCourtTemplate=FL-FRM-APP-ENG-HC-00002.docx
Expand Down Expand Up @@ -280,8 +281,8 @@ uk.gov.notify.email.templates=${UK_GOV_NOTIFY_EMAIL_TEMPLATES:\
FR_CONTEST_ORDER_APPROVED_INTERVENER4: '6b8a1403-633d-42cb-aa25-8a0461f66a32',\
FR_CONTESTED_APPLICATION_ISSUED: '31fb1add-9940-4741-b7cb-64128925e007',\
FR_CONTESTED_DRAFT_ORDER: 'a1239231-d620-4390-b72c-cd36cda9b89d',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE: '58fcc16f-063f-49b6-9616-c0f04131e6bb',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_ADMIN: 'b4c97731-038a-46b9-abda-2bfbcb2c9d42',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE: '25098d20-b939-43a9-9915-2b4c03c6dec8',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_ADMIN: '3b00714e-aee6-40eb-99c9-382f139b054c',\
FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE: '76808593-47f4-4c2f-995f-5b6c167cf12a',\
FR_CONTESTED_PREPARE_FOR_HEARING: 'f1ee98aa-c6fe-4226-a309-d75e4dd0f8dd',\
FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: '5166e828-2226-49d1-91b7-7407c682ff86',\
Expand Down
5 changes: 5 additions & 0 deletions .../uk/gov/hmcts/reform/finrem/caseorchestration/notifications/service/EmailServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public class EmailServiceTest {
@Autowired
private EmailService emailService;

@Value("${finrem.manageCase.baseurl}")
private String manageCaseBaseUrl;

@Value("#{${uk.gov.notify.email.templates}}")
private Map<String, String> emailTemplates;

Expand Down Expand Up @@ -678,6 +681,7 @@ public void givenJudgeReadyToReviewTemplate_whenPopulateTemplateVars_thenAddHear
assertEquals("1 January 2024", returnedTemplateVars.get("hearingDate"));
assertEquals(APPLICANT_NAME, returnedTemplateVars.get("applicantName"));
assertEquals(RESPONDENT_NAME, returnedTemplateVars.get("respondentName"));
assertEquals("http://localhost:3000", returnedTemplateVars.get("manageCaseBaseUrl"));
}

@Test
Expand All @@ -694,6 +698,7 @@ public void givenAdminReadyToReviewTemplate_whenPopulateTemplateVars_thenAddHear
assertEquals("1 January 2024", returnedTemplateVars.get("hearingDate"));
assertEquals(APPLICANT_NAME, returnedTemplateVars.get("applicantName"));
assertEquals(RESPONDENT_NAME, returnedTemplateVars.get("respondentName"));
assertEquals("http://localhost:3000", returnedTemplateVars.get("manageCaseBaseUrl"));
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ finrem.system_update.password=${FINREM_SYSTEMUPDATE_PASSWORD:DUMMY_PASSWORD}
finrem.notification.ctscEmail=${CTSC_EMAIL:[email protected]}
# Defaults
finrem.default.assignedToJudgeDefault=${ASSIGNED_TO_JUDGE_DEFAULT_EMAIL:[email protected]}
finrem.manageCase.baseurl=${MANAGE_CASE_UI_BASE_URL:http://localhost:3000}
# Document
document.miniFormTemplate=FL-FRM-APP-ENG-00002.docx
document.miniFormHighCourtTemplate=FL-FRM-APP-ENG-HC-00002.docx
Expand Down Expand Up @@ -212,8 +213,8 @@ uk.gov.notify.email.templates=${UK_GOV_NOTIFY_EMAIL_TEMPLATES:\
FR_CONTEST_ORDER_APPROVED_INTERVENER4: '6b8a1403-633d-42cb-aa25-8a0461f66a32',\
FR_CONTESTED_APPLICATION_ISSUED: '31fb1add-9940-4741-b7cb-64128925e007',\
FR_CONTESTED_DRAFT_ORDER: 'a1239231-d620-4390-b72c-cd36cda9b89d',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE: '58fcc16f-063f-49b6-9616-c0f04131e6bb',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_ADMIN: 'b4c97731-038a-46b9-abda-2bfbcb2c9d42',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_JUDGE: '25098d20-b939-43a9-9915-2b4c03c6dec8',\
FR_CONTESTED_DRAFT_ORDER_READY_FOR_REVIEW_ADMIN: '3b00714e-aee6-40eb-99c9-382f139b054c',\
FR_CONTESTED_DRAFT_ORDER_REVIEW_OVERDUE: '76808593-47f4-4c2f-995f-5b6c167cf12a',\
FR_CONTESTED_PREPARE_FOR_HEARING: 'f1ee98aa-c6fe-4226-a309-d75e4dd0f8dd',\
FR_CONTESTED_PREPARE_FOR_HEARING_ORDER_SENT: '5166e828-2226-49d1-91b7-7407c682ff86',\
Expand Down