Merge branch 'fix-contracts-mgration-2' into 'master'

Fix contract migration on updating contract remove rogue data from suppliers See merge request cdb/openprocurement.api!928
ProzorroUKR · May 1, 2024 · 19351ee · 19351ee
2 parents 89aff0d + 979e6f5
commit 19351ee
Show file tree

Hide file tree

Showing 25 changed files with 154 additions and 87 deletions.
diff --git a/docs/source/contracting/econtract/http/contract-activate.http b/docs/source/contracting/econtract/http/contract-activate.http
@@ -51,6 +51,7 @@ Content-Type: application/json
         "dateModified": "2023-10-10T01:00:00+03:00"
       }
     ],
+    "bid_owner": "broker",
     "status": "active",
     "buyer": {
       "name": "Державне управління справами",
@@ -73,7 +74,8 @@ Content-Type: application/json
         "iban": "234234234234234",
         "position": "Генеральний директор",
         "authorizedBy": "Статут компанії"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -97,7 +99,8 @@ Content-Type: application/json
           "iban": "111111111111111",
           "position": "Генеральний директор",
           "authorizedBy": "Статут компанії"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -182,7 +185,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-cancelled.http b/docs/source/contracting/econtract/http/contract-cancelled.http
@@ -19,6 +19,7 @@ Content-Type: application/json
       "startDate": "2023-10-10T01:00:00+03:00",
       "endDate": "2024-10-09T01:00:00+03:00"
     },
+    "bid_owner": "broker",
     "status": "cancelled",
     "buyer": {
       "name": "Державне управління справами",
@@ -33,7 +34,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -49,7 +51,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -134,7 +137,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "documents": [
       {
         "hash": "md5:00000000000000000000000000000000",

diff --git a/docs/source/contracting/econtract/http/contract-period.http b/docs/source/contracting/econtract/http/contract-period.http
@@ -29,6 +29,7 @@ Content-Type: application/json
       "startDate": "2023-10-10T01:00:00+03:00",
       "endDate": "2024-10-09T01:00:00+03:00"
     },
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -43,7 +44,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -59,7 +61,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -144,7 +147,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-set-contract-value.http b/docs/source/contracting/econtract/http/contract-set-contract-value.http
@@ -26,6 +26,7 @@ Content-Type: application/json
     "dateCreated": "2023-10-10T01:00:00+03:00",
     "tender_id": "fd45af80ad9f4574994f7f6254012693",
     "owner": "broker",
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -40,7 +41,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -56,7 +58,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -141,7 +144,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-set-contract_items_unit-value.http b/docs/source/contracting/econtract/http/contract-set-contract_items_unit-value.http
@@ -96,6 +96,7 @@ Content-Type: application/json
     "dateCreated": "2023-10-10T01:00:00+03:00",
     "tender_id": "fd45af80ad9f4574994f7f6254012693",
     "owner": "broker",
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -110,7 +111,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -126,7 +128,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -211,7 +214,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-sign-date.http b/docs/source/contracting/econtract/http/contract-sign-date.http
@@ -22,6 +22,7 @@ Content-Type: application/json
     "dateCreated": "2023-10-10T01:00:00+03:00",
     "tender_id": "fd45af80ad9f4574994f7f6254012693",
     "owner": "broker",
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -36,7 +37,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -52,7 +54,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -137,7 +140,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-termination.http b/docs/source/contracting/econtract/http/contract-termination.http
@@ -116,6 +116,7 @@ Content-Type: application/json
       "amountNet": 420.0,
       "valueAddedTaxIncluded": true
     },
+    "bid_owner": "broker",
     "status": "terminated",
     "buyer": {
       "name": "Державне управління справами",
@@ -138,7 +139,8 @@ Content-Type: application/json
         "iban": "234234234234234",
         "position": "Генеральний директор",
         "authorizedBy": "Статут компанії"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -162,7 +164,8 @@ Content-Type: application/json
           "iban": "111111111111111",
           "position": "Генеральний директор",
           "authorizedBy": "Статут компанії"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -247,7 +250,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 430.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/contract-view.http b/docs/source/contracting/econtract/http/contract-view.http
@@ -23,7 +23,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "owner": "broker",
@@ -117,7 +118,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "value": {
       "amount": 500.0,

diff --git a/docs/source/contracting/econtract/http/contracts-patch.http b/docs/source/contracting/econtract/http/contracts-patch.http
@@ -81,6 +81,7 @@ Content-Type: application/json
         "dateModified": "2023-10-10T01:00:00+03:00"
       }
     ],
+    "bid_owner": "broker",
     "status": "active",
     "buyer": {
       "name": "Державне управління справами",
@@ -103,7 +104,8 @@ Content-Type: application/json
         "iban": "234234234234234",
         "position": "Генеральний директор",
         "authorizedBy": "Статут компанії"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -127,7 +129,8 @@ Content-Type: application/json
           "iban": "111111111111111",
           "position": "Генеральний директор",
           "authorizedBy": "Статут компанії"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -212,7 +215,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 430.0
     },
-    "bid_owner": "broker",
     "id": "eb4343b446004f47aa2ec7f6e542f196"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/deprecated-contract-credentials.http b/docs/source/contracting/econtract/http/deprecated-contract-credentials.http
@@ -20,6 +20,7 @@ Content-Type: application/json
       "startDate": "2023-10-10T01:00:00+03:00",
       "endDate": "2024-10-09T01:00:00+03:00"
     },
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -34,7 +35,8 @@ Content-Type: application/json
         "region": "м. Київ",
         "postalCode": "01220",
         "countryName": "Україна"
-      }
+      },
+      "kind": "general"
     },
     "suppliers": [
       {
@@ -50,7 +52,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -135,7 +138,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 230.0
     },
-    "bid_owner": "broker",
     "documents": [
       {
         "hash": "md5:00000000000000000000000000000000",

diff --git a/docs/source/contracting/econtract/http/patch-1st-contract-value.http b/docs/source/contracting/econtract/http/patch-1st-contract-value.http
@@ -25,6 +25,7 @@ Content-Type: application/json
     "dateCreated": "2023-10-10T01:00:00+03:00",
     "tender_id": "d1c99512210a440d8816081d0616ce15",
     "owner": "broker",
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -50,7 +51,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -99,7 +101,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 95.0
     },
-    "bid_owner": "broker",
     "id": "b012ef6406db4551936e6b0005aa2cef"
   },
   "config": {

diff --git a/docs/source/contracting/econtract/http/patch-2nd-contract-value.http b/docs/source/contracting/econtract/http/patch-2nd-contract-value.http
@@ -25,6 +25,7 @@ Content-Type: application/json
     "dateCreated": "2023-10-10T01:00:00+03:00",
     "tender_id": "d1c99512210a440d8816081d0616ce15",
     "owner": "broker",
+    "bid_owner": "broker",
     "status": "pending",
     "buyer": {
       "name": "Державне управління справами",
@@ -50,7 +51,8 @@ Content-Type: application/json
           "region": "м. Київ",
           "postalCode": "01220",
           "countryName": "Україна"
-        }
+        },
+        "scale": "micro"
       }
     ],
     "items": [
@@ -137,7 +139,6 @@ Content-Type: application/json
       "valueAddedTaxIncluded": true,
       "amountNet": 190.0
     },
-    "bid_owner": "broker",
     "id": "e10f210fba404f15a6d1228023fd9fc1"
   },
   "config": {