From b6b1f63a2e75fce4d74e6fad6f82bdf6b93b5c85 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 28 Sep 2023 17:44:09 +0200 Subject: [PATCH 1/8] init ftl files --- TDItoRP.ftl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 TDItoRP.ftl diff --git a/TDItoRP.ftl b/TDItoRP.ftl new file mode 100644 index 0000000..b84fa19 --- /dev/null +++ b/TDItoRP.ftl @@ -0,0 +1,61 @@ +<#assign tdiEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + + +<#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) /> +<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> + +{"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}" + + } + ] + } +} \ No newline at end of file From ea7fb2a79341c62dc19017320cd8652990eb56ab Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 10 Oct 2023 09:51:41 +0200 Subject: [PATCH 2/8] test --- TDItoRP.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index b84fa19..afbb401 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -15,7 +15,6 @@ "RefID": "${tdiEvent.HUReference1}" }, - "Payload": {"Events": [ <#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", --> From 3575c6c4a129319ea99449d7bf77566d607175ef Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 11 Oct 2023 10:18:11 +0200 Subject: [PATCH 3/8] update ftl --- TDItoRP.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index afbb401..5644fbd 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -2,7 +2,6 @@ <#assign projectRP = project> <#assign organisationRP = organisation> - <#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) /> <#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> From 8e8cf71b02e74f4f170ed524bb770b201920b412 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 11 Oct 2023 13:56:37 +0200 Subject: [PATCH 4/8] update ftl --- TDItoRP.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index 5644fbd..002f396 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -13,7 +13,6 @@ { "RefID": "${tdiEvent.HUReference1}" }, - "Payload": {"Events": [ <#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", --> From 2a1dfabf4d937af2fde6909657cc5c4fa83246d7 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 11 Oct 2023 15:01:48 +0200 Subject: [PATCH 5/8] update ftl --- TDItoRP.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/TDItoRP.ftl b/TDItoRP.ftl index 002f396..2244531 100644 --- a/TDItoRP.ftl +++ b/TDItoRP.ftl @@ -49,7 +49,6 @@ - "Reason": "${tdiEvent.EventLabel}" } From 1d8daa89a7ede9d826f4110aebea0cda0ebd4ed1 Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Mon, 23 Oct 2023 15:14:15 +0000 Subject: [PATCH 6/8] added version file for release management --- VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..10145c2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.4.0-SNAPSHOT From e0a985f53a8392b8ea7f0d167af2b4b09c0ee1a3 Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Mon, 23 Oct 2023 15:52:54 +0000 Subject: [PATCH 7/8] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 10145c2..6753471 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.0-SNAPSHOT +2.0.0-SNAPSHOT From 62262de63e2274601b38d77d70d508d5bd7cd6b2 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 24 Oct 2023 16:44:04 +0200 Subject: [PATCH 8/8] Release 2.0.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6753471..227cea2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-SNAPSHOT +2.0.0