fix(dispatcher): dynamic perimeter detection for 15-15 routing

Author: Clemsazert

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

@@ -47,9 +47,7 @@ public class Constants {
 
     public enum Perimeter {
         HEALTH("15-15"),
-        CISU("15-nexsis"),
-        GPS("15-gps"),
-        SMUR("15-smur");
+        CISU("15-nexsis");
 
         private final String name;
 
@@ -60,5 +58,14 @@ public enum Perimeter {
         public String getName() {
             return name;
         }
+
+        public static Perimeter fromName(String name) {
+            for (Perimeter p : values()) {
+                if (p.name.equals(name)) {
+                    return p;
+                }
+            }
+            return null;
+        }
     }
 }

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

@@ -128,8 +128,14 @@ public static ConversionParametersDTO resolveConversionParameters(
     private static ConversionParametersDTO resolveSamuToSamu(
             HubConfiguration hubConfig, EdxlMessage edxlMessage) {
         String recipientId = getRecipientID(edxlMessage);
-        String targetVhost =
-                determineTargetVhostByPerimeter(hubConfig, recipientId, Perimeter.HEALTH);
+        String currentVhost = hubConfig.getVhost();
+        String perimeterString = trimVersionSuffix(currentVhost);
+        Perimeter perimeter = Perimeter.fromName(perimeterString);
+        if (perimeter == null) {
+            return null;
+        }
+
+        String targetVhost = determineTargetVhostByPerimeter(hubConfig, recipientId, perimeter);
 
         if (targetVhost == null) {
             return null;

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

@@ -54,6 +54,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.*;
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.core.Message;
@@ -471,6 +473,28 @@ public void shouldCallConversionServiceForCISUVersionConvertedMessagesFromNexsis
                 .send(eq(expectedTargetExchangeName), eq(FIRE_ROUTING_KEY), argument.capture());
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {"15-sas_v1.0", "15-smur_v1.7", "15-gps_v2.0"})
+    @DisplayName("send message to current vhost")
+    public void testSendMessageWithoutConversion(String vhost) throws IOException {
+        Message message = createMessage("EDXL-DE", JSON, SAMU_A_ROUTING_KEY, SAMU_V3_ROUTING_KEY);
+
+        doReturn(vhost).when(hubConfig).getVhost();
+        dispatcher.dispatch(message);
+
+        verify(conversionHandler, never())
+                .callConversionService(
+                        anyString(),
+                        anyString(),
+                        anyString(),
+                        any(ConversionUtils.ConversionType.class),
+                        anyString());
+
+        ArgumentCaptor<Message> argument = ArgumentCaptor.forClass(Message.class);
+        Mockito.verify(rabbitTemplate, times(1))
+                .send(eq(DISTRIBUTION_EXCHANGE), eq(SAMU_V3_MESSAGE_QUEUE), argument.capture());
+    }
+
     @Test
     @DisplayName("should reset TTL if edxl dateTimeExpires is lower")
     public void shouldResetTTL() throws IOException {