SCPN1-9007

This commit is contained in:
Francis REAT 2025-07-04 10:47:44 +02:00
parent 95f67c4c0c
commit 1e77bbdaf6
6 changed files with 123 additions and 152 deletions

View File

@ -1,4 +1,4 @@
# tdi-connector # tdi-connector
You can find more info about tdi-connector in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/tdi-connector/ You can find more info about tdi-connector in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/tdi-connector/

View File

@ -5,68 +5,33 @@
<#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) /> <#assign tdiEvent64b = JsonUtil.decodeBase64(tdiEventMsg.data) />
<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> <#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
<#assign senderTag = tdiEventMsg.senderTag> <#assign senderTag = tdiEventMsg.senderTag>
<#if tdiEvent.Target == 0 || (tdiEvent.Target == 1 && tdiEvent.ParcelNumber?? && tdiEvent.ParcelNumber == "")>
<#-- Target = 0 : Expedition , Target = 1 : Colis --> <#stop>
<#if tdiEvent.Target == 0 || (tdiEvent.Target == 1 && tdiEvent.ParcelNumber?? && tdiEvent.ParcelNumber == "")> <#else>
<#stop > [
<#else> {
{"Header": <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingNotified>
{ "apiReflexPlatformID" : "${apiReflexPlatformID}",
"ProjectID": "${projectRP}" "datas" :
}, <#include "TDItoRP_TrackingNotified.ftl">
"ID": }
{ <#if tdiEvent.EstimatedDeliveryDate?? && tdiEvent.EstimatedDeliveryDate!="">
"RefID": "${tdiEvent.ParcelNumber}" ,
}, {
"Payload": <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingETAUpdated>
{"Events": [ "apiReflexPlatformID" : "${apiReflexPlatformID}",
<#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", --> "datas" :
{"Date": {"DateTime": "${tdiEvent.EventDate}", <#include "TDItoRP_TrackingETAUpdated.ftl">
"AuthorTimeZone": "UTC" }
}, </#if>
<#if tdiEvent.EventCode == "OK-COLLECTED" || <#if tdiEvent.TrackingUrl?? && tdiEvent.TrackingUrl!="">
tdiEvent.EventCode == "OK-EDI" || ,
tdiEvent.EventCode == "OK-APPT-DATE" || {
tdiEvent.EventCode == "OK-APPT-NOTI" || <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingURLUpdated>
tdiEvent.EventCode == "OK-APPT-NEED" || "apiReflexPlatformID" : "${apiReflexPlatformID}",
tdiEvent.EventCode == "ADM" || "datas" :
tdiEvent.EventCode == "RGP" > <#include "TDItoRP_TrackingURLUpdated.ftl">
"Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier --> }
<#else> </#if>
<#if tdiEvent.EventCode?starts_with("TA") > ]
"Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery --> </#if>
<#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 == "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>
"Code": "TRACKING_EVENT_UNKNOWN",
</#if>
</#if>
</#if>
</#if>
</#if>
"Reason": "${tdiEvent.EventLabel}"
}
]
}
}
</#if>

View File

@ -1,20 +1,22 @@
{ [
"Header": { {
"ProjectID": "${projectRP}" "Header": {
}, "ProjectID": "${projectRP}"
"ID": { },
"RefID": "${tdiEvent.ParcelNumber}" "ID": {
}, "RefID": "${tdiEvent.ParcelNumber}"
"Payload": { },
"TrackingETA": { "Payload": {
"EndETA": { "TrackingETA": {
"AuthorTimeZone": "Europe/Paris", "EndETA": {
"DateTime": "2023-01-01T00:00:00Z" "AuthorTimeZone": "Europe/Paris",
}, "DateTime": "2023-01-01T00:00:00Z"
"StartETA": { },
"AuthorTimeZone": "Europe/Paris", "StartETA": {
"DateTime": "2023-01-01T00:00:00Z" "AuthorTimeZone": "Europe/Paris",
"DateTime": "2023-01-01T00:00:00Z"
}
} }
} }
} }
} ]

View File

@ -1,62 +1,64 @@
{ [
"Header":
{ {
"ProjectID": "${projectRP}" "Header":
}, {
"ID": "ProjectID": "${projectRP}"
{ },
"RefID": "${tdiEvent.ParcelNumber}" "ID":
}, {
"Payload": "RefID": "${tdiEvent.ParcelNumber}"
{ },
"Events": [ "Payload":
<#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", --> {
{ "Events": [
"Date": { <#-- {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
"DateTime": "${tdiEvent.EventDate}", {
"AuthorTimeZone": "UTC" "Date": {
}, "DateTime": "${tdiEvent.EventDate}",
<#if tdiEvent.EventCode == "OK-COLLECTED" || "AuthorTimeZone": "UTC"
tdiEvent.EventCode == "OK-EDI" || },
tdiEvent.EventCode == "OK-APPT-DATE" || <#if tdiEvent.EventCode == "OK-COLLECTED" ||
tdiEvent.EventCode == "OK-APPT-NOTI" || tdiEvent.EventCode == "OK-EDI" ||
tdiEvent.EventCode == "OK-APPT-NEED" || tdiEvent.EventCode == "OK-APPT-DATE" ||
tdiEvent.EventCode == "ADM" || tdiEvent.EventCode == "OK-APPT-NOTI" ||
tdiEvent.EventCode == "RGP" > tdiEvent.EventCode == "OK-APPT-NEED" ||
"Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier --> tdiEvent.EventCode == "ADM" ||
<#else> tdiEvent.EventCode == "RGP" >
<#if tdiEvent.EventCode?starts_with("TA") > "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier -->
"Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery --> <#else>
<#else> <#if tdiEvent.EventCode?starts_with("TA") >
<#if tdiEvent.EventCode?starts_with("T-") == true || "Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery -->
tdiEvent.EventCode?starts_with("TD") == true || <#else>
tdiEvent.EventCode == "OK-OUT-FOR-D" || <#if tdiEvent.EventCode?starts_with("T-") == true ||
tdiEvent.EventCode == "OK-IN-TRANST" > tdiEvent.EventCode?starts_with("TD") == true ||
"Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress --> tdiEvent.EventCode == "OK-OUT-FOR-D" ||
<#else> tdiEvent.EventCode == "OK-IN-TRANST" >
<#if tdiEvent.EventCode?starts_with("D-") == true || "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress -->
tdiEvent.EventCode == "OK-DELIVERED" ||
tdiEvent.EventCode == "POD" ||
tdiEvent.EventCode == "FAC" ||
tdiEvent.EventCode == "OK-WITHDRAWA" >
"Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
<#else> <#else>
<#if tdiEvent.EventCode?starts_with("DC") == true || <#if tdiEvent.EventCode?starts_with("D-") == true ||
tdiEvent.EventCode?starts_with("DN") == true || tdiEvent.EventCode == "OK-DELIVERED" ||
tdiEvent.EventCode?starts_with("DR") == true || tdiEvent.EventCode == "POD" ||
tdiEvent.EventCode?starts_with("C-") == true || tdiEvent.EventCode == "FAC" ||
tdiEvent.EventCode == "SUP" || tdiEvent.EventCode == "OK-WITHDRAWA" >
tdiEvent.EventCode == "NEX" > "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
"Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed -->
<#else> <#else>
"Code": "TRACKING_EVENT_UNKNOWN", <#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>
"Code": "TRACKING_EVENT_UNKNOWN",
</#if>
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#if> "Reason": "${tdiEvent.EventLabel}"
"Reason": "${tdiEvent.EventLabel}" }
} ]
] }
} }
} ]

View File

@ -1,11 +1,13 @@
{ [
"Header": { {
"ProjectID": "${projectRP}" "Header": {
}, "ProjectID": "${projectRP}"
"ID": { },
"RefID": "${tdiEvent.ParcelNumber}" "ID": {
}, "RefID": "${tdiEvent.ParcelNumber}"
"Payload": { },
"TrackingURL": "${tdiEvent.TrackingUrl}" "Payload": {
"TrackingURL": "${tdiEvent.TrackingUrl}"
}
} }
} ]

View File

@ -1 +1 @@
2.1.0-SNAPSHOT 2.1.0-SNAPSHOT