feat (dispatcher): add directCisu helper

Author: bou3108

hub/dispatcher/src/main/java/com/hubsante/hub/config/Constants.java

@@ -34,6 +34,7 @@ public class Constants {
     public static final String DISPATCHED_MESSAGE = "dispatch.message";
     public static final String USE_CASE_TAG = "use_case";
     public static final String UNKNOWN = "unknown";
+    public static final boolean DEFAULT_DIRECT_CISU_PREFERENCE = false;
     public static final String FR_HEALTH_PREFIX = "fr.health";
     public static final String FR_FIRE_PREFIX = "fr.fire";
     public static final String FR_CISU_PREFIX = "fr.cisu";

hub/dispatcher/src/main/java/com/hubsante/hub/service/ClientPropertiesRegistry.java

@@ -15,6 +15,7 @@
  */
 package com.hubsante.hub.service;
 
+import static com.hubsante.hub.config.Constants.DEFAULT_DIRECT_CISU_PREFERENCE;
 import static com.hubsante.hub.config.Constants.UNKNOWN;
 
 import com.hubsante.hub.config.LogConstants;
@@ -178,6 +179,14 @@ public Boolean isClientUseXml(String clientId) {
         return clientProperties.useXml();
     }
 
+    public boolean isClientDirectCisu(String clientId) {
+        ClientProperties clientProperties = get(clientId);
+
+        return clientProperties != null
+                ? clientProperties.directCisu()
+                : DEFAULT_DIRECT_CISU_PREFERENCE;
+    }
+
     public List<String> getClientInhibitedUseCases(String clientId) {
         ClientProperties clientProperties = get(clientId);
         if (clientProperties == null) {

hub/dispatcher/src/main/java/com/hubsante/hub/utils/ConversionUtils.java

@@ -20,16 +20,13 @@
 import static com.hubsante.hub.utils.MessageUtils.*;
 
 import com.hubsante.hub.config.HubConfiguration;
-import com.hubsante.hub.model.ClientProperties;
 import com.hubsante.model.edxl.EdxlMessage;
 import java.util.Arrays;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class ConversionUtils {
 
-    private static final boolean DEFAULT_DIRECT_CISU_PREFERENCE = false;
-
     public static String buildExchangeDestination(String sourceVHost, String targetVHost) {
         return TRANSFER_EXCHANGE_PREFIX + sourceVHost + "_to_" + targetVHost;
     }
@@ -139,13 +136,6 @@ public static boolean isDirectCisuForHealthActor(
         String senderId = edxlMessage.getSenderID();
         String healthActor = senderId.startsWith(HEALTH_PREFIX) ? senderId : recipientId;
 
-        ClientProperties healthActorProperties =
-                hubConfig.getClientPropertiesRegistry().get(healthActor);
-        boolean directCisuPreference =
-                healthActorProperties != null
-                        ? healthActorProperties.directCisu()
-                        : DEFAULT_DIRECT_CISU_PREFERENCE;
-
-        return directCisuPreference;
+        return hubConfig.getClientPropertiesRegistry().isClientDirectCisu(healthActor);
     }
 }

hub/dispatcher/src/test/java/com/hubsante/hub/service/ConversionUtilsTest.java

@@ -303,7 +303,7 @@ void testGetTargetVersion() {
 
             // Direct Cisu cases
             when(hubConfig.getVhost()).thenReturn("15-nexsis_v1.9");
-            when(clientPropertiesRegistry.get("fr.health.samuDirectCisu").directCisu())
+            when(clientPropertiesRegistry.isClientDirectCisu("fr.health.samuDirectCisu"))
                     .thenReturn(true);
             when(edxlMessage.getSenderID()).thenReturn("fr.health.samuDirectCisu");
             mockedMessageUtils
@@ -360,11 +360,11 @@ void testIsDirectCisuForHealthActor() {
                     .thenReturn("fr.fire.sdisZ");
 
             // Health actor in direct CISU preferences - true
-            when(clientPropertiesRegistry.get("fr.health.samuA").directCisu()).thenReturn(true);
+            when(clientPropertiesRegistry.isClientDirectCisu("fr.health.samuA")).thenReturn(true);
             assertTrue(ConversionUtils.isDirectCisuForHealthActor(hubConfig, edxlMessage));
 
             // Health actor in direct CISU preferences - false
-            when(clientPropertiesRegistry.get("fr.health.samuA").directCisu()).thenReturn(false);
+            when(clientPropertiesRegistry.isClientDirectCisu("fr.health.samuA")).thenReturn(false);
             assertFalse(ConversionUtils.isDirectCisuForHealthActor(hubConfig, edxlMessage));
 
             // Health actor not in direct CISU preferences