SSCSSI-443: Remove feature toggle BYPASS_NOTIFICATIONS_SERVICE (#4292)

* SSCSSI-443: Remove feature toggle BYPASS_NOTIFICATIONS_SERVICE * Update values.preview.template.yaml * Update application.yaml --------- Co-authored-by: sanjayparekh-hmcts <36845702+sanjayparekh-hmcts@users.noreply.github.com>
hmcts · Jan 22, 2025 · 3901b05 · 3901b05
1 parent 9d4a304
commit 3901b05
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 19 deletions.
diff --git a/charts/sscs-tribunals-api/values.aat.template.yaml b/charts/sscs-tribunals-api/values.aat.template.yaml
@@ -9,5 +9,4 @@ java:
     TESTING_SUPPORT_ENABLED: true
     POST_HEARINGS_B_FEATURE: true
     POST_HEARINGS_FEATURE: true
-    BYPASS_NOTIFICATIONS_SERVICE: true
     INFECTED_BLOOD_COMPENSATION_ENABLED: true
diff --git a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml
@@ -39,7 +39,6 @@ java:
     ELASTIC_SEARCH_FEATURE: true
     ELINKS_V2_FEATURE_ENABLED: true
     DELETED_REDACTED_DOC_ENABLED: true
-    BYPASS_NOTIFICATIONS_SERVICE: true
     TESTING_SUPPORT_ENABLED: true
     SEND_LETTER_SERVICE_ENABLED: "true"
     SEND_LETTER_SERVICE_BASEURL: "http://rpe-send-letter-service-aat.service.core-compute-aat.internal"

diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml
@@ -37,7 +37,6 @@ java:
     ELASTIC_SEARCH_FEATURE: true
     ELINKS_V2_FEATURE_ENABLED: true
     DELETED_REDACTED_DOC_ENABLED: true
-    BYPASS_NOTIFICATIONS_SERVICE: true
     TESTING_SUPPORT_ENABLED: true
     EXUI_API_URL: "https://${SERVICE_NAME}-xui"
     TOPIC_NAME: "${SERVICE_NAME}-servicebus-main-topic"

diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/service/servicebus/TopicConsumer.java b/src/main/java/uk/gov/hmcts/reform/sscs/service/servicebus/TopicConsumer.java
@@ -28,18 +28,15 @@ public class TopicConsumer {
     private final CallbackDispatcher<SscsCaseData> dispatcher;
     private final SscsCaseCallbackDeserializer sscsDeserializer;
     private final NotificationsMessageProcessor notificationsMessageProcessor;
-    private final boolean isNotificationServiceBypassed;
 
     public TopicConsumer(@Value("${callback.maxRetryAttempts}") Integer maxRetryAttempts,
                          CallbackDispatcher<SscsCaseData> dispatcher,
-                         SscsCaseCallbackDeserializer sscsDeserializer, NotificationsMessageProcessor notificationsMessageProcessor,
-                         @Value("${feature.bypass-notifications-service.enabled:false}") boolean isNotificationServiceBypassed) {
+                         SscsCaseCallbackDeserializer sscsDeserializer, NotificationsMessageProcessor notificationsMessageProcessor) {
         this.maxRetryAttempts = maxRetryAttempts;
         //noinspection unchecked
         this.dispatcher = dispatcher;
         this.sscsDeserializer = sscsDeserializer;
         this.notificationsMessageProcessor = notificationsMessageProcessor;
-        this.isNotificationServiceBypassed = isNotificationServiceBypassed;
     }
 
 
@@ -52,12 +49,7 @@ public TopicConsumer(@Value("${callback.maxRetryAttempts}") Integer maxRetryAtte
     public void onMessage(String message, @Header(JmsHeaders.MESSAGE_ID) String messageId) {
         log.info("Message Id {} received from the service bus", messageId);
         processEvidenceShareMessageWithRetry(message, 1, messageId);
-
-        log.info("Determining if notification service should be bypassed {} ", isNotificationServiceBypassed ? "Yes" : "No");
-        if (isNotificationServiceBypassed) {
-            log.info("Bypassing notification service for message id {}", messageId);
-            notificationsMessageProcessor.processMessage(message, messageId);
-        }
+        notificationsMessageProcessor.processMessage(message, messageId);
     }
 
     private void processEvidenceShareMessageWithRetry(String message, int retry, String messageId) {

diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml
@@ -279,8 +279,6 @@ feature:
         enabled: ${SCOTTISH_PO_BOX_ENABLED:false}
     urgent-hearing:
         enabled: ${URGENT_HEARING_ENABLED:false}
-    bypass-notifications-service:
-        enabled: ${BYPASS_NOTIFICATIONS_SERVICE:false}
     hearings-case-updateV2:
         enabled: ${HEARINGS_CASE_UPDATE_V2_ENABLED:false}
 
@@ -2019,14 +2017,12 @@ spring:
             accept-case-insensitive-enums: true
             accept-case-insensitive-properties: true
 job.scheduler:
-    autoStart: ${BYPASS_NOTIFICATIONS_SERVICE:false}
     retryPolicy:
         maxNumberOfJobExecutions: 2
         delayBetweenAttemptsInMs: 1000
     quartzProperties:
         org.quartz:
             scheduler:
-                autoStartup: ${BYPASS_NOTIFICATIONS_SERVICE:false}
                 instanceId: AUTO
                 idleWaitTime: ${JOB_SCHEDULER_POLL_INTERVAL:10000}
             dataSource:

diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/service/servicebus/TopicConsumerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/service/servicebus/TopicConsumerTest.java
@@ -42,7 +42,7 @@ public class TopicConsumerTest {
 
     @Before
     public void setup() {
-        topicConsumer = new TopicConsumer(RETRY_THREE_TIMES, dispatcher, deserializer, notificationsMessageProcessor, false);
+        topicConsumer = new TopicConsumer(RETRY_THREE_TIMES, dispatcher, deserializer, notificationsMessageProcessor);
     }
 
     @Test
@@ -134,7 +134,7 @@ public void handleValidRequest() {
 
     @Test
     public void shouldProcessMessageForNotifications() {
-        topicConsumer = new TopicConsumer(RETRY_THREE_TIMES, dispatcher, deserializer, notificationsMessageProcessor, true);
+        topicConsumer = new TopicConsumer(RETRY_THREE_TIMES, dispatcher, deserializer, notificationsMessageProcessor);
         topicConsumer.onMessage(MESSAGE, "1");
         verify(notificationsMessageProcessor).processMessage(MESSAGE, "1");
     }