Release 2.0.15+1

Merge branch 'SCPN1-8340' into 'release/2.0'
Resolve SCPN1-8340 See merge request r-d-technique/tiers/tdi-connector!10
2025-02-18 10:02:33 +01:00 · 2025-02-18 08:59:07 +00:00 · 2025-02-17 17:22:44 +01:00 · 2025-02-17 14:22:41 +01:00 · 2025-02-06 15:57:14 +01:00 · 2025-02-06 14:45:05 +00:00
2 changed files with 61 additions and 53 deletions
--- a/TDItoRP.ftl
+++ b/TDItoRP.ftl
@@ -1,57 +1,65 @@
-<#assign tdiEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign tdiEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>

 <#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) />
-<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> 
+<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
+<#assign senderTag = tdiEventMsg.senderTag>

-{"Header": 
-   {
-    "ProjectID": "${projectRP}"
-    },
-    "ID": 
-    {
-       "RefID": "${tdiEvent.HUReference1}"
-    },
-    "Payload": 
-    {"Events": [
-      <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
-         {"Date": {"DateTime": "${tdiEvent.EventDate}",
-                   "AuthorTimeZone": "UTC"
-                   },
-          <#if tdiEvent.EventCode?starts_with("T-") == true || 
-               tdiEvent.EventCode == "OK-COLLECTED" ||
-               tdiEvent.EventCode == "OK-IN-TRANST" ||
-               tdiEvent.EventCode == "OK-OUT-FOR-D" ||
-               tdiEvent.EventCode == "OK-WITHDRAWA" || 
-               tdiEvent.EventCode == "OK-EDI" >         
-          "Code": "TRACKING_EVENT_IFTSTA_13", <#-- Acheminement conforme  -->
-          <#else>
-          <#if tdiEvent.EventCode?starts_with("D-") == true || 
-               tdiEvent.EventCode == "OK-DELIVERED"  >         
-          "Code": "TRACKING_EVENT_IFTSTA_21", <#-- Livraison conforme  -->
-          <#else>
-          <#if tdiEvent.EventCode?starts_with("DC") == true || 
-               tdiEvent.EventCode?starts_with("DN") == true || 
-               tdiEvent.EventCode?starts_with("DR") == true >         
-          "Code": "TRACKING_EVENT_IFTSTA_56",<#-- Livraison non aboutiee  -->
-          <#else>
-           <#if tdiEvent.EventCode?starts_with("TD") == true || 
-                tdiEvent.EventCode?starts_with("TA") == true >         
-          "Code": "TRACKING_EVENT_IFTSTA_53",<#-- Acheminement non réalisé  -->
-          <#else>
-           <#if tdiEvent.EventCode == "OK-IN-TRANST" >         
-          "Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours  -->
-          <#else>
-          "Code": "TRACKING_EVENT_UNKNOWN",
-           </#if>   
-           </#if>          
-           </#if>         
-           </#if>
-           </#if>
-          "Reason": "${tdiEvent.EventLabel}"
- 
-          }
-          ]
-     }
-}
+<#-- Target = 0 : Expedition , Target = 1 : Colis   -->
+<#if tdiEvent.Target == 0 >
+    <#stop >
+<#else>
+	{"Header":
+	   {
+		"ProjectID": "${projectRP}"
+		},
+		"ID":
+		{
+		   "RefID": "${tdiEvent.HUReference1}"
+		},
+		"Payload":
+		{"Events": [
+		  <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
+			 {"Date": {"DateTime": "${tdiEvent.EventDate}",
+					   "AuthorTimeZone": "UTC"
+					   },
+			  <#if tdiEvent.EventCode == "OK-COLLECTED" ||
+				   tdiEvent.EventCode == "OK-EDI" ||
+				   tdiEvent.EventCode == "ADM" ||
+				   tdiEvent.EventCode == "RGP" >
+			  "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier  -->
+			  <#else>
+			  <#if  tdiEvent.EventCode?starts_with("TA")  >
+			  "Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery  -->
+			  <#else>
+			  <#if tdiEvent.EventCode?starts_with("T-") == true ||
+				   tdiEvent.EventCode?starts_with("TD") == true ||
+				   tdiEvent.EventCode == "OK-OUT-FOR-D" ||
+				   tdiEvent.EventCode == "OK-IN-TRANST" >
+			  "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress  -->
+			  <#else>
+			   <#if tdiEvent.EventCode?starts_with("D-") == true ||
+					tdiEvent.EventCode == "OK-DELIVERED" ||
+				   tdiEvent.EventCode == "OK-WITHDRAWA" >
+			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed  -->
+			  <#else>
+			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
+					tdiEvent.EventCode?starts_with("DN") == true ||
+					tdiEvent.EventCode?starts_with("DR") == true ||
+					tdiEvent.EventCode == "NEX" >
+			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed  -->
+			  <#else>
+			  "Code": "TRACKING_EVENT_UNKNOWN",
+			   </#if>
+			   </#if>
+			   </#if>
+			   </#if>
+			   </#if>
+			  "Reason": "${tdiEvent.EventLabel}"
+
+			  }
+			  ]
+		 }
+	}
+</#if>	
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.3+1
+2.0.15+1
Author	SHA1	Message	Date
freat	9462439713	Release 2.0.15+1	2025-02-18 10:02:33 +01:00
Francis Reat	dddee7e7b7	Merge branch 'SCPN1-8340' into 'release/2.0' Resolve SCPN1-8340 See merge request r-d-technique/tiers/tdi-connector!10	2025-02-18 08:59:07 +00:00
frea	01914593ab	SCPN1-8347	2025-02-17 17:22:44 +01:00
frea	cef7c9aeda	SCPN1-8340 et SCPN1-8347	2025-02-17 14:22:41 +01:00
freat	969d42ac4a	Release 2.0.14+1	2025-02-06 15:57:14 +01:00
Francis Reat	3be6f84bbb	Merge branch 'SCPN1-8181' into 'release/2.0' SCPN1-8181 See merge request r-d-technique/tiers/tdi-connector!8	2025-02-06 14:45:05 +00:00
frea	a7b7decf78	SCPN1-8181	2025-01-20 15:50:35 +01:00
Vincent Le Maitre	00cda1dcd8	Release 2.0.13+1	2024-12-13 15:33:51 +01:00
Vincent Le Maitre	79f199e0b1	Release 2.0.12+1	2024-12-03 14:46:55 +01:00
Vincent Le Maitre	6f9c7aa8f0	Release 2.0.11+1	2024-06-24 10:53:18 +02:00
freat	28399a41f0	Release 2.0.10+1	2024-05-02 10:21:24 +02:00
Vincent Le Maitre	c34985ceaa	Release 2.0.9+1	2024-03-19 16:50:29 +01:00
Vincent Le Maitre	3126008799	Release 2.0.8+1	2024-03-12 10:02:27 +01:00
Vincent LEMAITRE	7846d535fc	reverted VERSION	2024-03-12 08:50:39 +00:00
Vincent Le Maitre	79c996263e	Release 2.0.8+1	2024-03-12 09:30:37 +01:00
Vincent Le Maitre	774abde62d	Release 2.0.7+1	2024-03-11 16:13:16 +01:00
freat	f9c5e87f0b	Release 2.0.6+1	2024-02-16 11:50:42 +01:00
freat	0d1bc817d9	Release 2.0.5+1	2024-01-26 10:37:37 +01:00
freat	0a39df863a	Release 2.0.4+1	2024-01-17 10:15:36 +01:00
@@ -1 +1 @@
 .0.3+1
 .0.15+1