CIV-0000 fix bilingualHint behind feature toggle (#1536)

hmcts · Oct 21, 2024 · 141fed3 · 141fed3
1 parent 3eca14c
commit 141fed3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/JudicialDecisionHandler.java b/src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/JudicialDecisionHandler.java
@@ -19,6 +19,7 @@
 import uk.gov.hmcts.reform.civil.enums.dq.GAHearingSupportRequirements;
 import uk.gov.hmcts.reform.civil.enums.dq.GeneralApplicationTypes;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
+import uk.gov.hmcts.reform.civil.launchdarkly.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.LocationRefData;
@@ -243,6 +244,7 @@ public class JudicialDecisionHandler extends CallbackHandler {
     private final GaForLipService gaForLipService;
     private final CaseDetailsConverter caseDetailsConverter;
     private final CoreCaseDataService coreCaseDataService;
+    private final FeatureToggleService featureToggleService;
 
     @Override
     protected Map<String, Callback> callbacks() {
@@ -696,7 +698,9 @@ private CallbackResponse gaValidateMakeAnOrder(CallbackParams callbackParams) {
                         .sequentialApplicantMustRespondWithin(deadlinesCalculator
                                                                   .getJudicialOrderDeadlineDate(LocalDateTime.now(),
                                                                                                 21)).build());
-        caseDataBuilder.bilingualHint(setBilingualHint(caseData));
+        if (featureToggleService.isGaForLipsEnabled()) {
+            caseDataBuilder.bilingualHint(setBilingualHint(caseData));
+        }
         return AboutToStartOrSubmitCallbackResponse.builder()
                 .data(caseDataBuilder.build().toMap(objectMapper))
                 .errors(errors)
@@ -893,7 +897,9 @@ private CallbackResponse setJudgeBusinessProcess(CallbackParams callbackParams)
                                                    .judgeHearingSupportReqText1(null)
                                                    .build());
         }
-        dataBuilder.bilingualHint(null);
+        if (featureToggleService.isGaForLipsEnabled()) {
+            dataBuilder.bilingualHint(null);
+        }
         return AboutToStartOrSubmitCallbackResponse.builder()
                 .data(dataBuilder.build().toMap(objectMapper))
                 .build();

diff --git a/...in/java/uk/gov/hmcts/reform/civil/handler/callback/user/JudicialFinalDecisionHandler.java b/...in/java/uk/gov/hmcts/reform/civil/handler/callback/user/JudicialFinalDecisionHandler.java
@@ -13,6 +13,7 @@
 import uk.gov.hmcts.reform.civil.callback.CaseEvent;
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
+import uk.gov.hmcts.reform.civil.launchdarkly.FeatureToggleService;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.LocationRefData;
@@ -100,6 +101,7 @@ public class JudicialFinalDecisionHandler extends CallbackHandler {
     private final GaForLipService gaForLipService;
     private final CaseDetailsConverter caseDetailsConverter;
     private final CoreCaseDataService coreCaseDataService;
+    private final FeatureToggleService featureToggleService;
 
     @Override
     protected Map<String, Callback> callbacks() {
@@ -170,7 +172,9 @@ private CallbackResponse setCaseName(CallbackParams callbackParams) {
         CaseData civilCaseData = caseDetailsConverter
             .toCaseData(coreCaseDataService
                             .getCase(Long.parseLong(caseData.getGeneralAppParentCaseLink().getCaseReference())));
-        caseDataBuilder.bilingualHint(gaForLipService.anyWelshNotice(civilCaseData, caseData) ? YES : NO);
+        if (featureToggleService.isGaForLipsEnabled()) {
+            caseDataBuilder.bilingualHint(gaForLipService.anyWelshNotice(civilCaseData, caseData) ? YES : NO);
+        }
         return AboutToStartOrSubmitCallbackResponse.builder()
                 .data(caseDataBuilder.build().toMap(objectMapper))
                 .build();
@@ -304,7 +308,9 @@ private DynamicList populateHearingLocation(CaseData caseData) {
     private CallbackResponse setFinalDecisionBusinessProcess(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
         CaseData.CaseDataBuilder caseDataBuilder = caseData.toBuilder();
-        caseDataBuilder.bilingualHint(null);
+        if (featureToggleService.isGaForLipsEnabled()) {
+            caseDataBuilder.bilingualHint(null);
+        }
         caseDataBuilder.businessProcess(BusinessProcess.ready(GENERATE_DIRECTIONS_ORDER)).build();
         return AboutToStartOrSubmitCallbackResponse.builder()
                 .data(caseDataBuilder.build().toMap(objectMapper))