Merge branch 'release/1.2' into 'main-1.2'

update RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl par defaut

See merge request r-d-technique/tiers/reflex-wms-connector!306

RFXtoRP_HsrReceiptList.ftl

@@ -77,18 +77,23 @@
                 <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
               }
               <#else>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-              }
+                <#if receipt.line_list ?? && receipt.line_list[0]??>
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                  },
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  }
+                  <#else>
+                    <#--  No line-->
+                    <#stop>
+                  </#if>
               </#if>
             <#else>
               <#if receipt.receipt_type == "030">

RFXtoRP_PlatformLogCreate.ftl

@@ -1,7 +1,16 @@
 <#include "HfRpConfig.ftl">
 [
     <#assign UUID = UUID.randomUUID()>
-    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
+    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
+    <#assign maxLen = 32000>
+    <#if strJsonBody?length gt maxLen>
+        <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
+    </#if>
+    <#if strJsonBody?length gt maxLen>
+        <#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
+    <#else>
+        <#assign safeJsonBody = strJsonBody>
+    </#if>
 	{
 	  "Header": {
 	    "ProjectID": "${projectRP}"
@@ -17,22 +26,22 @@
 	      <#assign severity = SeverityLevel.ERROR>
 	     "Severity": "${severity}",
 	     "Namespace": "ReflexIntegration",
-	    "DateTime": {
-	      "DateTime": "${aDateTime?iso_utc}",
-	      "AuthorTimeZone": "${time_zone_rfx}"
+		"DateTime": {
+		"DateTime": "${aDateTime?iso_utc}",
+		"AuthorTimeZone": "${time_zone_rfx}"
 	    },
 	    "TechMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')}
+      "Label": "${safeJsonBody?json_string}"
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')},
+          "Label": "${safeJsonBody?json_string}",
 	      "Params": []
 	    },
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody?truncate(32000,'...')},
+	    "ContextPayload": "${safeJsonBody?json_string}",
 	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",

VERSION

@@ -1 +1 @@
-1.2.63+1
+1.2.63+2