From 1be3af7cf1006d4ae0bc3205c7fe000ae75e2fb2 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 10 Jun 2025 11:50:03 +0200
Subject: [PATCH] SCPN1-8871

---
 RFXtoRP_HsrReceiptList.ftl | 87 ++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index b5588b6..d5f1db3 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,40 +15,44 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type = "030" && receipt.receipt_reference?? && receipt.receipt_reference!="">
-        [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-          }
-          ]
-          <#else>
-            [
+        <#if receipt.receipt_type = "030">
+          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          [
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
 
             },
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
 
             }
-            ]
+          ]
+          <#else>
+            <#stop> <#-- Receipt reference is empty-->
+          </#if>
+        <#else>
+        [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+          }
+        ]
         </#if>
       <#break>
     <#case "U">
@@ -88,18 +92,37 @@
                     <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                     }
                   <#else>
-                    {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                    <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
+                    [
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+                      },
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
                       "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                       "datas" :
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-                    },
-                    {
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                    "datas" :
-                    <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                  }
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    </#if>
                   </#if>
                 </#if>
               </#if>