From d4e927e6a300fa57a60a93ba67c17bad4f9133d9 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Mon, 14 Oct 2024 12:45:54 +0100 Subject: [PATCH 01/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- charts/sscs-tribunals-api/values.aat.template.yaml | 1 + charts/sscs-tribunals-api/values.preview.template.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/sscs-tribunals-api/values.aat.template.yaml b/charts/sscs-tribunals-api/values.aat.template.yaml index 4fee54545bc..ece201450c2 100644 --- a/charts/sscs-tribunals-api/values.aat.template.yaml +++ b/charts/sscs-tribunals-api/values.aat.template.yaml @@ -12,3 +12,4 @@ java: POST_HEARINGS_FEATURE: true BYPASS_NOTIFICATIONS_SERVICE: true INFECTED_BLOOD_APPEAL_ENABLED: true + BYPASS_HEARING_API_SERVICE: true diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 49a85022bf8..32850c3c862 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -44,6 +44,7 @@ java: CITIZEN_LOGIN_SERVICE_V2: true ADD_LINK_TO_OTHER_ASSOCIATED_CASES_V2: true BYPASS_NOTIFICATIONS_SERVICE: true + BYPASS_HEARING_API_SERVICE: true HANDLE_CCD_CALLBACKMAP_V2: true TESTING_SUPPORT_ENABLED: true TOPIC_NAME: "${SERVICE_NAME}-servicebus-main-topic" @@ -148,7 +149,7 @@ xui-webapp: SERVICES_IDAM_API_URL: https://idam-api.aat.platform.hmcts.net SERVICES_S2S: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal SERVICES_HEARINGS_COMPONENT_API: http://jurisdiction-hearings-api-aat.service.core-compute-aat.internal - SERVICES_HEARINGS_COMPONENT_API_SSCS: http://${SERVICE_NAME}-sscs-hearings-api + SERVICES_HEARINGS_COMPONENT_API_SSCS: http://${SERVICE_NAME}-java SERVICES_PRD_LOCATION_API: http://rd-location-ref-api-aat.service.core-compute-aat.internal SERVICES_PRD_JUDICIAL_API: http://rd-judicial-api-aat.service.core-compute-aat.internal SERVICES_PRD_COMMONDATA_API: http://rd-commondata-api-aat.service.core-compute-aat.internal @@ -584,7 +585,7 @@ redis: sscs-hearings-api: enabled: true java: - image: "hmctspublic.azurecr.io/sscs/hearings-api:latest" #Change to pr if required + image: "hmctspublic.azurecr.io/sscs/hearings-api:pr-646" #Change to pr if required releaseNameOverride: ${SERVICE_NAME}-sscs-hearings-api ingressHost: hearings-${SERVICE_FQDN} environment: From 2bfa290c746c1b9ed7687f0da7cfd1e2e4898ee1 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Mon, 14 Oct 2024 12:55:05 +0100 Subject: [PATCH 02/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- charts/sscs-tribunals-api/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 32850c3c862..b4e38f3c996 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -605,7 +605,7 @@ sscs-hearings-api: #Messaging HMC_HEARINGS_LISTENING_ENABLED: true HMC_HEARINGS_TOPIC_NAME: "hmc-to-cft-aat" - HMC_HEARINGS_TOPIC_SUBSCRIPTION_NAME: "hmc-to-sscs-subscription-pr-3973" + HMC_HEARINGS_TOPIC_SUBSCRIPTION_NAME: "hmc-to-sscs-subscription-pr-4056" TRIBUNALS_HEARINGS_LISTENING_ENABLED: true TRIBUNALS_EVENT_QUEUE_NAME: ${SERVICE_NAME}-servicebus-tribunals-to-hearing-api TRIBUNALS_EVENT_QUEUE_POLICY_NAME: RootManageSharedAccessKey From 3a85c6118d2dd874ad6ae8076a31e47556dff696 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Mon, 14 Oct 2024 13:55:09 +0100 Subject: [PATCH 03/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- charts/sscs-tribunals-api/values.preview.template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index b4e38f3c996..c311c3b2259 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -616,6 +616,7 @@ sscs-hearings-api: CORE_CASE_DATA_CASE_TYPE_ID: Benefit-${CHANGE_ID} HEARINGS_CASE_UPDATE_V2_ENABLED: true ADJOURNMENT_ENABLED: true + BYPASS_HEARING_API_SERVICE: true secrets: TRIBUNALS_EVENT_QUEUE_ACCESS_KEY: secretRef: sscs-sb-preview From c9c58fe9ba04a51d607bb4b02a86ad2b05bff871 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Mon, 14 Oct 2024 15:19:23 +0100 Subject: [PATCH 04/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- charts/sscs-tribunals-api/values.aat.template.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/sscs-tribunals-api/values.aat.template.yaml b/charts/sscs-tribunals-api/values.aat.template.yaml index ece201450c2..4fee54545bc 100644 --- a/charts/sscs-tribunals-api/values.aat.template.yaml +++ b/charts/sscs-tribunals-api/values.aat.template.yaml @@ -12,4 +12,3 @@ java: POST_HEARINGS_FEATURE: true BYPASS_NOTIFICATIONS_SERVICE: true INFECTED_BLOOD_APPEAL_ENABLED: true - BYPASS_HEARING_API_SERVICE: true From 646785a96f3da726308a0f3dfcd9fcc9140ca86e Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Mon, 14 Oct 2024 16:06:25 +0100 Subject: [PATCH 05/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../reform/sscs/controller/ServiceHearingsControllerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java index 813a0f988e1..0ba1927baa2 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java @@ -31,7 +31,6 @@ @SpringBootTest @AutoConfigureMockMvc(addFilters = false) @ActiveProfiles("integration") -@Disabled("Please remove this line when Hearing api bypass feature flag is true") class ServiceHearingsControllerTest { private static final long CASE_ID = 1625080769409918L; From 9b5556160c6361637dfd92ae4a4628c073e3439b Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 09:08:03 +0100 Subject: [PATCH 06/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../reform/sscs/controller/ServiceHearingsControllerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java index 0ba1927baa2..7818b2434a8 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/ServiceHearingsControllerTest.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import java.util.List; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; From dc6e8e3561c9247a20b7d541007a372d3e06856e Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 09:16:21 +0100 Subject: [PATCH 07/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- charts/sscs-tribunals-api/values.hearings.preview.template.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml index 2a78840b5b2..195be6df6a3 100644 --- a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml @@ -67,6 +67,8 @@ java: HOURS_END_TIME: 23 RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" + HMC_HEARINGS_LISTENING_ENABLED: true + TRIBUNALS_HEARINGS_LISTENING_ENABLED: true secrets: JOB_SCHEDULER_DB_PASSWORD: secretRef: postgres From 20f09ad2386e62d9b36f301712e3a12d627b1078 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 11:05:04 +0100 Subject: [PATCH 08/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../sscs/config/jms/HearingsJmsConfig.java | 67 ------------------- .../jms/TribunalsHearingsJmsConfig.java | 67 ------------------- 2 files changed, 134 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java delete mode 100644 src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java deleted file mode 100644 index 1d1fb56e2d2..00000000000 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java +++ /dev/null @@ -1,67 +0,0 @@ -package uk.gov.hmcts.reform.sscs.config.jms; - -import javax.jms.ConnectionFactory; -import javax.jms.Session; -import lombok.extern.slf4j.Slf4j; -import org.apache.qpid.jms.JmsConnectionFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.jms.config.DefaultJmsListenerContainerFactory; -import org.springframework.jms.config.JmsListenerContainerFactory; -import org.springframework.jms.connection.CachingConnectionFactory; -import org.springframework.jms.listener.DefaultMessageListenerContainer; - -@Slf4j -@Configuration -public class HearingsJmsConfig { - - public static final String AMQP_CONNECTION_STRING_TEMPLATE = "amqps://%1s?amqp.idleTimeout=%2d"; - @Value("${azure.service-bus.hmc-to-hearings-api.namespace}") - private String namespace; - - @Value("${azure.service-bus.connection-postfix}") - private String connectionPostfix; - - @Value("${azure.service-bus.hmc-to-hearings-api.username}") - private String username; - - @Value("${azure.service-bus.hmc-to-hearings-api.password}") - private String password; - - @Value("${azure.service-bus.hmc-to-hearings-api.receiveTimeout}") - private Long receiveTimeout; - - @Value("${azure.service-bus.hmc-to-hearings-api.idleTimeout}") - private Long idleTimeout; - - @Bean - @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) - public ConnectionFactory hmcHearingJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { - String connection = String.format(AMQP_CONNECTION_STRING_TEMPLATE, namespace + connectionPostfix, idleTimeout); - JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); - jmsConnectionFactory.setUsername(username); - jmsConnectionFactory.setPassword(password); - jmsConnectionFactory.setClientID(clientId); - - return new CachingConnectionFactory(jmsConnectionFactory); - } - - @Bean - @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) - public JmsListenerContainerFactory hmcHearingsEventTopicContainerFactory( - ConnectionFactory hmcHearingJmsConnectionFactory, - DefaultJmsListenerContainerFactoryConfigurer configurer) { - DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); - factory.setConnectionFactory(hmcHearingJmsConnectionFactory); - factory.setReceiveTimeout(receiveTimeout); - factory.setSubscriptionDurable(Boolean.TRUE); - factory.setSessionTransacted(Boolean.TRUE); - factory.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED); - - configurer.configure(factory, hmcHearingJmsConnectionFactory); - return factory; - } -} diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java deleted file mode 100644 index ae6ab73535c..00000000000 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java +++ /dev/null @@ -1,67 +0,0 @@ -package uk.gov.hmcts.reform.sscs.config.jms; - -import javax.jms.ConnectionFactory; -import javax.jms.Session; -import lombok.extern.slf4j.Slf4j; -import org.apache.qpid.jms.JmsConnectionFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.jms.config.DefaultJmsListenerContainerFactory; -import org.springframework.jms.config.JmsListenerContainerFactory; -import org.springframework.jms.connection.CachingConnectionFactory; -import org.springframework.jms.listener.DefaultMessageListenerContainer; -import uk.gov.hmcts.reform.sscs.config.JsonMessageConverter; - -@Slf4j -@Configuration -@ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.tribunals-to-hearings-api.enabled"}) -public class TribunalsHearingsJmsConfig { - - @Value("${azure.service-bus.tribunals-to-hearings-api.namespace}") - private String namespace; - - @Value("${azure.service-bus.connection-postfix}") - private String connectionPostfix; - - @Value("${azure.service-bus.tribunals-to-hearings-api.username}") - private String username; - - @Value("${azure.service-bus.tribunals-to-hearings-api.password}") - private String password; - - @Value("${azure.service-bus.tribunals-to-hearings-api.receiveTimeout}") - private Long receiveTimeout; - - @Value("${azure.service-bus.tribunals-to-hearings-api.idleTimeout}") - private Long idleTimeout; - - @Value("${azure.service-bus.amqp-connection-string-template:amqps://%1s?amqp.idleTimeout=%2d}") - public String amqpConnectionStringTemplate; - - @Bean - public ConnectionFactory tribunalsHearingsJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { - String connection = String.format(amqpConnectionStringTemplate, namespace + connectionPostfix, idleTimeout); - JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); - jmsConnectionFactory.setUsername(username); - jmsConnectionFactory.setPassword(password); - jmsConnectionFactory.setClientID(clientId); - return new CachingConnectionFactory(jmsConnectionFactory); - } - - @Bean - public JmsListenerContainerFactory tribunalsHearingsEventQueueContainerFactory( - ConnectionFactory tribunalsHearingsJmsConnectionFactory, - DefaultJmsListenerContainerFactoryConfigurer defaultJmsListenerContainerFactoryConfigurer) { - DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); - factory.setConnectionFactory(tribunalsHearingsJmsConnectionFactory); - factory.setReceiveTimeout(receiveTimeout); - factory.setSessionTransacted(Boolean.TRUE); - factory.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED); - factory.setMessageConverter(new JsonMessageConverter()); - defaultJmsListenerContainerFactoryConfigurer.configure(factory, tribunalsHearingsJmsConnectionFactory); - return factory; - } -} From 6bcb9c01f5d2f15c7f4865b69f1d0f5eace71ceb Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 11:20:04 +0100 Subject: [PATCH 09/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../sscs/config/jms/HearingsJmsConfig.java | 67 +++++++++++++++++++ .../jms/TribunalsHearingsJmsConfig.java | 67 +++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java create mode 100644 src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java new file mode 100644 index 00000000000..1d1fb56e2d2 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java @@ -0,0 +1,67 @@ +package uk.gov.hmcts.reform.sscs.config.jms; + +import javax.jms.ConnectionFactory; +import javax.jms.Session; +import lombok.extern.slf4j.Slf4j; +import org.apache.qpid.jms.JmsConnectionFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jms.config.DefaultJmsListenerContainerFactory; +import org.springframework.jms.config.JmsListenerContainerFactory; +import org.springframework.jms.connection.CachingConnectionFactory; +import org.springframework.jms.listener.DefaultMessageListenerContainer; + +@Slf4j +@Configuration +public class HearingsJmsConfig { + + public static final String AMQP_CONNECTION_STRING_TEMPLATE = "amqps://%1s?amqp.idleTimeout=%2d"; + @Value("${azure.service-bus.hmc-to-hearings-api.namespace}") + private String namespace; + + @Value("${azure.service-bus.connection-postfix}") + private String connectionPostfix; + + @Value("${azure.service-bus.hmc-to-hearings-api.username}") + private String username; + + @Value("${azure.service-bus.hmc-to-hearings-api.password}") + private String password; + + @Value("${azure.service-bus.hmc-to-hearings-api.receiveTimeout}") + private Long receiveTimeout; + + @Value("${azure.service-bus.hmc-to-hearings-api.idleTimeout}") + private Long idleTimeout; + + @Bean + @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) + public ConnectionFactory hmcHearingJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { + String connection = String.format(AMQP_CONNECTION_STRING_TEMPLATE, namespace + connectionPostfix, idleTimeout); + JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); + jmsConnectionFactory.setUsername(username); + jmsConnectionFactory.setPassword(password); + jmsConnectionFactory.setClientID(clientId); + + return new CachingConnectionFactory(jmsConnectionFactory); + } + + @Bean + @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) + public JmsListenerContainerFactory hmcHearingsEventTopicContainerFactory( + ConnectionFactory hmcHearingJmsConnectionFactory, + DefaultJmsListenerContainerFactoryConfigurer configurer) { + DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); + factory.setConnectionFactory(hmcHearingJmsConnectionFactory); + factory.setReceiveTimeout(receiveTimeout); + factory.setSubscriptionDurable(Boolean.TRUE); + factory.setSessionTransacted(Boolean.TRUE); + factory.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED); + + configurer.configure(factory, hmcHearingJmsConnectionFactory); + return factory; + } +} diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java new file mode 100644 index 00000000000..ae6ab73535c --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java @@ -0,0 +1,67 @@ +package uk.gov.hmcts.reform.sscs.config.jms; + +import javax.jms.ConnectionFactory; +import javax.jms.Session; +import lombok.extern.slf4j.Slf4j; +import org.apache.qpid.jms.JmsConnectionFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jms.config.DefaultJmsListenerContainerFactory; +import org.springframework.jms.config.JmsListenerContainerFactory; +import org.springframework.jms.connection.CachingConnectionFactory; +import org.springframework.jms.listener.DefaultMessageListenerContainer; +import uk.gov.hmcts.reform.sscs.config.JsonMessageConverter; + +@Slf4j +@Configuration +@ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.tribunals-to-hearings-api.enabled"}) +public class TribunalsHearingsJmsConfig { + + @Value("${azure.service-bus.tribunals-to-hearings-api.namespace}") + private String namespace; + + @Value("${azure.service-bus.connection-postfix}") + private String connectionPostfix; + + @Value("${azure.service-bus.tribunals-to-hearings-api.username}") + private String username; + + @Value("${azure.service-bus.tribunals-to-hearings-api.password}") + private String password; + + @Value("${azure.service-bus.tribunals-to-hearings-api.receiveTimeout}") + private Long receiveTimeout; + + @Value("${azure.service-bus.tribunals-to-hearings-api.idleTimeout}") + private Long idleTimeout; + + @Value("${azure.service-bus.amqp-connection-string-template:amqps://%1s?amqp.idleTimeout=%2d}") + public String amqpConnectionStringTemplate; + + @Bean + public ConnectionFactory tribunalsHearingsJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { + String connection = String.format(amqpConnectionStringTemplate, namespace + connectionPostfix, idleTimeout); + JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); + jmsConnectionFactory.setUsername(username); + jmsConnectionFactory.setPassword(password); + jmsConnectionFactory.setClientID(clientId); + return new CachingConnectionFactory(jmsConnectionFactory); + } + + @Bean + public JmsListenerContainerFactory tribunalsHearingsEventQueueContainerFactory( + ConnectionFactory tribunalsHearingsJmsConnectionFactory, + DefaultJmsListenerContainerFactoryConfigurer defaultJmsListenerContainerFactoryConfigurer) { + DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); + factory.setConnectionFactory(tribunalsHearingsJmsConnectionFactory); + factory.setReceiveTimeout(receiveTimeout); + factory.setSessionTransacted(Boolean.TRUE); + factory.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED); + factory.setMessageConverter(new JsonMessageConverter()); + defaultJmsListenerContainerFactoryConfigurer.configure(factory, tribunalsHearingsJmsConnectionFactory); + return factory; + } +} From 6ba5c90136465f9b885e91deedb79c863b19789a Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 11:40:10 +0100 Subject: [PATCH 10/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../reform/sscs/config/jms/HearingsJmsConfig.java | 10 +++++----- .../sscs/config/jms/TribunalsHearingsJmsConfig.java | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java index 1d1fb56e2d2..9a56dc53bbe 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java @@ -37,23 +37,23 @@ public class HearingsJmsConfig { @Value("${azure.service-bus.hmc-to-hearings-api.idleTimeout}") private Long idleTimeout; - @Bean - @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) - public ConnectionFactory hmcHearingJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { + @Value("${spring.application.name}") + private String clientId; + + private ConnectionFactory hmcHearingJmsConnectionFactory() { String connection = String.format(AMQP_CONNECTION_STRING_TEMPLATE, namespace + connectionPostfix, idleTimeout); JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); jmsConnectionFactory.setUsername(username); jmsConnectionFactory.setPassword(password); jmsConnectionFactory.setClientID(clientId); - return new CachingConnectionFactory(jmsConnectionFactory); } @Bean @ConditionalOnProperty({"feature.bypass-hearing-api-service.enabled", "flags.hmc-to-hearings-api.enabled"}) public JmsListenerContainerFactory hmcHearingsEventTopicContainerFactory( - ConnectionFactory hmcHearingJmsConnectionFactory, DefaultJmsListenerContainerFactoryConfigurer configurer) { + ConnectionFactory hmcHearingJmsConnectionFactory = hmcHearingJmsConnectionFactory(); DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); factory.setConnectionFactory(hmcHearingJmsConnectionFactory); factory.setReceiveTimeout(receiveTimeout); diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java index ae6ab73535c..531fa5f33f6 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java @@ -41,8 +41,10 @@ public class TribunalsHearingsJmsConfig { @Value("${azure.service-bus.amqp-connection-string-template:amqps://%1s?amqp.idleTimeout=%2d}") public String amqpConnectionStringTemplate; - @Bean - public ConnectionFactory tribunalsHearingsJmsConnectionFactory(@Value("${spring.application.name}") final String clientId) { + @Value("${spring.application.name}") + private String clientId; + + private ConnectionFactory tribunalsHearingsJmsConnectionFactory() { String connection = String.format(amqpConnectionStringTemplate, namespace + connectionPostfix, idleTimeout); JmsConnectionFactory jmsConnectionFactory = new JmsConnectionFactory(connection); jmsConnectionFactory.setUsername(username); @@ -53,8 +55,8 @@ public ConnectionFactory tribunalsHearingsJmsConnectionFactory(@Value("${spring. @Bean public JmsListenerContainerFactory tribunalsHearingsEventQueueContainerFactory( - ConnectionFactory tribunalsHearingsJmsConnectionFactory, DefaultJmsListenerContainerFactoryConfigurer defaultJmsListenerContainerFactoryConfigurer) { + ConnectionFactory tribunalsHearingsJmsConnectionFactory = tribunalsHearingsJmsConnectionFactory(); DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); factory.setConnectionFactory(tribunalsHearingsJmsConnectionFactory); factory.setReceiveTimeout(receiveTimeout); From 2412447a06682db63c1f7c3908a3aa69c43e19e8 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 12:24:52 +0100 Subject: [PATCH 11/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../reform/sscs/jms/listener/HmcHearingsEventTopicListener.java | 1 + .../sscs/jms/listener/TribunalsHearingsEventQueueListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java index 4af23ca63ee..c6d80667b0b 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java @@ -54,6 +54,7 @@ public HmcHearingsEventTopicListener(@Value("${sscs.serviceCode}") String sscsSe ) public void onMessage(JmsBytesMessage message) throws JMSException, HmcEventProcessingException { + log.info("isByPassHearingServiceEnabled ------------------------> {}", isByPassHearingServiceEnabled); if (!isByPassHearingServiceEnabled && isDeploymentFilterEnabled && !isMessageReleventForDeployment(message)) { return; } diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/TribunalsHearingsEventQueueListener.java b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/TribunalsHearingsEventQueueListener.java index 5fec62bf156..00b28def5f7 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/TribunalsHearingsEventQueueListener.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/TribunalsHearingsEventQueueListener.java @@ -40,6 +40,7 @@ public class TribunalsHearingsEventQueueListener { ) public void handleIncomingMessage(HearingRequest message) throws TribunalsEventProcessingException, GetCaseException, UpdateCaseException { + log.info("isByPassHearingServiceEnabled ------------------------> {}", isByPassHearingServiceEnabled); if (!isByPassHearingServiceEnabled) { return; } From ed52d3523fa2c0e0b7cf298a145610ddf43dcca4 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Tue, 15 Oct 2024 17:28:34 +0100 Subject: [PATCH 12/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../values.hearings.preview.template.yaml | 18 ++++++++++++++++++ .../HmcHearingsEventTopicListener.java | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml index 195be6df6a3..584b7823e92 100644 --- a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml @@ -69,6 +69,24 @@ java: TEST_RECIPIENTS_POSTCODE: "*" HMC_HEARINGS_LISTENING_ENABLED: true TRIBUNALS_HEARINGS_LISTENING_ENABLED: true + EXUI_API_URL: "https://${SERVICE_NAME}-xui" + IDAM_S2S_URL: "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal" + CASEWORKER_REF_API_URL: "http://rd-caseworker-ref-api-aat.service.core-compute-aat.internal" + COMMON_REF_API_URL: "http://rd-commondata-api-aat.service.core-compute-aat.internal" + JUDICIAL_REF_API_URL: "http://rd-judicial-api-aat.service.core-compute-aat.internal" + HMC_API_URL: "http://hmc-cft-hearing-service-aat.service.core-compute-aat.internal" + #Messaging + HMC_HEARINGS_TOPIC_NAME: "hmc-to-cft-aat" + HMC_HEARINGS_TOPIC_SUBSCRIPTION_NAME: "hmc-to-sscs-subscription-pr-4056" + TRIBUNALS_EVENT_QUEUE_NAME: ${SERVICE_NAME}-servicebus-tribunals-to-hearing-api + TRIBUNALS_EVENT_QUEUE_POLICY_NAME: RootManageSharedAccessKey + TRIBUNALS_EVENT_QUEUE_NAMESPACE: sscs-sb-preview + HMC_HEARINGS_TOPIC_NAMESPACE: hmc-servicebus-aat + HMC_DEPLOYMENT_ID: deployment-${SERVICE_NAME} + HMC_DEPLOYMENT_FILTER_ENABLED: true + HEARINGS_CASE_UPDATE_V2_ENABLED: true + ADJOURNMENT_ENABLED: true + BYPASS_HEARING_API_SERVICE: true secrets: JOB_SCHEDULER_DB_PASSWORD: secretRef: postgres diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java index c6d80667b0b..8d487336ef7 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java @@ -54,7 +54,8 @@ public HmcHearingsEventTopicListener(@Value("${sscs.serviceCode}") String sscsSe ) public void onMessage(JmsBytesMessage message) throws JMSException, HmcEventProcessingException { - log.info("isByPassHearingServiceEnabled ------------------------> {}", isByPassHearingServiceEnabled); + log.info("isByPassHearingServiceEnabled && isDeploymentFilterEnabled ------------------------> {}, {}", isByPassHearingServiceEnabled, + isDeploymentFilterEnabled); if (!isByPassHearingServiceEnabled && isDeploymentFilterEnabled && !isMessageReleventForDeployment(message)) { return; } From 00388173717abd340398edc4237338158359fd6e Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Wed, 16 Oct 2024 09:19:57 +0100 Subject: [PATCH 13/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- Jenkinsfile_CNP | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 4dd42760c91..8921a4b89d6 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -38,6 +38,14 @@ def secrets = [ secret('tya-link', 'SSCS_TRACK_YOUR_APPEAL_LINK'), secret('evidence-share-topic-shared-access-key', 'AMQP_PASSWORD'), + // hearing-api + secret('idam-s2s-api', 'IDAM_S2S_URL'), + secret('caseworker-ref-api', 'CASEWORKER_REF_API_URL'), + secret('ccd-api', 'CORE_CASE_DATA_API_URL'), + secret('judicial-ref-api', 'JUDICIAL_REF_API_URL'), + secret('s2s-micro', 'IDAM_S2S_AUTH_MICROSERVICES'), + secret('common-ref-data-api', 'COMMON_REF_API_URL'), + // e2es secret('test-e2e-caseofficer-username', 'TEST_CASEOFFICER_USERNAME'), secret('test-e2e-caseofficer-password', 'TEST_CASEOFFICER_PASSWORD'), From 10213f27cc71d82bf18724cd267373889afd3d4d Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Wed, 16 Oct 2024 13:53:05 +0100 Subject: [PATCH 14/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java | 3 +-- .../reform/sscs/config/jms/TribunalsHearingsJmsConfig.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java index 9a56dc53bbe..df3409a736b 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java @@ -37,8 +37,7 @@ public class HearingsJmsConfig { @Value("${azure.service-bus.hmc-to-hearings-api.idleTimeout}") private Long idleTimeout; - @Value("${spring.application.name}") - private String clientId; + private String clientId = "SSCS Hearings API"; private ConnectionFactory hmcHearingJmsConnectionFactory() { String connection = String.format(AMQP_CONNECTION_STRING_TEMPLATE, namespace + connectionPostfix, idleTimeout); diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java index 531fa5f33f6..437a0413ace 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java @@ -41,8 +41,7 @@ public class TribunalsHearingsJmsConfig { @Value("${azure.service-bus.amqp-connection-string-template:amqps://%1s?amqp.idleTimeout=%2d}") public String amqpConnectionStringTemplate; - @Value("${spring.application.name}") - private String clientId; + private String clientId = "SSCS Hearings API"; private ConnectionFactory tribunalsHearingsJmsConnectionFactory() { String connection = String.format(amqpConnectionStringTemplate, namespace + connectionPostfix, idleTimeout); From ad4dc95da3e9901be7edf8fba33e964c31f03df9 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Wed, 16 Oct 2024 14:27:16 +0100 Subject: [PATCH 15/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../values.hearings.preview.template.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml index 584b7823e92..5d9f2087843 100644 --- a/charts/sscs-tribunals-api/values.hearings.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.hearings.preview.template.yaml @@ -50,7 +50,7 @@ java: SUBSCRIPTION_NAME: "${SERVICE_NAME}-servicebus-main-topic" AMQP_HOST: "sscs-sb-preview.servicebus.windows.net" AMQP_USERNAME: "RootManageSharedAccessKey" - HEARINGS_EVENT_QUEUE_NAME: ${SERVICE_NAME}-servicebus-tribunals-to-hearing-api + HEARINGS_EVENT_QUEUE_NAME: "${SERVICE_NAME}-servicebus-tribunals-to-hearing-api" ROBOTICS_EMAIL_FROM: "sscs@hmcts.net" ROBOTICS_EMAIL_TO: "fake" ROBOTICS_EMAIL_SCOTTISH_TO: "fake2" @@ -78,11 +78,11 @@ java: #Messaging HMC_HEARINGS_TOPIC_NAME: "hmc-to-cft-aat" HMC_HEARINGS_TOPIC_SUBSCRIPTION_NAME: "hmc-to-sscs-subscription-pr-4056" - TRIBUNALS_EVENT_QUEUE_NAME: ${SERVICE_NAME}-servicebus-tribunals-to-hearing-api - TRIBUNALS_EVENT_QUEUE_POLICY_NAME: RootManageSharedAccessKey - TRIBUNALS_EVENT_QUEUE_NAMESPACE: sscs-sb-preview - HMC_HEARINGS_TOPIC_NAMESPACE: hmc-servicebus-aat - HMC_DEPLOYMENT_ID: deployment-${SERVICE_NAME} + TRIBUNALS_EVENT_QUEUE_NAME: "${SERVICE_NAME}-servicebus-tribunals-to-hearing-api" + TRIBUNALS_EVENT_QUEUE_POLICY_NAME: "RootManageSharedAccessKey" + TRIBUNALS_EVENT_QUEUE_NAMESPACE: "sscs-sb-preview" + HMC_HEARINGS_TOPIC_NAMESPACE: "hmc-servicebus-aat" + HMC_DEPLOYMENT_ID: "deployment-${SERVICE_NAME}" HMC_DEPLOYMENT_FILTER_ENABLED: true HEARINGS_CASE_UPDATE_V2_ENABLED: true ADJOURNMENT_ENABLED: true @@ -97,6 +97,9 @@ java: AMQP_PASSWORD: secretRef: sscs-sb-preview key: primaryKey + TRIBUNALS_EVENT_QUEUE_ACCESS_KEY: + secretRef: sscs-sb-preview + key: primaryKey postgresql: enabled: false From caea8c2cb91622b4a0e4658b59f9d1a7be85ec97 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Wed, 16 Oct 2024 15:33:50 +0100 Subject: [PATCH 16/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java | 3 ++- .../reform/sscs/config/jms/TribunalsHearingsJmsConfig.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java index df3409a736b..9a56dc53bbe 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/HearingsJmsConfig.java @@ -37,7 +37,8 @@ public class HearingsJmsConfig { @Value("${azure.service-bus.hmc-to-hearings-api.idleTimeout}") private Long idleTimeout; - private String clientId = "SSCS Hearings API"; + @Value("${spring.application.name}") + private String clientId; private ConnectionFactory hmcHearingJmsConnectionFactory() { String connection = String.format(AMQP_CONNECTION_STRING_TEMPLATE, namespace + connectionPostfix, idleTimeout); diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java index 437a0413ace..531fa5f33f6 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/config/jms/TribunalsHearingsJmsConfig.java @@ -41,7 +41,8 @@ public class TribunalsHearingsJmsConfig { @Value("${azure.service-bus.amqp-connection-string-template:amqps://%1s?amqp.idleTimeout=%2d}") public String amqpConnectionStringTemplate; - private String clientId = "SSCS Hearings API"; + @Value("${spring.application.name}") + private String clientId; private ConnectionFactory tribunalsHearingsJmsConnectionFactory() { String connection = String.format(amqpConnectionStringTemplate, namespace + connectionPostfix, idleTimeout); From 49fda28da85ee63d5e65da98b9bf084f2ce3e931 Mon Sep 17 00:00:00 2001 From: sunilrochani Date: Thu, 17 Oct 2024 10:30:56 +0100 Subject: [PATCH 17/17] SSCSSI-404: merge sscs-hearings-api into sscs-tribunals-case-api - with toggle ON --- .../reform/sscs/jms/listener/HmcHearingsEventTopicListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java index 8d487336ef7..afa8abf72e4 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/jms/listener/HmcHearingsEventTopicListener.java @@ -56,7 +56,7 @@ public void onMessage(JmsBytesMessage message) throws JMSException, HmcEventProc log.info("isByPassHearingServiceEnabled && isDeploymentFilterEnabled ------------------------> {}, {}", isByPassHearingServiceEnabled, isDeploymentFilterEnabled); - if (!isByPassHearingServiceEnabled && isDeploymentFilterEnabled && !isMessageReleventForDeployment(message)) { + if (isDeploymentFilterEnabled && !isMessageReleventForDeployment(message)) { return; }