From 27a8b65401f75db8193ae3e2c60bcfa3ad09782b Mon Sep 17 00:00:00 2001 From: Olha Zamirets Date: Thu, 11 Apr 2024 14:38:12 +0200 Subject: [PATCH] [CS-16404] Add hasLegalRegulation config --- .../dynamicPurchasingSystem.json | 11 +- .../FrameworkConfig/electronicCatalogue.json | 10 +- .../schema/TenderConfig/aboveThreshold.json | 10 +- .../schema/TenderConfig/aboveThresholdEU.json | 10 +- .../aboveThresholdUA.defense.json | 10 +- .../schema/TenderConfig/aboveThresholdUA.json | 10 +- .../schema/TenderConfig/belowThreshold.json | 23 ++-- .../belowThreshold.nonRegulated.json | 109 ++++++++++++++++++ .../closeFrameworkAgreementSelectionUA.json | 10 +- .../closeFrameworkAgreementUA.json | 10 +- .../TenderConfig/competitiveDialogueEU.json | 10 +- .../competitiveDialogueEU.stage2.json | 10 +- .../TenderConfig/competitiveDialogueUA.json | 10 +- .../competitiveDialogueUA.stage2.json | 10 +- .../TenderConfig/competitiveOrdering.json | 11 +- .../competitiveOrdering.nonRegulated.json | 108 +++++++++++++++++ data_model/schema/TenderConfig/esco.json | 10 +- .../schema/TenderConfig/negotiation.json | 10 +- .../TenderConfig/negotiation.quick.json | 10 +- .../schema/TenderConfig/priceQuotation.json | 10 +- data_model/schema/TenderConfig/reporting.json | 10 +- .../schema/TenderConfig/simple.defense.json | 10 +- 22 files changed, 404 insertions(+), 28 deletions(-) create mode 100644 data_model/schema/TenderConfig/belowThreshold.nonRegulated.json create mode 100644 data_model/schema/TenderConfig/competitiveOrdering.nonRegulated.json diff --git a/data_model/schema/FrameworkConfig/dynamicPurchasingSystem.json b/data_model/schema/FrameworkConfig/dynamicPurchasingSystem.json index 34c95508..2d8816ce 100644 --- a/data_model/schema/FrameworkConfig/dynamicPurchasingSystem.json +++ b/data_model/schema/FrameworkConfig/dynamicPurchasingSystem.json @@ -8,10 +8,19 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true } }, "required": [ - "restrictedDerivatives" + "restrictedDerivatives", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/FrameworkConfig/electronicCatalogue.json b/data_model/schema/FrameworkConfig/electronicCatalogue.json index bf1f5dfa..f2fb2d2d 100644 --- a/data_model/schema/FrameworkConfig/electronicCatalogue.json +++ b/data_model/schema/FrameworkConfig/electronicCatalogue.json @@ -7,10 +7,18 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ - "restrictedDerivatives" + "restrictedDerivatives", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThreshold.json b/data_model/schema/TenderConfig/aboveThreshold.json index d2e1d732..c47a6dd9 100644 --- a/data_model/schema/TenderConfig/aboveThreshold.json +++ b/data_model/schema/TenderConfig/aboveThreshold.json @@ -77,6 +77,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -90,7 +97,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdEU.json b/data_model/schema/TenderConfig/aboveThresholdEU.json index ce221a40..921dd489 100644 --- a/data_model/schema/TenderConfig/aboveThresholdEU.json +++ b/data_model/schema/TenderConfig/aboveThresholdEU.json @@ -77,6 +77,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -90,7 +97,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json index fe394150..31a5f2b8 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json @@ -77,6 +77,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -90,7 +97,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.json b/data_model/schema/TenderConfig/aboveThresholdUA.json index de27cca3..b63903dd 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.json @@ -77,6 +77,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -90,7 +97,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/belowThreshold.json b/data_model/schema/TenderConfig/belowThreshold.json index cc2c9f1c..1297358f 100644 --- a/data_model/schema/TenderConfig/belowThreshold.json +++ b/data_model/schema/TenderConfig/belowThreshold.json @@ -12,31 +12,27 @@ "hasAwardingOrder": { "type": "boolean", "enum": [ - true, - false + true ], "default": true }, "hasValueRestriction": { "type": "boolean", "enum": [ - true, - false + true ], "default": true }, "valueCurrencyEquality": { "type": "boolean", "enum": [ - true, - false + true ], "default": true }, "hasPrequalification": { "type": "boolean", "enum": [ - true, false ], "default": false @@ -44,7 +40,7 @@ "minBidsNumber": { "type": "integer", "minimum": 1, - "maximum": 9, + "maximum": 1, "default": 1 }, "hasPreSelectionAgreement": { @@ -81,6 +77,14 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true } }, "required": [ @@ -94,7 +98,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/belowThreshold.nonRegulated.json b/data_model/schema/TenderConfig/belowThreshold.nonRegulated.json new file mode 100644 index 00000000..99bacb2a --- /dev/null +++ b/data_model/schema/TenderConfig/belowThreshold.nonRegulated.json @@ -0,0 +1,109 @@ +{ + "type": "object", + "properties": { + "hasAuction": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasAwardingOrder": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasValueRestriction": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "valueCurrencyEquality": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasPrequalification": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": false + }, + "minBidsNumber": { + "type": "integer", + "minimum": 1, + "maximum": 9, + "default": 1 + }, + "hasPreSelectionAgreement": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasTenderComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasAwardComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasCancellationComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "restricted": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + } + }, + "required": [ + "hasAuction", + "hasAwardingOrder", + "hasValueRestriction", + "valueCurrencyEquality", + "hasPrequalification", + "minBidsNumber", + "hasPreSelectionAgreement", + "hasTenderComplaints", + "hasAwardComplaints", + "hasCancellationComplaints", + "restricted", + "hasLegalRegulation" + ], + "additionalProperties": false +} diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json index f4d9d7cd..92940b6d 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json index 48ffd1bd..8c3797df 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.json b/data_model/schema/TenderConfig/competitiveDialogueEU.json index 3851bf64..e95a28c4 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json index 566a173d..579900e1 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.json b/data_model/schema/TenderConfig/competitiveDialogueUA.json index 3851bf64..e95a28c4 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json index 500c9186..cf91242b 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveOrdering.json b/data_model/schema/TenderConfig/competitiveOrdering.json index 4637d7fc..3c08dd20 100644 --- a/data_model/schema/TenderConfig/competitiveOrdering.json +++ b/data_model/schema/TenderConfig/competitiveOrdering.json @@ -81,6 +81,14 @@ true ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true } }, "required": [ @@ -94,7 +102,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveOrdering.nonRegulated.json b/data_model/schema/TenderConfig/competitiveOrdering.nonRegulated.json new file mode 100644 index 00000000..d06e0d96 --- /dev/null +++ b/data_model/schema/TenderConfig/competitiveOrdering.nonRegulated.json @@ -0,0 +1,108 @@ +{ + "type": "object", + "properties": { + "hasAuction": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasAwardingOrder": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasValueRestriction": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": false + }, + "valueCurrencyEquality": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasPrequalification": { + "type": "boolean", + "enum": [ + true + ], + "default": true + }, + "minBidsNumber": { + "type": "integer", + "minimum": 1, + "maximum": 9, + "default": 1 + }, + "hasPreSelectionAgreement": { + "type": "boolean", + "enum": [ + true + ], + "default": true + }, + "hasTenderComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasAwardComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasCancellationComplaints": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "restricted": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + } + }, + "required": [ + "hasAuction", + "hasAwardingOrder", + "hasValueRestriction", + "valueCurrencyEquality", + "hasPrequalification", + "minBidsNumber", + "hasPreSelectionAgreement", + "hasTenderComplaints", + "hasAwardComplaints", + "hasCancellationComplaints", + "restricted", + "hasLegalRegulation" + ], + "additionalProperties": false +} diff --git a/data_model/schema/TenderConfig/esco.json b/data_model/schema/TenderConfig/esco.json index 566a173d..579900e1 100644 --- a/data_model/schema/TenderConfig/esco.json +++ b/data_model/schema/TenderConfig/esco.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.json b/data_model/schema/TenderConfig/negotiation.json index e286e8de..f2904bf2 100644 --- a/data_model/schema/TenderConfig/negotiation.json +++ b/data_model/schema/TenderConfig/negotiation.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.quick.json b/data_model/schema/TenderConfig/negotiation.quick.json index e286e8de..f2904bf2 100644 --- a/data_model/schema/TenderConfig/negotiation.quick.json +++ b/data_model/schema/TenderConfig/negotiation.quick.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/priceQuotation.json b/data_model/schema/TenderConfig/priceQuotation.json index 166bcff8..1448307e 100644 --- a/data_model/schema/TenderConfig/priceQuotation.json +++ b/data_model/schema/TenderConfig/priceQuotation.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/reporting.json b/data_model/schema/TenderConfig/reporting.json index 71640176..be41e30f 100644 --- a/data_model/schema/TenderConfig/reporting.json +++ b/data_model/schema/TenderConfig/reporting.json @@ -76,6 +76,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -89,7 +96,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/simple.defense.json b/data_model/schema/TenderConfig/simple.defense.json index fe394150..31a5f2b8 100644 --- a/data_model/schema/TenderConfig/simple.defense.json +++ b/data_model/schema/TenderConfig/simple.defense.json @@ -77,6 +77,13 @@ false ], "default": false + }, + "hasLegalRegulation": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -90,7 +97,8 @@ "hasTenderComplaints", "hasAwardComplaints", "hasCancellationComplaints", - "restricted" + "restricted", + "hasLegalRegulation" ], "additionalProperties": false }