From bb2174a8bd73a6843b57b2039c465f451882ac84 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 27 Feb 2026 16:27:33 +0100 Subject: [PATCH] SCPN1-10253 --- RFXtoRP_PlatformLogCreate.ftl | 82 +++++++++++++++++------------------ RFXtoRP_RestResponse.ftl | 22 +++++++++- 2 files changed, 61 insertions(+), 43 deletions(-) diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index f48b2b9..e38863f 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -1,42 +1,42 @@ -<#include "HfRpConfig.ftl"> -[ - <#assign UUID = UUID.randomUUID()> - <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${UUID}", - "RefDate": { - "DateTime": "${aDateTime?iso_utc}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - <#assign severity = SeverityLevel.ERROR> - "Severity": "${severity}", - "Namespace": "ReflexIntegration", - "DateTime": { - "DateTime": "${aDateTime?iso_utc}", - "AuthorTimeZone": "${time_zone_rfx}" - }, - "TechMessage": { - "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody} - }, - "UserMessage": { - "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody}, - "Params": [] - }, - "DetailElements": [], - "CorrelationID": "${id.correlationid!"no Correlationid"}", - "ContextPayload": ${strJsonBody}, - "Type": "RP_EXECUTIONFLOW_EVENT", - "Task": "${id.apiRestReflexID!"no Task"}", - "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", - "StackTrace": "" - } - } +<#include "HfRpConfig.ftl"> +[ + <#assign UUID = UUID.randomUUID()> + <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${UUID}", + "RefDate": { + "DateTime": "${aDateTime?iso_utc}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + <#assign severity = SeverityLevel.ERROR> + "Severity": "${severity}", + "Namespace": "ReflexIntegration", + "DateTime": { + "DateTime": "${aDateTime?iso_utc}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "TechMessage": { + "Code": "${restResponsetMsg.status!"no Code"}", + "Label": ${strJsonBody} + }, + "UserMessage": { + "Code": "${restResponsetMsg.status!"no Code"}", + "Label": ${strJsonBody}, + "Params": [] + }, + "DetailElements": [], + "CorrelationID": "${id.correlationid!"no Correlationid"}", + "ContextPayload": ${strJsonBody}, + "Type": ${event}, + "Task": "${id.apiRestReflexID!"no Task"}", + "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", + "StackTrace": "" + } + } ] \ No newline at end of file diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 70928b3..2a29aeb 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -12,7 +12,7 @@ <#assign aDateTime = .now> <#assign no_apiRestReflexID = "no apiRestReflexID"> <#assign no_status = -99999> - +<#assign event = "UNKNOW_EVENT" > <#switch id.apiRestReflexID!no_apiRestReflexID> <#case no_apiRestReflexID> @@ -25,7 +25,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : + "datas" : <#include "RFXtoRP_PlatformLogCreate.ftl"> } ] @@ -44,6 +44,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -84,6 +85,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT"> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -107,6 +109,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -132,6 +135,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -162,6 +166,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -184,6 +189,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_EXECUTIONFLOW_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -209,6 +215,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -236,6 +243,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -258,6 +266,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -284,6 +293,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -311,6 +321,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -333,6 +344,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -359,6 +371,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -386,6 +399,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -408,6 +422,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -436,6 +451,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -463,6 +479,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, { @@ -485,6 +502,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : + <#assign event = "RP_APPOINTMENT_EVENT" /> <#include "RFXtoRP_PlatformLogCreate.ftl"> }, {