refs PharmaLedger-IMI#73 - ensure freeze

tgip-work · Apr 18, 2022 · 61b0cf1 · 61b0cf1
1 parent c75ee6d
commit 61b0cf1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/fgt-api/managers/SimpleShipmentManager.js b/fgt-api/managers/SimpleShipmentManager.js
@@ -87,7 +87,7 @@ class SimpleShipmentManager extends Manager {
     _genCompostKey(simpleShipment) {
         let shipmentId;
         const splitShipmentId = `${simpleShipment.shipmentId}`.split('-');
-        if (this.getIdentity().id === simpleShipment.senderId) {
+        if (this.getIdentity().id === simpleShipment.requesterId) {
             if (splitShipmentId.length >= 2)
                 shipmentId = splitShipmentId[splitShipmentId.length - 1];
             else
@@ -96,7 +96,7 @@ class SimpleShipmentManager extends Manager {
             if (splitShipmentId.length >= 2)
                 shipmentId = simpleShipment.shipmentId;
             else
-                shipmentId = `${simpleShipment.senderId}-${simpleShipment.shipmentId}`;
+                shipmentId = `${simpleShipment.requesterId}-${simpleShipment.shipmentId}`;
         }
         return shipmentId;
     }

diff --git a/fgt-api/swagger/docs/MAH.yml b/fgt-api/swagger/docs/MAH.yml
@@ -1866,13 +1866,19 @@ components:
           type:
             - string
 
+    Order:
+      type: string
+      enum:
+        - dsc
+        - asc
+
     Query:
       type: object
       properties:
         keyword:
           type: string
         sort:
-          type: dsc | asc
+          $ref: '#/components/schemas/Order'
 
     Meta:
       type: object

diff --git a/fgt-api/swagger/docs/PHA.yml b/fgt-api/swagger/docs/PHA.yml
@@ -1368,13 +1368,20 @@ components:
           type:
             - string
 
+    Order:
+      type: string
+      enum:
+        - dsc
+        - asc
+
     Query:
       type: object
       properties:
         keyword:
           type: string
         sort:
-          type: dsc | asc
+          $ref: '#/components/schemas/Order'
+
 
     Meta:
       type: object

diff --git a/fgt-api/swagger/docs/WHS.yml b/fgt-api/swagger/docs/WHS.yml
@@ -939,13 +939,20 @@ components:
           type:
             - string
 
+    Order:
+      type: string
+      enum:
+        - dsc
+        - asc
+
     Query:
       type: object
       properties:
         keyword:
           type: string
         sort:
-          type: dsc | asc
+          $ref: '#/components/schemas/Order'
+
 
     Meta:
       type: object

diff --git a/fgt-api/swagger/docs/schemas/schemas.yml b/fgt-api/swagger/docs/schemas/schemas.yml
diff --git a/octopus-freeze.json b/octopus-freeze.json
@@ -900,3 +900,4 @@
 }
 
 
+