fix completionDate issue (#213)

Co-authored-by: zhiyaoPCCW <[email protected]>
mycloudnexus · Nov 20, 2024 · f7f966e · f7f966e
1 parent d31eec6
commit f7f966e
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 25 deletions.
diff --git a/...n/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml b/...n/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
@@ -78,14 +78,14 @@ 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
             title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].expectedCompleteDate}}"
+            target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
diff --git a/...src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml b/...src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml
@@ -79,14 +79,14 @@ spec:
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].completeDate}}"
+            target: "@{{productOrderItem[0].completionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.eline.read.productOrderItem.expectedCompleteDate
             title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].expectedCompleteDate}}"
+            target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
diff --git a/...ain/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml b/...ain/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
@@ -79,14 +79,14 @@ 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
             title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].expectedCompleteDate}}"
+            target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
diff --git a/...f/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml b/...f/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml
@@ -80,14 +80,14 @@ spec:
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].completeDate}}"
+            target: "@{{productOrderItem[0].completionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
           - name: mapper.order.uni.read.productOrderItem.expectedCompleteDate
             title: "order item expected complete date"
             description: ""
             source: ""
             sourceLocation: "BODY"
-            target: "@{{productOrderItem[0].expectedCompleteDate}}"
+            target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
             requiredMapping: false
diff --git a/...sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml b/...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": ""
         }
diff --git a/...n-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml b/...n-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": ""
         }
diff --git a/...a-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml b/...a-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": ""
         }
diff --git a/...ken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml b/...ken-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": ""
         }
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
@@ -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/...nata/template-upgrade/release.1.5.17.yaml → ...nata/template-upgrade/release.1.5.18.yaml b/...nata/template-upgrade/release.1.5.17.yaml → ...nata/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