From 2432b37d6466e3730ab32a48b427c02b6363af42 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 18 Nov 2025 15:36:02 +0100
Subject: [PATCH] RDV

---
 RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl | 12 ++++++++++--
 RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl      | 10 +++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl
index e4b43c6..13bc369 100644
--- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl
@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            "RefID": "${carrier_apt.appointment_reference?trim?json_string}",
+        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+            "RefID": "${carrier_apt.appointment_reference?json_string}",
+        <#else>
+            <#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>
+                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+            </#if>
+		</#if>
 			"RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
-			 }		
+			 }
         },
         "Payload":{
             "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
diff --git a/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
index f29573d..d719484 100644
--- a/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
@@ -1,7 +1,15 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
 [
   {
-    "AppointmentID": "${carrier_apt.appointment_reference?trim?json_string}",
+    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+		<#else>
+			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+			<#else>
+				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+			</#if>
+		</#if>
     "Header": {
       "ProjectID": "${projectRP}"
     }