Merge pull request #564 from ansforge/feature/refused-ack-error-message

feat(lrm): envoi d'un message d'erreur associé à l'acquittement refused

Author: Medaminesagh1

web/lrm/client/components/ReceivedMessage.vue

@@ -132,6 +132,7 @@ import { useMainStore } from '~/store';
 import { useAuthStore } from '@/store/auth';
 import {
   buildAck,
+  buildError,
   sendMessage,
   INTERNAL_HUB_USER,
   getMessageType,
@@ -213,13 +214,32 @@ const sendAck = (refused = false) => {
     const distributionID = props.body.distributionID;
     const senderID = props.body.senderID;
 
-    if (getMessageType({ body: props.body }) !== 'message') return;
-
+    if (getMessageType({ body: props.body }) !== 'message') {
+      return;
+    }
     if (senderID.includes(INTERNAL_HUB_USER)) {
       consola.warn(`Ack not sent: ${INTERNAL_HUB_USER} is not a valid client`);
       return;
     }
-    const msg = buildAck({ distributionID, senderID, refused });
+
+    let errorDistributionID = null;
+
+    if (refused) {
+      const errorMsg = buildError({
+        distributionID,
+        senderID,
+        sourceMessage: props.body,
+      });
+      sendMessage(errorMsg, props.vhost);
+      errorDistributionID = errorMsg.distributionID;
+    }
+
+    const msg = buildAck({
+      distributionID,
+      senderID,
+      refused,
+      errorDistributionID,
+    });
     sendMessage(msg, props.vhost);
     isAcked.value = true;
   } catch (error) {
@@ -252,6 +272,7 @@ export default {
   },
 };
 </script>
+
 <style lang="scss">
 // Ref.: https://github.com/chenfengjw163/vue-json-viewer/tree/master#theming
 // values are default one from jv-light template

web/lrm/client/composables/messageUtils.js

@@ -2,7 +2,7 @@ import moment from 'moment/moment';
 import { v4 as uuidv4 } from 'uuid';
 import { consola } from 'consola';
 import { clientInfos } from './userUtils';
-import { EDXL_ENVELOPE, DIRECTIONS } from '@/constants';
+import { EDXL_ENVELOPE, DIRECTIONS, RC_DE } from '@/constants';
 import { useMainStore } from '~/store';
 import { useAuthStore } from '~/store/auth';
 
@@ -126,18 +126,46 @@ export function setCaseId(message, caseId, localCaseId) {
   }
 }
 
-export function buildAck({ distributionID, senderID, refused = false }) {
+export function buildAck({
+  distributionID,
+  senderID,
+  refused = false,
+  errorDistributionID = null,
+}) {
   return buildMessage(
-    { reference: { distributionID, ...(refused && { refused }) } },
+    {
+      reference: {
+        distributionID,
+        ...(refused && { refused }),
+        ...(errorDistributionID && {
+          errorDistributionID,
+        }),
+      },
+    },
     { distributionKind: 'Ack', recipientId: senderID }
   );
 }
 
+export function buildError({ distributionID, senderID, sourceMessage }) {
+  return buildMessage(
+    {
+      error: {
+        errorCode: { statusCode: 501, statusString: 'UNROUTABLE_MESSAGE' },
+        errorCause: 'This message was rejected by the recipient.',
+        sourceMessage,
+        referencedDistributionID: distributionID,
+      },
+    },
+    { distributionKind: 'Error', recipientId: senderID, includeRCDE: false }
+  );
+}
+
 export function buildMessage(
   innerMessage,
-  { distributionKind, recipientId } = {
+  { distributionKind, recipientId, includeRCDE = true } = {
     distributionKind: 'Report',
     recipientId: null,
+    includeRCDE: true,
   }
 ) {
   // InnerMessage should only have one key, as we do not support multiple use cases in the same message.
@@ -154,34 +182,43 @@ export function buildMessage(
   } else {
     message.descriptor.keyword[0].value = useCase;
   }
+
   const formattedInnerMessage = formatIdsInMessage(innerMessage);
-  message.content[0].jsonContent.embeddedJsonContent.message = {
-    ...message.content[0].jsonContent.embeddedJsonContent.message,
-    ...formattedInnerMessage,
-  };
-  const name = clientInfos().name;
   const targetId = recipientId ?? authStore.user.targetId;
   const sentAt = moment().format();
   message.distributionID = `${authStore.user.clientId}_${uuidv4()}`;
   message.distributionKind = distributionKind;
   message.senderID = authStore.user.clientId;
   message.dateTimeSent = sentAt;
   message.descriptor.explicitAddress.explicitAddressValue = targetId;
-  message.content[0].jsonContent.embeddedJsonContent.message.messageId =
-    message.distributionID;
-  message.content[0].jsonContent.embeddedJsonContent.message.kind =
-    message.distributionKind;
-  message.content[0].jsonContent.embeddedJsonContent.message.sender = {
-    name,
-    URI: `hubex:${authStore.user.clientId}`,
-  };
-  message.content[0].jsonContent.embeddedJsonContent.message.sentAt = sentAt;
-  message.content[0].jsonContent.embeddedJsonContent.message.recipient = [
-    {
-      name: clientInfos(targetId).name,
-      URI: `hubex:${targetId}`,
-    },
-  ];
+
+  if (includeRCDE) {
+    const name = clientInfos().name;
+    message.content[0].jsonContent.embeddedJsonContent.message = {
+      ...message.content[0].jsonContent.embeddedJsonContent.message,
+      ...RC_DE,
+      ...formattedInnerMessage,
+      messageId: message.distributionID,
+      kind: message.distributionKind,
+      sender: {
+        name,
+        URI: `hubex:${authStore.user.clientId}`,
+      },
+      sentAt,
+      recipient: [
+        {
+          name: clientInfos(targetId).name,
+          URI: `hubex:${targetId}`,
+        },
+      ],
+    };
+  } else {
+    message.content[0].jsonContent.embeddedJsonContent.message = {
+      ...message.content[0].jsonContent.embeddedJsonContent.message,
+      ...formattedInnerMessage,
+    };
+  }
+
   return trimEmptyValues(message);
 }
 

web/lrm/client/constants.js

@@ -27,26 +27,29 @@ export const EDXL_ENVELOPE = {
     {
       jsonContent: {
         embeddedJsonContent: {
-          message: {
-            messageId: '{{ 2608323d-507d-4cbf-bf74-52007f8124ea }}',
-            sender: {
-              name: '{{ samuA }}',
-              URI: '{{ hubsante:fr.health.test.samuA }}',
-            },
-            sentAt: '{{ 2022-09-27T08:23:34+02:00 }}',
-            status: 'Actual',
-            kind: '{{ Report }}',
-            recipient: [
-              {
-                name: '{{ samuB }}',
-                URI: '{{ hubsante:fr.health.test.samuB }}',
-              },
-            ],
-          },
+          message: {},
         },
       },
     },
   ],
 };
+
+export const RC_DE = {
+  messageId: '{{ 2608323d-507d-4cbf-bf74-52007f8124ea }}',
+  sender: {
+    name: '{{ samuA }}',
+    URI: '{{ hubsante:fr.health.test.samuA }}',
+  },
+  sentAt: '{{ 2022-09-27T08:23:34+02:00 }}',
+  status: 'Actual',
+  kind: '{{ Report }}',
+  recipient: [
+    {
+      name: '{{ samuB }}',
+      URI: '{{ hubsante:fr.health.test.samuB }}',
+    },
+  ],
+};
+
 export const REPOSITORY_URL =
   'https://raw.githubusercontent.com/ansforge/SAMU-Hub-Modeles/';