Merge branch 'master' into CS-10820

ProzorroUKR · Sep 9, 2021 · e652c69 · e652c69
2 parents 6710c15 + c8a524e
commit e652c69
Show file tree

Hide file tree

Showing 469 changed files with 8,079 additions and 6,662 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OpenProcurement Api
+# Prozorro Openprocurement Api
 
 ## Installation
 
@@ -90,3 +90,48 @@ sphinx-intl update -p build/locale -l uk -w 0
 cd docs
 sphinx-intl build
 ```
+
+
+## Related services projects
+
+#### Document service (openprocurement.documentservice)
+
+https://github.com/ProzorroUKR/openprocurement.documentservice
+
+#### Tasks (prozorro_tasks)
+
+Integrations tasks service
+
+https://github.com/ProzorroUKR/prozorro_tasks
+
+#### Auction (prozorro-auction)
+
+Auction service
+
+#### Auctions (openprocurement.auction)
+
+Deprecated auction service
+
+https://github.com/ProzorroUKR/openprocurement.auction
+
+https://github.com/ProzorroUKR/openprocurement.auction.esco
+
+https://github.com/ProzorroUKR/openprocurement.auction.js
+
+https://github.com/ProzorroUKR/openprocurement.auction.esco-js
+
+https://github.com/ProzorroUKR/openprocurement.auction.worker
+
+#### Chronograph (prozorro_chronograph)
+
+Chronograph service
+
+#### Chronograph (openprocurement.chronograph)
+
+Deprecated chronograph service
+
+https://github.com/ProzorroUKR/openprocurement.chronograph
+
+#### Bridges
+
+API data bridges (contracting, competitive dialogue, framework agreement, price quotation)
diff --git a/docs/source/agreements/http/cfaua/example_tender.http b/docs/source/agreements/http/cfaua/example_tender.http
@@ -12,6 +12,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "milestones": [
       {
         "id": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -30,8 +31,8 @@ X-Content-Type-Options: nosniff
     "awardCriteria": "lowestCost",
     "submissionMethod": "electronicAuction",
     "auctionPeriod": {
-      "startDate": "2021-02-27T00:00:00+02:00",
-      "endDate": "2021-02-28T00:00:00+02:00"
+      "startDate": "2021-03-15T23:43:00+02:00",
+      "endDate": "2021-03-15T23:44:00+02:00"
     },
     "awards": [
       {
@@ -66,8 +67,8 @@ X-Content-Type-Options: nosniff
         "bid_id": "a4aaf72182904a549e80dc4d765040a2",
         "lotID": "27c4a15dce034406ba16156354632d9b",
         "complaintPeriod": {
-          "startDate": "2021-02-28T00:00:00+02:00",
-          "endDate": "2021-03-10T00:00:00+02:00"
+          "startDate": "2021-03-15T23:44:00+02:00",
+          "endDate": "2021-03-15T23:54:00+02:00"
         },
         "value": {
           "currency": "UAH",
@@ -107,8 +108,8 @@ X-Content-Type-Options: nosniff
         "bid_id": "2269d0f299644a87bfd73ac8a065c501",
         "lotID": "27c4a15dce034406ba16156354632d9b",
         "complaintPeriod": {
-          "startDate": "2021-02-28T00:00:00+02:00",
-          "endDate": "2021-03-10T00:00:00+02:00"
+          "startDate": "2021-03-15T23:44:00+02:00",
+          "endDate": "2021-03-15T23:54:00+02:00"
         },
         "value": {
           "currency": "UAH",
@@ -148,8 +149,8 @@ X-Content-Type-Options: nosniff
         "bid_id": "5aa54309d515431f8edb45ca63c1d1cd",
         "lotID": "27c4a15dce034406ba16156354632d9b",
         "complaintPeriod": {
-          "startDate": "2021-02-28T00:00:00+02:00",
-          "endDate": "2021-03-10T00:00:00+02:00"
+          "startDate": "2021-03-15T23:44:00+02:00",
+          "endDate": "2021-03-15T23:54:00+02:00"
         },
         "value": {
           "currency": "UAH",
@@ -159,8 +160,8 @@ X-Content-Type-Options: nosniff
       }
     ],
     "awardPeriod": {
-      "startDate": "2021-02-28T00:00:00+02:00",
-      "endDate": "2021-03-10T00:00:00+02:00"
+      "startDate": "2021-03-15T23:44:00+02:00",
+      "endDate": "2021-03-15T23:54:00+02:00"
     },
     "bids": [
       {
@@ -294,9 +295,9 @@ X-Content-Type-Options: nosniff
       }
     ],
     "contractPeriod": {
-      "startDate": "2021-03-10T00:00:00+02:00",
+      "startDate": "2021-03-15T23:54:00+02:00",
       "endDate": "2021-03-16T00:00:00+02:00",
-      "clarificationsUntil": "2021-03-15T00:00:00+02:00"
+      "clarificationsUntil": "2021-03-15T23:59:00+02:00"
     },
     "agreements": [
       {
@@ -471,9 +472,9 @@ X-Content-Type-Options: nosniff
       }
     ],
     "enquiryPeriod": {
-      "startDate": "2021-01-17T00:00:00+02:00",
-      "endDate": "2021-02-07T00:00:00+02:00",
-      "clarificationsUntil": "2021-02-11T00:00:00+02:00"
+      "startDate": "2021-03-15T23:02:00+02:00",
+      "endDate": "2021-03-15T23:23:00+02:00",
+      "clarificationsUntil": "2021-03-15T23:26:00+02:00"
     },
     "items": [
       {
@@ -525,8 +526,8 @@ X-Content-Type-Options: nosniff
         "date": "2021-03-16T00:00:00+02:00",
         "status": "active",
         "auctionPeriod": {
-          "startDate": "2021-02-27T00:00:00+02:00",
-          "endDate": "2021-02-28T00:00:00+02:00"
+          "startDate": "2021-03-15T23:43:00+02:00",
+          "endDate": "2021-03-15T23:44:00+02:00"
         },
         "value": {
           "amount": 500.0,
@@ -566,8 +567,8 @@ X-Content-Type-Options: nosniff
       "kind": "general"
     },
     "qualificationPeriod": {
-      "startDate": "2021-02-17T00:00:00+02:00",
-      "endDate": "2021-02-27T00:00:00+02:00"
+      "startDate": "2021-03-15T23:33:00+02:00",
+      "endDate": "2021-03-15T23:43:00+02:00"
     },
     "qualifications": [
       {
@@ -600,8 +601,8 @@ X-Content-Type-Options: nosniff
     ],
     "status": "complete",
     "tenderPeriod": {
-      "startDate": "2021-01-17T00:00:00+02:00",
-      "endDate": "2021-02-17T00:00:00+02:00"
+      "startDate": "2021-03-15T23:02:00+02:00",
+      "endDate": "2021-03-15T23:33:00+02:00"
     },
     "title_en": "Cases for state awards",
     "value": {
@@ -613,8 +614,8 @@ X-Content-Type-Options: nosniff
     "mainProcurementCategory": "goods",
     "id": "8689dc9146384e6d9697b796fad83213",
     "complaintPeriod": {
-      "startDate": "2021-01-17T00:00:00+02:00",
-      "endDate": "2021-02-13T00:00:00+02:00"
+      "startDate": "2021-03-15T23:02:00+02:00",
+      "endDate": "2021-03-15T23:29:00+02:00"
     },
     "numberOfBids": 3
   }

diff --git a/docs/source/agreements/http/frameworks/post-milestone-disqualification.http b/docs/source/agreements/http/frameworks/post-milestone-disqualification.http
diff --git a/docs/source/centralized-procurements/http/create-tender.http b/docs/source/centralized-procurements/http/create-tender.http
@@ -1,6 +1,6 @@
 POST /api/2.5/tenders HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 4158
+Content-Length: 4213
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -144,6 +144,7 @@ DATA:
         "percentage": 54.45
       }
     ],
+    "procurementMethodDetails": "quick, accelerator=1440",
     "buyers": [
       {
         "identifier": {
@@ -179,6 +180,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2019-05-12T12:00:00+03:00",
     "tenderID": "UA-2019-05-12-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/contracting/http/set-active-award.http b/docs/source/contracting/http/set-active-award.http
@@ -49,7 +49,7 @@ X-Content-Type-Options: nosniff
     "bid_id": "add3b8718ccc49938d52728e195afe7f",
     "complaintPeriod": {
       "startDate": "2021-03-16T00:00:00+02:00",
-      "endDate": "2021-03-18T00:00:00+02:00"
+      "endDate": "2021-03-16T00:02:00+02:00"
     }
   }
 }

diff --git a/docs/source/locale/uk/LC_MESSAGES/agreements/tutorial_frameworks.po b/docs/source/locale/uk/LC_MESSAGES/agreements/tutorial_frameworks.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openprocurement.api 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-08 01:53+0300\n"
+"POT-Creation-Date: 2021-09-09 10:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -69,7 +69,8 @@ msgid "Contract disqualification"
 msgstr "Дискваліфікація контракту"
 
 msgid "Let's see our created mailestone. In our mailestone you can see the ``id``."
-msgstr "Давайте подивимось на створиний майлстон. В ньому міститься ``id``"
+msgstr "Давайте подивимось на створений майлстон. В ньому міститься ``id``"
 
 msgid "When we know ``id`` of our mailestone we can patch contract for disqualification, you just need to patch milestone 'type' : 'activation' to status ``met``:"
-msgstr "Для дискваліфікації використовуючи майлстон ``id`` можно пропатчити контракт з 'type' : 'activation' переводом статус  в ``met``:"
+msgstr "Для дискваліфікації використовуючи майлстон ``id`` можно пропатчити майлстон з 'type' : 'activation' переводом статус  в ``met``:"
+
diff --git a/docs/source/tendering/basic-actions/http/24hours/award-milestone-post.http b/docs/source/tendering/basic-actions/http/24hours/award-milestone-post.http
@@ -19,7 +19,7 @@ X-Content-Type-Options: nosniff
   "data": {
     "id": "b188920cf2604df98db548cf091fe887",
     "code": "24h",
-    "dueDate": "2020-05-03T05:00:00+03:00",
+    "dueDate": "2020-05-02T05:01:00+03:00",
     "description": "One ring to bring them all and in the darkness bind them",
     "date": "2020-05-02T05:00:00+03:00"
   }

diff --git a/docs/source/tendering/basic-actions/http/24hours/award-patch.http b/docs/source/tendering/basic-actions/http/24hours/award-patch.http
@@ -21,7 +21,7 @@ X-Content-Type-Options: nosniff
     {
       "location": "body",
       "name": "data",
-      "description": "Can't change status to 'active' until milestone.dueDate: 2020-05-03T05:00:00+03:00"
+      "description": "Can't change status to 'active' until milestone.dueDate: 2020-05-02T05:01:00+03:00"
     }
   ]
 }

diff --git a/docs/source/tendering/basic-actions/http/24hours/post-doc.http b/docs/source/tendering/basic-actions/http/24hours/post-doc.http
@@ -24,6 +24,7 @@ X-Content-Type-Options: nosniff
     "format": "application/msword",
     "url": "http://lb-api-sandbox.prozorro.gov.ua/api/2.5/tenders/34f1934c957041cfa43be9e7af23ca1d/bids/152e89c2da1947a68adf595ca46d8dce/documents/a89744a3e0014a90b86744639210a385?download=01265147e4f24f6ea5e560fbf578c1e7",
     "documentOf": "tender",
+    "confidentiality": "public",
     "id": "a89744a3e0014a90b86744639210a385",
     "datePublished": "2020-05-02T05:00:01+03:00",
     "dateModified": "2020-05-02T05:00:01+03:00"

diff --git a/docs/source/tendering/basic-actions/http/24hours/put-doc.http b/docs/source/tendering/basic-actions/http/24hours/put-doc.http
@@ -25,7 +25,8 @@ X-Content-Type-Options: nosniff
     "format": "application/msword",
     "url": "http://lb-api-sandbox.prozorro.gov.ua/api/2.5/tenders/34f1934c957041cfa43be9e7af23ca1d/bids/152e89c2da1947a68adf595ca46d8dce/documents/a89744a3e0014a90b86744639210a385?download=fddb39dd595c481e8b47b24009815ba5",
     "documentOf": "tender",
-    "dateModified": "2020-05-02T05:00:01+03:00"
+    "dateModified": "2020-05-02T05:00:01+03:00",
+    "confidentiality": "public"
   }
 }
 
diff --git a/docs/source/tendering/basic-actions/http/24hours/qualification-milestone-post.http b/docs/source/tendering/basic-actions/http/24hours/qualification-milestone-post.http
@@ -19,7 +19,7 @@ X-Content-Type-Options: nosniff
   "data": {
     "id": "4ac90006323f4c3586b51b47a808ede3",
     "code": "24h",
-    "dueDate": "2020-05-03T05:00:20+03:00",
+    "dueDate": "2020-05-02T05:01:20+03:00",
     "description": "One ring to bring them all and in the darkness bind them",
     "date": "2020-05-02T05:00:20+03:00"
   }

diff --git a/docs/source/tendering/basic-actions/http/confidential-documents/document-list-private.http b/docs/source/tendering/basic-actions/http/confidential-documents/document-list-private.http
@@ -37,6 +37,7 @@ X-Content-Type-Options: nosniff
       "format": "application/msword",
       "url": "http://public-docs-sandbox.prozorro.gov.ua/get/b733241fbd1c4542b551b3d5c23e04f9?Signature=yLiAUV50iyFKP6fXrHYOLIqWl4hwG9dCUkqgpB%2F0yuhmDaa4IMZzaWa8Bt%2BMdkyDBnVgwo0ZdoW1JcTz29IwDw%3D%3D&KeyID=a8968c46",
       "documentOf": "tender",
+      "confidentiality": "public",
       "id": "d5d63ecba120473e91a4e4177da19fd6",
       "datePublished": "2021-03-16T00:00:00+02:00",
       "dateModified": "2021-03-16T00:00:00+02:00"

diff --git a/docs/source/tendering/basic-actions/http/confidential-documents/document-list-public.http b/docs/source/tendering/basic-actions/http/confidential-documents/document-list-public.http
@@ -35,6 +35,7 @@ X-Content-Type-Options: nosniff
       "format": "application/msword",
       "url": "http://public-docs-sandbox.prozorro.gov.ua/get/b733241fbd1c4542b551b3d5c23e04f9?Signature=yLiAUV50iyFKP6fXrHYOLIqWl4hwG9dCUkqgpB%2F0yuhmDaa4IMZzaWa8Bt%2BMdkyDBnVgwo0ZdoW1JcTz29IwDw%3D%3D&KeyID=a8968c46",
       "documentOf": "tender",
+      "confidentiality": "public",
       "id": "d5d63ecba120473e91a4e4177da19fd6",
       "datePublished": "2021-03-16T00:00:00+02:00",
       "dateModified": "2021-03-16T00:00:00+02:00"

diff --git a/docs/source/tendering/cfaselectionua/tutorial/activate-bidder.http b/docs/source/tendering/cfaselectionua/tutorial/activate-bidder.http
@@ -1,4 +1,4 @@
-PATCH /api/2.5/tenders/e08a950b18594d05b7c7318066bae24a/bids/c26ef6529df44b02a91cfe5ce527d74f?acc_token=9181c18d1ffd4256a3fff40d32a4c2f6 HTTP/1.0
+PATCH /api/2.5/tenders/e08a950b18594d05b7c7318066bae24a/bids/03e8ecacaef043e9b20f1a36a5279ac7?acc_token=873c24dbb920470291a301faa169ce64 HTTP/1.0
 Authorization: Bearer broker
 Content-Length: 30
 Content-Type: application/json
@@ -19,9 +19,9 @@ X-Content-Type-Options: nosniff
       {
         "name": "Державне управління справами",
         "identifier": {
+          "uri": "http://www.dus.gov.ua/",
           "scheme": "UA-EDR",
-          "id": "00037256",
-          "uri": "http://www.dus.gov.ua/"
+          "id": "00037256"
         },
         "address": {
           "streetAddress": "вул. Банкова, 11, корпус 1",
@@ -31,15 +31,15 @@ X-Content-Type-Options: nosniff
           "countryName": "Україна"
         },
         "contactPoint": {
-          "name": "Державне управління справами",
-          "telephone": "+0440000000"
+          "telephone": "+0440000000",
+          "name": "Державне управління справами"
         },
         "scale": "large"
       }
     ],
-    "date": "2021-03-16T00:00:00+02:00",
-    "id": "c26ef6529df44b02a91cfe5ce527d74f",
     "status": "active",
+    "id": "03e8ecacaef043e9b20f1a36a5279ac7",
+    "date": "2021-03-16T00:00:00+02:00",
     "parameters": [
       {
         "code": "OCDS-123454-AIR-INTAKE",

diff --git a/docs/source/tendering/cfaselectionua/tutorial/active-cancellation.http b/docs/source/tendering/cfaselectionua/tutorial/active-cancellation.http
@@ -21,7 +21,7 @@ X-Content-Type-Options: nosniff
     "status": "active",
     "documents": [
       {
-        "id": "a6209ff5878f408081b385740e32cc48",
+        "id": "a1317c7d25e6431fabfd127d9f68894f",
         "hash": "md5:00000000000000000000000000000000",
         "title": "Notice.pdf",
         "description": "Changed description",
@@ -32,7 +32,7 @@ X-Content-Type-Options: nosniff
         "documentOf": "tender"
       },
       {
-        "id": "a6209ff5878f408081b385740e32cc48",
+        "id": "a1317c7d25e6431fabfd127d9f68894f",
         "hash": "md5:00000000000000000000000000000000",
         "title": "Notice-2.pdf",
         "description": "Changed description",