From 29ee071a66d8335f101fd8dc63586fdca109fd7b Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 24 Oct 2023 16:44:03 +0200 Subject: [PATCH 1/8] Snapshot tdi-connector 2.1.0-SNAPSHOT --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6753471..61bc4c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-SNAPSHOT +2.1.0-SNAPSHOT From c7389871de3a5f2845d0ddd3bf5771543b7675da Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Mon, 11 Mar 2024 17:11:52 +0100 Subject: [PATCH 2/8] Snapshot tdi-connector 2.2.0-SNAPSHOT --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 61bc4c6..31941db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0-SNAPSHOT +2.2.0-SNAPSHOT From d1999bd81a501bb587711700ff956044f6e6bebc Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Tue, 12 Mar 2024 08:28:20 +0000 Subject: [PATCH 3/8] reverted VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 31941db..61bc4c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0-SNAPSHOT +2.1.0-SNAPSHOT From ea068df3c0e1ec73272aba0d0d4c262942f2193a Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 20 Jan 2025 15:50:35 +0100 Subject: [PATCH 4/8] SCPN1-8181 (cherry picked from commit a7b7decf78f9929ce378566a7ba98d0ac7e49f1b) --- TDItoRP.ftl | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index 2244531..4b29808 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -1,56 +1,57 @@ -<#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": +{"Header": { "ProjectID": "${projectRP}" }, - "ID": + "ID": { "RefID": "${tdiEvent.HUReference1}" }, - "Payload": + "Payload": {"Events": [ <#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", --> {"Date": {"DateTime": "${tdiEvent.EventDate}", "AuthorTimeZone": "UTC" }, - <#if tdiEvent.EventCode?starts_with("T-") == true || + <#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" > + 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" > + <#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 > + <#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 > + <#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" > + <#if tdiEvent.EventCode == "OK-IN-TRANST" > "Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours --> <#else> "Code": "TRACKING_EVENT_UNKNOWN", - - - + + + "Reason": "${tdiEvent.EventLabel}" - + } ] } From 934463db197a4f0803369fb1f65e8aa52e4d5bdc Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 17 Feb 2025 14:22:41 +0100 Subject: [PATCH 5/8] SCPN1-8340 et SCPN1-8347 (cherry picked from commit cef7c9aeda733905d9fa271cb02a9fb707a49c72) --- TDItoRP.ftl | 105 ++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index 4b29808..62298c5 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -6,53 +6,60 @@ <#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", - - - - - - "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_14",<#-- 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_21",<#-- Delivery completed --> + <#else> + "Code": "TRACKING_EVENT_UNKNOWN", + + + + + + "Reason": "${tdiEvent.EventLabel}" - } - ] - } -} \ No newline at end of file + } + ] + } + } + \ No newline at end of file From bd7cf03026e7c7febe6e807dfbceaa64f722aa85 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 17 Feb 2025 17:22:44 +0100 Subject: [PATCH 6/8] SCPN1-8347 (cherry picked from commit 01914593ab52172d520b4e40661b0c62e003db83) --- TDItoRP.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index 62298c5..e17ea73 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -42,13 +42,13 @@ <#if tdiEvent.EventCode?starts_with("D-") == true || tdiEvent.EventCode == "OK-DELIVERED" || tdiEvent.EventCode == "OK-WITHDRAWA" > - "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Process Completed --> + "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_21",<#-- Delivery completed --> + "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed --> <#else> "Code": "TRACKING_EVENT_UNKNOWN", From 006d5c48c368b7f9cdd37023b93796af3d67ca93 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 24 Feb 2025 10:27:39 +0100 Subject: [PATCH 7/8] SCPN1-8384 (cherry picked from commit 0fcf1f7ac05e333a7d3c64b9873e511fb33da29e) --- TDItoRP.ftl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index e17ea73..df37194 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -26,6 +26,9 @@ }, <#if tdiEvent.EventCode == "OK-COLLECTED" || tdiEvent.EventCode == "OK-EDI" || + tdiEvent.EventCode == "OK-APPT-DATE" || + tdiEvent.EventCode == "OK-APPT-NOTI" || + tdiEvent.EventCode == "OK-APPT-NEED" || tdiEvent.EventCode == "ADM" || tdiEvent.EventCode == "RGP" > "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier --> @@ -41,12 +44,16 @@ <#else> <#if tdiEvent.EventCode?starts_with("D-") == true || tdiEvent.EventCode == "OK-DELIVERED" || - tdiEvent.EventCode == "OK-WITHDRAWA" > + tdiEvent.EventCode == "POD" || + tdiEvent.EventCode == "FAC" || + 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?starts_with("C-") == true || + tdiEvent.EventCode == "SUP" || tdiEvent.EventCode == "NEX" > "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed --> <#else> @@ -62,4 +69,4 @@ ] } } - \ No newline at end of file + \ No newline at end of file From c45291bc785c736d67a1ef8929407fd11f12f5e3 Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 28 Feb 2025 14:52:55 +0100 Subject: [PATCH 8/8] SCPN1-8341 --- TDItoRP.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index df37194..0165cbf 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -16,7 +16,7 @@ }, "ID": { - "RefID": "${tdiEvent.HUReference1}" + "RefID": "${tdiEvent.ParcelNumber!tdiEvent.HUReference1}" }, "Payload": {"Events": [