CIV-14056 Send Respondent notify when Judge Uncloaks

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/notification/JudicialDecisionRespondentNotificationHandler.java

@@ -44,7 +44,6 @@ public List<CaseEvent> handledEvents() {
 
     private CallbackResponse judicialDecisionNotification(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
-
         try {
             caseData = judicialNotificationService.sendNotification(caseData, SOLICITOR_TYPE);
         } catch (NotificationException notificationException) {

src/main/java/uk/gov/hmcts/reform/civil/launchdarkly/FeatureToggleService.java

@@ -32,7 +32,7 @@ public boolean isFeatureEnabled(String feature, LDUser user) {
     }
 
     public boolean isGaForLipsEnabled() {
-        return internalClient.boolVariation("GaForLips", createLDUser().build(), false);
+        return internalClient.boolVariation("GaForLips", createLDUser().build(), true);
     }
 
     public boolean isOrganisationOnboarded(String orgId) {

src/main/java/uk/gov/hmcts/reform/civil/service/GaForLipService.java

@@ -1,6 +1,8 @@
 package uk.gov.hmcts.reform.civil.service;
 
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.civil.launchdarkly.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.model.CaseData;
@@ -13,6 +15,7 @@
 @Service
 public class GaForLipService {
 
+    private static final Logger log = LoggerFactory.getLogger(GaForLipService.class);
     private final FeatureToggleService featureToggleService;
 
     public boolean isGaForLip(CaseData caseData) {
@@ -32,6 +35,12 @@ public boolean isLipApp(CaseData caseData) {
     }
 
     public boolean isLipResp(CaseData caseData) {
+
+        log.info(" ****************************************************************** ");
+        log.info("-----feature Toggle caseData: {}", featureToggleService.isGaForLipsEnabled());
+        log.info("---------isGaRespondentOneLip nonnull: {}", Objects.nonNull(caseData.getIsGaRespondentOneLip()));
+        log.info("-------isGaRespondentOneLip: {}", caseData.getIsGaRespondentOneLip());
+        log.info(" ****************************************************************** ");
         return featureToggleService.isGaForLipsEnabled()
                 && Objects.nonNull(caseData.getIsGaRespondentOneLip())
                 && caseData.getIsGaRespondentOneLip().equals(YES);

src/main/java/uk/gov/hmcts/reform/civil/service/JudicialNotificationService.java

@@ -1,13 +1,16 @@
 package uk.gov.hmcts.reform.civil.service;
 
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.civil.config.properties.notification.NotificationsProperties;
 import uk.gov.hmcts.reform.civil.enums.CaseState;
 import uk.gov.hmcts.reform.civil.handler.callback.camunda.notification.NotificationData;
 import uk.gov.hmcts.reform.civil.handler.callback.user.JudicialFinalDecisionHandler;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.helpers.DateFormatHelper;
+import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.genapplication.GAJudicialRequestMoreInfo;
 
@@ -35,6 +38,7 @@ public class JudicialNotificationService implements NotificationData {
 
     private static final String RESPONDENT = "respondent";
     private static final String APPLICANT = "applicant";
+    private static final Logger log = LoggerFactory.getLogger(JudicialNotificationService.class);
 
     private final NotificationsProperties notificationProperties;
     private final NotificationService notificationService;
@@ -107,16 +111,31 @@ public Map<String, String> addProperties(CaseData caseData) {
             GA_APPLICATION_TYPE,
             Objects.requireNonNull(requiredGAType(caseData))
         );
+
+        if (gaForLipService.isGaForLip(caseData)) {
+            String caseTitle = JudicialFinalDecisionHandler.getAllPartyNames(caseData);
+            customProps.put(
+                CASE_TITLE,
+                Objects.requireNonNull(caseTitle)
+            );
+        }
         if (gaForLipService.isLipApp(caseData)) {
             String isLipAppName = caseData.getApplicantPartyName();
             customProps.put(
                     GA_LIP_RESP_NAME,
                     Objects.requireNonNull(isLipAppName)
             );
-            String caseTitle = JudicialFinalDecisionHandler.getAllPartyNames(caseData);
+
+        } else if (gaForLipService.isLipResp(caseData)
+            && isRespondentNotificationMakeDecisionEvent(caseData)) {
+
+            String isLipRespondentName = caseData
+                .getGeneralAppRespondentSolicitors().get(0).getValue().getForename()
+                + " " + caseData
+                .getGeneralAppRespondentSolicitors().get(0).getValue().getSurname().orElse("");
             customProps.put(
-                    CASE_TITLE,
-                    Objects.requireNonNull(caseTitle)
+                GA_LIP_RESP_NAME,
+                Objects.requireNonNull(isLipRespondentName)
             );
         } else {
             customProps.remove(GA_LIP_RESP_NAME);
@@ -128,6 +147,8 @@ public Map<String, String> addProperties(CaseData caseData) {
     private void sendNotificationForJudicialDecision(CaseData caseData, String recipient, String template)
         throws NotificationException {
         try {
+            log.info("JudicialNotificationService.class::sendNotificationForJudicialDecision::templateId: {}",
+                     template);
             notificationService.sendMail(recipient, template, addProperties(caseData),
                                          String.format(REFERENCE_TEMPLATE,
                                                        caseData.getGeneralAppParentCaseLink().getCaseReference()));
@@ -222,9 +243,13 @@ private CaseData applicationRequestForInformation(CaseData caseData, String soli
                     .formatLocalDateTime(requestForInformationDeadline, DATE) : null);
 
             if (areRespondentSolicitorsPresent(caseData)) {
+                String template = notificationProperties.getGeneralApplicationRespondentEmailTemplate();
+                if (gaForLipService.isLipResp(caseData)) {
+                    template = notificationProperties.getLipGeneralAppRespondentEmailTemplate();
+                }
                 sendEmailToRespondent(
                     caseData,
-                    notificationProperties.getGeneralApplicationRespondentEmailTemplate()
+                    template
                 );
             }
             customProps.remove(GA_NOTIFICATION_DEADLINE);
@@ -309,6 +334,11 @@ private void applicationApprovedNotification(CaseData caseData, String solicitor
                         caseData,
                         notificationProperties.getJudgeApproveOrderToStrikeOutOCMC()
                     );
+                } else if (useGaForLipTemplate(caseData)) {
+                    sendEmailToRespondent(
+                        caseData,
+                        notificationProperties.getLipGeneralAppRespondentEmailTemplate()
+                    );
                 } else {
                     sendEmailToRespondent(
                         caseData,
@@ -376,9 +406,13 @@ private void applicationDismissedByJudge(CaseData caseData, String solicitorType
 
         if (solicitorType.equals(RESPONDENT)
             && isSendEmailToDefendant(caseData)) {
+            String template  = notificationProperties.getJudgeDismissesOrderRespondentEmailTemplate();
+            if (gaForLipService.isLipResp(caseData)) {
+                template = notificationProperties.getLipGeneralAppRespondentEmailTemplate();
+            }
             sendEmailToRespondent(
                     caseData,
-                    notificationProperties.getJudgeDismissesOrderRespondentEmailTemplate()
+                    template
             );
         }
 
@@ -396,9 +430,13 @@ && isSendEmailToDefendant(caseData)) {
     private void applicationDirectionOrder(CaseData caseData, String solicitorType) {
         if (solicitorType.equals(RESPONDENT)
             && isSendEmailToDefendant(caseData)) {
+            String template = notificationProperties.getJudgeForDirectionOrderRespondentEmailTemplate();
+            if (gaForLipService.isLipResp(caseData)) {
+                template = notificationProperties.getLipGeneralAppRespondentEmailTemplate();
+            }
             sendEmailToRespondent(
                     caseData,
-                    notificationProperties.getJudgeForDirectionOrderRespondentEmailTemplate()
+                    template
             );
         }
 
@@ -515,4 +553,20 @@ public static boolean useOcmcTemplate(CaseData caseData) {
             && caseData.getGeneralAppSuperClaimType().equals("SPEC_CLAIM");
     }
 
+    public boolean useGaForLipTemplate(CaseData caseData) {
+        return gaForLipService.isLipResp(caseData);
+    }
+
+    private static boolean isRespondentNotificationMakeDecisionEvent(CaseData caseData) {
+        var judicialDecision = Optional.ofNullable(caseData.getBusinessProcess())
+            .map(BusinessProcess::getCamundaEvent).orElse(null);
+        // Case Event should be START_RESPONDENT_NOTIFICATION_PROCESS_MAKE_DECISION
+        return
+            Objects.nonNull(judicialDecision)
+                && caseData.getBusinessProcess().getCamundaEvent()
+                .equals("MAKE_DECISION")
+                && caseData.getBusinessProcess().getActivityId()
+                .equals("StartRespondentNotificationProcessMakeDecision");
+    }
+
 }