[MODORDERS-944/MODORDERS-948/MODFIN-333] - BE - Added donor info to F…

…und and POL and receiving statuses for piece (#426) * [MODORDERS-944/MODORDERS-948/MODFIN-333] BE - Added donor info to Fund, POL and added new receiving statuses for piece to schema * [MODORDERS-944/MODORDERS-948/MODFIN-333] BE - Added donor info to Fund and POL and receiving statuses for piece * [MODORDERS-944/MODORDERS-948/MODFIN-333] - added index * [MODORDERS-944/MODORDERS-948/MODFIN-333] - minor improvement * [MODORDERS-944/MODORDERS-948/MODFIN-333] - minor improvement
folio-org · Oct 20, 2023 · 60f5255 · 60f5255
1 parent 08bbc65
commit 60f5255
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 4 deletions.
diff --git a/mod-finance/examples/fund.sample b/mod-finance/examples/fund.sample
@@ -18,6 +18,10 @@
     "1895e539-8dac-441e-b1f5-aab62b3fde60",
     "47f504bd-0c1b-498e-a2ae-e2f0a0cea273"
   ],
+  "donorOrganizationIds": [
+    "d926d900-e27d-46d6-bba8-31e9d5c2cf44",
+    "077274ad-6b4f-4c28-9779-6d381e7a1ca1"
+  ],
   "tags": {
     "tagList": [
       "tag"

diff --git a/mod-finance/schemas/fund.json b/mod-finance/schemas/fund.json
@@ -67,6 +67,14 @@
         "$ref": "../../common/schemas/uuid.json"
       }
     },
+    "donorOrganizationIds": {
+      "description": "donor organization ids associated with this fund",
+      "type": "array",
+      "items": {
+        "description": "UUID of an donor organization record",
+        "$ref": "../../common/schemas/uuid.json"
+      }
+    },
     "tags": {
       "type" : "object",
       "description": "arbitrary tags associated with this fund",

diff --git a/mod-orders-storage/examples/piece_collection.sample b/mod-orders-storage/examples/piece_collection.sample
@@ -16,7 +16,7 @@
         "discoverySuppress": false,
         "copyNumber": "175143",
         "receiptDate": "2020-01-10T00:00:00.000Z",
-        "receivingStatus": "Expected",
+        "receivingStatus": "Unreceivable",
         "supplement": true
      },
      {
@@ -51,7 +51,7 @@
         "chronology": "2022",
         "discoverySuppress": true,
         "copyNumber": "108572",
-        "receivingStatus": "Received",
+        "receivingStatus": "Late",
         "supplement": true,
         "receiptDate": "2018-10-11T00:00:00.000Z",
         "receivedDate": "2018-10-10T00:00:00.000Z"

diff --git a/mod-orders-storage/examples/piece_post.sample b/mod-orders-storage/examples/piece_post.sample
@@ -11,7 +11,7 @@
   "chronology": "2021",
   "discoverySuppress": false,
   "copyNumber": "94753",
-  "receivingStatus": "Expected",
+  "receivingStatus": "Claim delayed",
   "supplement": true,
   "receiptDate": "2018-10-11T00:00:00.000Z"
 }
diff --git a/mod-orders-storage/examples/po_line_collection.sample b/mod-orders-storage/examples/po_line_collection.sample
@@ -52,6 +52,10 @@
           "subscriptionTo": "2020-10-09T00:00:00.000Z"
         },
         "donor": "ABCDEFGHIJKLM",
+        "donorOrganizationIds": [
+          "d926d900-e27d-46d6-bba8-31e9d5c2cf44",
+          "077274ad-6b4f-4c28-9779-6d381e7a1ca1"
+        ],
         "eresource": {
           "accessProvider": "ba3f3d45-247d-41f6-8dc9-6488adcad329",
           "activated": false,

diff --git a/mod-orders-storage/examples/po_line_get.sample b/mod-orders-storage/examples/po_line_get.sample
@@ -53,6 +53,10 @@
     "subscriptionTo": "2020-10-09T00:00:00.000Z"
   },
   "donor": "ABCDEFGHIJKLM",
+  "donorOrganizationIds": [
+    "d926d900-e27d-46d6-bba8-31e9d5c2cf44",
+    "077274ad-6b4f-4c28-9779-6d381e7a1ca1"
+  ],
   "eresource": {
     "accessProvider": "ba3f3d45-247d-41f6-8dc9-6488adcad329",
     "activated": false,

diff --git a/mod-orders-storage/examples/po_line_post.sample b/mod-orders-storage/examples/po_line_post.sample
@@ -49,6 +49,10 @@
     "subscriptionTo": "2020-10-09T00:00:00.000Z"
   },
   "donor": "ABCDEFGHIJKLM",
+  "donorOrganizationIds": [
+    "d926d900-e27d-46d6-bba8-31e9d5c2cf44",
+    "077274ad-6b4f-4c28-9779-6d381e7a1ca1"
+  ],
   "fundDistribution": [
     {
       "code": "HIST",

diff --git a/mod-orders-storage/schemas/piece.json b/mod-orders-storage/schemas/piece.json
@@ -66,7 +66,11 @@
       "type": "string",
       "enum": [
         "Received",
-        "Expected"
+        "Expected",
+        "Late",
+        "Claim delayed",
+        "Claim sent",
+        "Unreceivable"
       ],
       "default": "Expected"
     },

diff --git a/mod-orders-storage/schemas/po_line.json b/mod-orders-storage/schemas/po_line.json
@@ -90,6 +90,14 @@
       "description": "the donor contributing to this purchase order line",
       "type": "string"
     },
+    "donorOrganizationIds": {
+      "description": "donor organization ids associated with this fund",
+      "type": "array",
+      "items": {
+        "description": "UUID of an donor organization record",
+        "$ref": "../../common/schemas/uuid.json"
+      }
+    },
     "eresource": {
       "description": "eresource record",
       "type": "object",

diff --git a/mod-orders/examples/composite_po_line.sample b/mod-orders/examples/composite_po_line.sample
@@ -56,6 +56,10 @@
     "subscriptionTo": "2020-10-09T00:00:00.000Z"
   },
   "donor": "ABCDEFGHIJKLM",
+  "donorOrganizationIds": [
+    "d926d900-e27d-46d6-bba8-31e9d5c2cf44",
+    "077274ad-6b4f-4c28-9779-6d381e7a1ca1"
+  ],
   "eresource": {
     "activated": false,
     "activationDue": 10,

diff --git a/mod-orders/schemas/composite_po_line.json b/mod-orders/schemas/composite_po_line.json
@@ -96,6 +96,14 @@
       "description": "the donor contributing to this purchase order line",
       "type": "string"
     },
+    "donorOrganizationIds": {
+      "description": "donor organization ids associated with this fund",
+      "type": "array",
+      "items": {
+        "description": "UUID of an donor organization record",
+        "$ref": "../../common/schemas/uuid.json"
+      }
+    },
     "eresource": {
       "description": "eresource-related details of this purchase order line",
       "type": "object",