From f7f966e145e12e5f96b7bcfda7bbe9070f2480f3 Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW <110662017+zhiyaoPCCW@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:20:27 +0800 Subject: [PATCH] fix completionDate issue (#213) Co-authored-by: zhiyaoPCCW --- .../api-target-mapper.order.eline.read.delete.yaml | 4 ++-- .../api-target-mapper.order.eline.read.yaml | 4 ++-- .../api-target-mapper.order.uni.read.delete.yaml | 4 ++-- .../api-target-mapper.order.uni.read.yaml | 4 ++-- .../api-targets/api-target.order.eline.read.delete.yaml | 3 --- .../api-targets/api-target.order.eline.read.yaml | 3 --- .../api-targets/api-target.order.uni.read.delete.yaml | 3 --- .../mef-sonata/api-targets/api-target.order.uni.read.yaml | 3 --- .../src/main/resources/mef-sonata/product.yaml | 2 +- .../{release.1.5.17.yaml => release.1.5.18.yaml} | 8 ++++---- 10 files changed, 13 insertions(+), 25 deletions(-) rename kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/{release.1.5.17.yaml => release.1.5.18.yaml} (51%) diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml index eaa5a869..5213b5c1 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml @@ -78,7 +78,7 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].completeDate}}" + target: "@{{productOrderItem[0].completionDate}}" targetLocation: "BODY" requiredMapping: false - name: mapper.order.eline.read.delete.productOrderItem.expectedCompleteDate @@ -86,6 +86,6 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].expectedCompleteDate}}" + target: "@{{productOrderItem[0].expectedCompletionDate}}" targetLocation: "BODY" requiredMapping: false \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml index 71c421fb..c7ee3094 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml @@ -79,7 +79,7 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].completeDate}}" + target: "@{{productOrderItem[0].completionDate}}" targetLocation: "BODY" requiredMapping: false - name: mapper.order.eline.read.productOrderItem.expectedCompleteDate @@ -87,6 +87,6 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].expectedCompleteDate}}" + target: "@{{productOrderItem[0].expectedCompletionDate}}" targetLocation: "BODY" requiredMapping: false \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml index f36a1cc5..07ca3b48 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml @@ -79,7 +79,7 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].completeDate}}" + target: "@{{productOrderItem[0].completionDate}}" targetLocation: "BODY" requiredMapping: false - name: mapper.order.uni.read.delete.productOrderItem.expectedCompleteDate @@ -87,6 +87,6 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].expectedCompleteDate}}" + target: "@{{productOrderItem[0].expectedCompletionDate}}" targetLocation: "BODY" requiredMapping: false \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml index d02c5a6d..01df688a 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml @@ -80,7 +80,7 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].completeDate}}" + target: "@{{productOrderItem[0].completionDate}}" targetLocation: "BODY" requiredMapping: false - name: mapper.order.uni.read.productOrderItem.expectedCompleteDate @@ -88,6 +88,6 @@ spec: description: "" source: "" sourceLocation: "BODY" - target: "@{{productOrderItem[0].expectedCompleteDate}}" + target: "@{{productOrderItem[0].expectedCompletionDate}}" targetLocation: "BODY" requiredMapping: false \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml index abb99e7f..58524c43 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml @@ -53,8 +53,6 @@ spec: "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}", "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}", "charge": "${entity.renderedResponse.productOrderItem[0].charge}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", - "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}", "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}", "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}", @@ -65,6 +63,5 @@ spec: "orderDate":"${entity.renderedResponse.orderDate}", "state": "", "orderId": "${entity.renderedResponse.orderId}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "instanceId": "" } \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml index a333439f..a1790c8b 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml @@ -52,8 +52,6 @@ spec: "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}", "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}", "charge": "${entity.renderedResponse.productOrderItem[0].charge}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", - "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}", "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}", "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}", @@ -64,6 +62,5 @@ spec: "orderDate":"${entity.renderedResponse.orderDate}", "state": "", "orderId": "${entity.renderedResponse.orderId}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "instanceId": "" } \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml index bc1b6f4e..b18b8ce2 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml @@ -53,8 +53,6 @@ spec: "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}", "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}", "charge": "${entity.renderedResponse.productOrderItem[0].charge}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", - "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}", "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}", "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}", @@ -65,6 +63,5 @@ spec: "orderDate":"${entity.renderedResponse.orderDate}", "state": "", "orderId": "${entity.renderedResponse.orderId}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "instanceId": "" } \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml index 59e32bf8..a28f8822 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml @@ -52,8 +52,6 @@ spec: "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}", "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}", "charge": "${entity.renderedResponse.productOrderItem[0].charge}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", - "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}", "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}", "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}", @@ -64,6 +62,5 @@ spec: "orderDate":"${entity.renderedResponse.orderDate}", "state": "", "orderId": "${entity.renderedResponse.orderId}", - "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "instanceId": "" } \ No newline at end of file diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml index 5cb5f92c..3dc82ce0 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml @@ -98,7 +98,7 @@ spec: - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.eline.read.yaml - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.uni.list.yaml - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.eline.list.yaml - - classpath:/mef-sonata/template-upgrade/release.1.5.17.yaml + - classpath:/mef-sonata/template-upgrade/release.1.5.18.yaml templateUpgradePaths: diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.17.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.18.yaml similarity index 51% rename from kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.17.yaml rename to kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.18.yaml index 513c87d4..36940696 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.17.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.18.yaml @@ -2,12 +2,12 @@ kind: kraken.product.template-upgrade apiVersion: v1 metadata: - key: kraken.product.template-upgrade.1.5.17 - name: V1.5.17 + key: kraken.product.template-upgrade.1.5.18 + name: V1.5.18 labels: productSpec: grace - productVersion: V1.5.17 + productVersion: V1.5.18 publishDate: 2024-11-20 description: | - Added negative validation for price value in quote list + Remove completionDate logic in kraken version: 2 \ No newline at end of file