From 7233859ed853f3ef3704afef2d168b0e8e415e72 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Wed, 19 Nov 2025 17:16:16 +0100
Subject: [PATCH] RDV

---
 RFXtoRP_HsrCarrierApt.ftl                     | 27 ++++----
 ...rrierApt_AppointmentCommissionsUpdated.ftl | 64 ++++++++-----------
 2 files changed, 42 insertions(+), 49 deletions(-)
 rename RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl => RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl (75%)

diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index 02bdfa8..8961200 100644
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -33,18 +33,21 @@
        ]
   <#break>
     <#case "U">
-    <#stop>
-    <#--   *********************************************** Action = Update ********************
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-        <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
-		[
-			{
-			<#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceUpdateAppointment> <#-- à revoir
-			"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-			"datas" :
-			<#include "RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl">
-			}
-	    ]-->
+    <#--   *********************************************** Action = Update ********************-->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
+      <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
+      [
+        {
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCommissionsUpdated> <#-- à revoir-->
+        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+        "datas" :
+        <#include "RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl">
+        }
+        ]
+      <#else>
+        <#stop> <#--no comission-->
+      </#if>
     <#break>
 
 <#case "D">
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl
similarity index 75%
rename from RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
rename to RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl
index 540e2eb..e615f82 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl
@@ -7,49 +7,39 @@
         "Header":{
           "ProjectID": "${projectRP}"
         },
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") ||  carrier_apt.planned_unloading_end_datetime?starts_with("00")>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
-		   </#if>
-		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
-		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
-		<#else>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?starts_with("00")>
-			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       </#if>
-				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
-				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
+		"ID": {
+			"RefDate": {
+			"AuthorTimeZone": "time_zone_rfx",
+			"DateTime": "${creation_datetime}"
+			},
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"RefID": "${carrier_apt.appointment_reference?json_string}",
 			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
-					<#assign duration = 0 />  <#-- à confirmer -->
+				<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+					"RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
 				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					"RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
 				</#if>
 			</#if>
-		</#if>
-		"ProjectID": "${projectRP}",
-		"TimeZone": "${time_zone_rfx}",
-		"AppointmentID": "${carrier_apt.appointment_reference}",
+ 		 },
+		"Payload": {
+			"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
          <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
           "Commissions": [
-                   <#list carrier_apt.physical_receipt_list as physical_receipt>
-                   {
-					  "ActorID": "${carrier_apt.physical_depot}",
-                      "OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-                      "ProjectID": "${projectRP}",
-                      "Quantities": [
-						{
-						"UnitID": "PAL",  <#-- à changer -->
-						"Value": 1        <#-- à changer -->
-						}
-                       ]
-                   }<#sep>,</#sep>
-                   </#list>
-                   ],
+				<#list carrier_apt.physical_receipt_list as physical_receipt>
+				{
+					"ActorID": "${carrier_apt.physical_depot}",
+					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+					"ProjectID": "${projectRP}",
+					"Quantities": [
+					{
+					"UnitID": "PAL",  <#-- à changer -->
+					"Value": 1        <#-- à changer -->
+					}
+					]
+				}<#sep>,</#sep>
+				</#list>
+				],
         </#if>
 [
     {