Merge pull request #102 from ProzorroUKR/dev

Add duration and other configs. Change lots value/minimalStep
ProzorroUKR · Sep 4, 2024 · 7b7724f · 7b7724f
2 parents 83a93a3 + 6a1cdbe
commit 7b7724f
Show file tree

Hide file tree

Showing 23 changed files with 423 additions and 202 deletions.
diff --git a/procedure_tools/data/aboveThreshold.features/2000_tender_create.json b/procedure_tools/data/aboveThreshold.features/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": false,
+    "tenderComplainRegulation": 3,
+    "qualificationComplainDuration": 0,
+    "awardComplainDuration": 5,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 0
   },
   "data": {
     "features": [
@@ -160,6 +168,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -233,10 +251,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThreshold",
     "mode": "test",
     "procuringEntity": {
@@ -268,10 +282,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json b/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": false,
+    "tenderComplainRegulation": 3,
+    "qualificationComplainDuration": 0,
+    "awardComplainDuration": 5,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 0
   },
   "data": {
     "awardCriteria": "lifeCycleCost",
@@ -115,6 +123,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -188,10 +206,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThreshold",
     "mode": "test",
     "procuringEntity": {
@@ -223,10 +237,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThreshold/2000_tender_create.json b/procedure_tools/data/aboveThreshold/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": false,
+    "tenderComplainRegulation": 3,
+    "qualificationComplainDuration": 0,
+    "awardComplainDuration": 5,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 0
   },
   "data": {
     "items": [
@@ -114,6 +122,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -187,10 +205,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThreshold",
     "mode": "test",
     "procuringEntity": {
@@ -222,10 +236,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": true,
+    "tenderComplainRegulation": 4,
+    "qualificationComplainDuration": 5,
+    "awardComplainDuration": 10,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 20
   },
   "data": {
     "features": [
@@ -193,6 +201,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -285,10 +303,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThresholdEU",
     "mode": "test",
     "procuringEntity": {
@@ -324,10 +338,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": true,
+    "tenderComplainRegulation": 4,
+    "qualificationComplainDuration": 5,
+    "awardComplainDuration": 10,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 20
   },
   "data": {
     "awardCriteria": "lifeCycleCost",
@@ -148,6 +156,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -240,10 +258,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThresholdEU",
     "mode": "test",
     "procuringEntity": {
@@ -279,10 +293,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThresholdEU/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": true,
+    "tenderComplainRegulation": 4,
+    "qualificationComplainDuration": 5,
+    "awardComplainDuration": 10,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 20
   },
   "data": {
     "items": [
@@ -147,6 +155,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -239,10 +257,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThresholdEU",
     "mode": "test",
     "procuringEntity": {
@@ -278,10 +292,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }
diff --git a/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json b/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json
@@ -10,7 +10,15 @@
     "hasTenderComplaints": true,
     "hasAwardComplaints": true,
     "hasCancellationComplaints": true,
-    "restricted": false
+    "restricted": false,
+    "hasValueEstimation": true,
+    "hasQualificationComplaints": false,
+    "tenderComplainRegulation": 4,
+    "qualificationComplainDuration": 0,
+    "awardComplainDuration": 10,
+    "cancellationComplainDuration": 10,
+    "clarificationUntilDuration": 3,
+    "qualificationDuration": 0
   },
   "data": {
     "features": [
@@ -193,6 +201,16 @@
         }
       }
     ],
+    "value": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
+    "minimalStep": {
+      "amount": 0,
+      "currency": "UAH",
+      "valueAddedTaxIncluded": true
+    },
     "lots": [
       {
         "description": "Опис Лот №1",
@@ -285,10 +303,6 @@
         "type": "financing"
       }
     ],
-    "minimalStep": {
-      "amount": 10,
-      "currency": "UAH"
-    },
     "procurementMethodType": "aboveThresholdUA",
     "mode": "test",
     "procuringEntity": {
@@ -320,10 +334,6 @@
       "endDate": "{{ from_now_iso(days=30) }}"
     },
     "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)",
-    "title_en": "Procurement item test description in procedure title (created with procedure_tools)",
-    "value": {
-      "amount": 500,
-      "currency": "UAH"
-    }
+    "title_en": "Procurement item test description in procedure title (created with procedure_tools)"
   }
 }