Skip to content

Commit

Permalink
Merge pull request #95 from ProzorroUKR/dev
Browse files Browse the repository at this point in the history
Remove non lot data. Fix evaluationReports, notice. Fix configs.
  • Loading branch information
smithumble committed Jul 18, 2024
2 parents 7d76930 + 070610c commit ad29479
Show file tree
Hide file tree
Showing 1,594 changed files with 4,669 additions and 26,900 deletions.
354 changes: 232 additions & 122 deletions README.md

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions procedure_tools/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ def get(self, path, **kwargs):
def post(self, path, json=None, **kwargs):
return self.request("POST", path, json=json, **kwargs)

def put(self, path, json=None, **kwargs):
return self.request("PUT", path, json=json, **kwargs)

def patch(self, path, json=None, **kwargs):
return self.request("PATCH", path, json=json, **kwargs)

Expand Down Expand Up @@ -147,6 +150,7 @@ class TendersApiClient(BaseCDBClient):
TENDERS_COLLECTION_PATH = "tenders"
TENDERS_PATH = "tenders/{}"
TENDERS_DOCUMENTS_COLLECTION_PATH = "tenders/{}/documents"
TENDERS_DOCUMENTS_PATH = "tenders/{}/documents/{}"
PLANS_PATH = "tenders/{}/plans"
CRITERIA_COLLECTION_PATH = "tenders/{}/criteria"
BIDS_COLLECTION_PATH = "tenders/{}/bids"
Expand Down Expand Up @@ -194,6 +198,11 @@ def post_tender_document(self, tender_id, acc_token, json, **kwargs):
path = self.get_api_path(documents_path, acc_token=acc_token)
return self.post(path, json, **kwargs)

def put_tender_document(self, tender_id, document_id, acc_token, json, **kwargs):
documents_path = self.TENDERS_DOCUMENTS_PATH.format(tender_id, document_id)
path = self.get_api_path(documents_path, acc_token=acc_token)
return self.put(path, json, **kwargs)

def post_plan(self, tender_id, acc_token, json, **kwargs):
tenders_path = self.PLANS_PATH.format(tender_id)
path = self.get_api_path(tenders_path, acc_token=acc_token)
Expand Down Expand Up @@ -427,13 +436,32 @@ def get_agreement(self, agreement_id, **kwargs):

class ContractsApiClient(BaseCDBClient):
CONTRACTS_PATH = "contracts/{}"
BUYERS_SIGNER_INFO_PATH = "contracts/{}/buyer/signer_info"
SUPPLIERS_SIGNER_INFO_PATH = "contracts/{}/suppliers/signer_info"
CREDENTIALS_PATH = "contracts/{}/credentials"

def get_contract(self, contract_id, **kwargs):
contracts_path = self.CONTRACTS_PATH.format(contract_id)
path = self.get_api_path(contracts_path)
return self.get(path, **kwargs)

def patch_contract(self, contract_id, acc_token, json, **kwargs):
contracts_path = self.CONTRACTS_PATH.format(contract_id)
path = self.get_api_path(contracts_path, acc_token=acc_token)
return self.patch(path, json, **kwargs)

def patch_contract_buyer_signer_info(self, contract_id, acc_token, json, **kwargs):
contracts_path = self.BUYERS_SIGNER_INFO_PATH.format(contract_id)
path = self.get_api_path(contracts_path, acc_token=acc_token)
return self.put(path, json, **kwargs)

def patch_contract_suppliers_signer_info(
self, contract_id, acc_token, json, **kwargs
):
contracts_path = self.SUPPLIERS_SIGNER_INFO_PATH.format(contract_id)
path = self.get_api_path(contracts_path, acc_token=acc_token)
return self.put(path, json, **kwargs)

def patch_credentials(self, contract_id, acc_token, json, **kwargs):
credentials_path = self.CREDENTIALS_PATH.format(contract_id)
path = self.get_api_path(credentials_path, acc_token=acc_token)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
15 changes: 15 additions & 0 deletions procedure_tools/data/aboveThreshold.features/contract_patch_0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"data": {
"status": "active",
"value": {
"amount": 500,
"amountNet": 500,
"valueAddedTaxIncluded": false
},
"period": {
"startDate": "{{ helpers.now() }}",
"endDate": "{{ helpers.now(days=365, acceleration=acceleration) }}"
},
"contractNumber": 1
}
}
15 changes: 15 additions & 0 deletions procedure_tools/data/aboveThreshold.features/contract_patch_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"data": {
"status": "active",
"value": {
"amount": 500,
"amountNet": 500,
"valueAddedTaxIncluded": false
},
"period": {
"startDate": "{{ helpers.now() }}",
"endDate": "{{ helpers.now(days=365, acceleration=acceleration) }}"
},
"contractNumber": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
"hasValueRestriction": false,
"valueCurrencyEquality": true,
"hasPrequalification": false,
"minBidsNumber": 1
"minBidsNumber": 1,
"hasPreSelectionAgreement": false,
"hasTenderComplaints": true,
"hasAwardComplaints": true,
"hasCancellationComplaints": true,
"restricted": false
},
"data": {
"features": [
Expand Down Expand Up @@ -171,7 +176,7 @@
"type": "banking"
},
"percentage": 100,
"sequenceNumber": 0,
"sequenceNumber": 1,
"title": "signingTheContract",
"type": "financing"
}
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
15 changes: 15 additions & 0 deletions procedure_tools/data/aboveThreshold.lcc/contract_patch_0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"data": {
"status": "active",
"value": {
"amount": 500,
"amountNet": 500,
"valueAddedTaxIncluded": false
},
"period": {
"startDate": "{{ helpers.now() }}",
"endDate": "{{ helpers.now(days=365, acceleration=acceleration) }}"
},
"contractNumber": 1
}
}
15 changes: 15 additions & 0 deletions procedure_tools/data/aboveThreshold.lcc/contract_patch_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"data": {
"status": "active",
"value": {
"amount": 500,
"amountNet": 500,
"valueAddedTaxIncluded": false
},
"period": {
"startDate": "{{ helpers.now() }}",
"endDate": "{{ helpers.now(days=365, acceleration=acceleration) }}"
},
"contractNumber": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
"hasValueRestriction": false,
"valueCurrencyEquality": true,
"hasPrequalification": false,
"minBidsNumber": 1
"minBidsNumber": 1,
"hasPreSelectionAgreement": false,
"hasTenderComplaints": true,
"hasAwardComplaints": true,
"hasCancellationComplaints": true,
"restricted": false
},
"data": {
"awardCriteria": "lifeCycleCost",
Expand Down Expand Up @@ -126,7 +131,7 @@
"type": "banking"
},
"percentage": 100,
"sequenceNumber": 0,
"sequenceNumber": 1,
"title": "signingTheContract",
"type": "financing"
}
Expand Down
Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions procedure_tools/data/aboveThreshold.multilot/contract_patch_0.json

This file was deleted.

10 changes: 0 additions & 10 deletions procedure_tools/data/aboveThreshold.multilot/contract_patch_1.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": {
"name": "Test Testovich",
"telephone": "+380950000000",
"email": "[email protected]",
"iban": "111111111111111",
"authorizedBy": "Статут компанії",
"position": "Генеральний директор"
}
}
15 changes: 15 additions & 0 deletions procedure_tools/data/aboveThreshold/contract_patch_0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"data": {
"status": "active",
"value": {
"amount": 500,
"amountNet": 500,
"valueAddedTaxIncluded": false
},
"period": {
"startDate": "{{ helpers.now() }}",
"endDate": "{{ helpers.now(days=365, acceleration=acceleration) }}"
},
"contractNumber": 1
}
}
Loading

0 comments on commit ad29479

Please sign in to comment.