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

SCPN1-11090

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

RFXtoRP_HsrReceiptList.ftl

@@ -102,18 +102,22 @@
                 <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
                 }
               <#else>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-                },
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-                }
+                <#if receipt.line_list ?? && receipt.line_list[0]??>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+                  }
+                  <#else>
+                    <#stop> <#-- No line -->
+                  </#if>
               </#if>
             <#else>
               <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
@@ -138,6 +142,7 @@
                       <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                     }
                   <#else>
+                    <#if receipt.line_list ?? && receipt.line_list[0]??>
                     {
                       <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                       "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -150,10 +155,14 @@
                       "datas" :
                       <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                     }
+                    <#else>
+                      <#stop> <#-- No line -->
+                    </#if>
                   </#if>
                 <#else>
                   <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
                     <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                      <#if receipt.line_list ?? && receipt.line_list[0]??>
                     [
                       {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -168,6 +177,9 @@
                         <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
                       }
                     ]
+                      <#else>
+                        <#stop> <#-- No line -->
+                      </#if>
                     <#else>
                       <#stop> <#-- Receipt reference for transfer is empty-->
                     </#if>
@@ -186,7 +198,7 @@
                       <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                       }
                     <#else>
-                      <#stop>
+                      <#stop> <#-- No line -->
                     </#if>
                   </#if>
                 </#if>

RFXtoRP_PlatformLogCreate.ftl

@@ -1,43 +1,51 @@
-<#include "HfRpConfig.ftl">
-[
-    <#assign UUID = UUID.randomUUID()>
-    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
-	{
-	  "Header": {
-	    "ProjectID": "${projectRP}"
-	  },
-	  "ID": {
-	        "RefID": "${UUID}",
-		    "RefDate": {
-		      "DateTime": "${aDateTime?iso_utc}",
-		      "AuthorTimeZone": "${time_zone_rfx}"
-		    }
-	  },
-	  "Payload": {
-	      <#assign severity = SeverityLevel.ERROR>
-	     "Severity": "${severity}",
-	     "Namespace": "ReflexIntegration",
-	    "DateTime": {
-	      "DateTime": "${aDateTime?iso_utc}",
-	      "AuthorTimeZone": "${time_zone_rfx}"
-	    },
-	    "TechMessage": {
-	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')}
-	      },
-	    "UserMessage": {
-	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')},
-	      "Params": []
-	    },
-	    "DetailElements": [],
-	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody?truncate(32000,'...')},
-	    "Type": "${event}",
-	    "Task": "${id.apiRestReflexID!"no Task"}",
-	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
-	    "StackTrace": ""
-	  }
-	}
-
+<#include "HfRpConfig.ftl">
+[
+    <#assign UUID = UUID.randomUUID()>
+    <#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}"
+	  },
+	  "ID": {
+	        "RefID": "${UUID}",
+		    "RefDate": {
+		      "DateTime": "${aDateTime?iso_utc}",
+		      "AuthorTimeZone": "${time_zone_rfx}"
+		    }
+	  },
+	  "Payload": {
+	      <#assign severity = SeverityLevel.ERROR>
+	     "Severity": "${severity}",
+	     "Namespace": "ReflexIntegration",
+		"DateTime": {
+		"DateTime": "${aDateTime?iso_utc}",
+		"AuthorTimeZone": "${time_zone_rfx}"
+	    },
+	    "TechMessage": {
+	      "Code": "${restResponsetMsg.status!"no Code"}",
+      "Label": "${safeJsonBody?json_string}"
+	      },
+	    "UserMessage": {
+	      "Code": "${restResponsetMsg.status!"no Code"}",
+          "Label": "${safeJsonBody?json_string}",
+	      "Params": []
+	    },
+	    "DetailElements": [],
+	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
+	    "ContextPayload": "${safeJsonBody?json_string}",
+	    "Type": "${event}",
+	    "Task": "${id.apiRestReflexID!"no Task"}",
+	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
+	    "StackTrace": ""
+	  }
+	}
 ]

RFXtoRP_RestResponse.ftl

@@ -358,7 +358,7 @@
 			]
 			</#switch>
 			<#break>
-	<#-- *********************************************** ApiRestID = canceled ******************** -->
+	<#-- *********************************************** ApiRestID = status ******************** -->
 	<#case "status_appointment_put_update_by_ref">
 	<#case "status_appointment_put_update_by_number">
 		<#switch restResponsetMsg.status!no_status>

RPtoRFX_CarrierAppointmentCreated.ftl

@@ -37,10 +37,14 @@
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
 			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
-				appointment.Unloading.Projects[0]?? &&
-				appointment.Unloading.Projects[0].Commissions??>
-			"physical_receipt_list": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
+			appointment.Unloading.Projects[0]?? &&
+			appointment.Unloading.Projects[0].Commissions?? >
+				<#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
+				(appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == "">
+					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+				<#else>
+					"physical_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
 					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
 					{
 						"receipt_activity": "${custom.value.activity_code?json_string}",
@@ -53,9 +57,9 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
-			"anticipated_receipt_list": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
+					],
+					"anticipated_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
 					<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
 					{
 						"activity": "${custom.value.activity_code?json_string}",
@@ -69,9 +73,8 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
-			<#else>
-				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+					],
+				</#if>
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>

VERSION

@@ -1 +1 @@
-2.0.25+2
+2.0.25+4