From ea4c6313cdf73e04c967b1e65d4bd2589f11c4c6 Mon Sep 17 00:00:00 2001 From: smithumble Date: Fri, 9 Aug 2024 01:14:29 +0300 Subject: [PATCH 01/13] Refactor clients. Make single client for cdb. Improve client time sync. --- procedure_tools/client.py | 305 +++++++++--------- .../data/aboveThreshold/bid_patch_0.json | 5 - .../data/aboveThreshold/bid_patch_1.json | 5 - procedure_tools/procedure.py | 224 +++++-------- procedure_tools/test.py | 4 +- procedure_tools/utils/contextmanagers.py | 2 +- procedure_tools/utils/data.py | 2 +- procedure_tools/utils/date.py | 10 - procedure_tools/utils/process.py | 138 +++++--- 9 files changed, 333 insertions(+), 362 deletions(-) delete mode 100644 procedure_tools/data/aboveThreshold/bid_patch_0.json delete mode 100644 procedure_tools/data/aboveThreshold/bid_patch_1.json diff --git a/procedure_tools/client.py b/procedure_tools/client.py index 27fd821..35e1117 100644 --- a/procedure_tools/client.py +++ b/procedure_tools/client.py @@ -89,6 +89,9 @@ def log_response(self, text): def request(self, method, path, **kwargs): request_kwargs = deepcopy(self.kwargs) + auth_token = kwargs.pop("auth_token", None) + if auth_token: + request_kwargs["headers"].update({"Authorization": "Bearer " + auth_token}) handlers = self.pop_handlers(kwargs) request_kwargs.update(kwargs) url = self.get_url(path) @@ -130,7 +133,7 @@ def __init__( ): super(BaseCDBClient, self).__init__(host, session=session, **request_kwargs) self.path_prefix = path_prefix - self.set_kwargs(auth_token) + self.set_kwargs() spore_url = self.get_url(self.get_api_path(self.SPORE_PATH)) # GET request to retrieve cookies and server time response = self.session.get(spore_url) @@ -142,10 +145,8 @@ def __init__( self.client_timedelta = timedelta() client_init_response_handler(response, self.client_timedelta) - def set_kwargs(self, auth_token): + def set_kwargs(self): self.kwargs["headers"].update({"Content-Type": "application/json"}) - if auth_token: - self.kwargs["headers"].update({"Authorization": "Bearer " + auth_token}) def get_api_path(self, path, acc_token=None): return urljoin( @@ -154,38 +155,71 @@ def get_api_path(self, path, acc_token=None): ) -class TendersApiClient(BaseCDBClient): +class CDBClient(BaseCDBClient): name = "tenders" + PLANS_COLLECTION_PATH = "plans" + PLANS_PATH = "plans/{}" + PLANS_TENDERS_COLLECTION_PATH = "plans/{}/tenders" + TENDERS_COLLECTION_PATH = "tenders" TENDERS_PATH = "tenders/{}" + TENDERS_PLANS_PATH = "tenders/{}/plans" 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" - BIDS_PATH = "tenders/{}/bids/{}" - BIDS_RES_COLLECTION_PATH = "tenders/{}/bids/{}/requirement_responses" - AWARDS_COLLECTION_PATH = "tenders/{}/awards" - AWARDS_PATH = "tenders/{}/awards/{}" - CONTRACTS_COLLECTION_PATH = "tenders/{}/contracts" - CONTRACTS_PATH = "tenders/{}/contracts/{}" - QUALIFICATIONS_COLLECTION_PATH = "tenders/{}/qualifications" - QUALIFICATIONS_PATH = "tenders/{}/qualifications/{}" - AGREEMENTS_COLLECTION_PATH = "tenders/{}/agreements" - AGREEMENTS_PATH = "tenders/{}/agreements/{}" - AGREEMENTS_DOCUMENTS_COLLECTION_PATH = "tenders/{}/agreements/{}/documents" - AGREEMENTS_CONTRACTS_COLLECTION_PATH = "tenders/{}/agreements/{}/contracts" - AGREEMENTS_CONTRACTS_PATH = "tenders/{}/agreements/{}/contracts/{}" - CREDENTIALS_PATH = "tenders/{}/credentials" - COMPLAINTS_COLLECTION_PATH = "tenders/{}/complaints" - COMPLAINTS_PATH = "tenders/{}/complaints/{}" - AWARDS_COMPLAINTS_COLLECTION_PATH = "tenders/{}/awards/{}/complaints" - AWARDS_COMPLAINTS_PATH = "tenders/{}/awards/{}/complaints/{}" - QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH = ( + TENDERS_CRITERIA_COLLECTION_PATH = "tenders/{}/criteria" + TENDERS_BIDS_COLLECTION_PATH = "tenders/{}/bids" + TENDERS_BIDS_PATH = "tenders/{}/bids/{}" + TENDERS_BIDS_RES_COLLECTION_PATH = "tenders/{}/bids/{}/requirement_responses" + TENDERS_AWARDS_COLLECTION_PATH = "tenders/{}/awards" + TENDERS_AWARDS_PATH = "tenders/{}/awards/{}" + TENDERS_CONTRACTS_COLLECTION_PATH = "tenders/{}/contracts" + TENDERS_CONTRACTS_PATH = "tenders/{}/contracts/{}" + TENDERS_QUALIFICATIONS_COLLECTION_PATH = "tenders/{}/qualifications" + TENDERS_QUALIFICATIONS_PATH = "tenders/{}/qualifications/{}" + TENDERS_AGREEMENTS_COLLECTION_PATH = "tenders/{}/agreements" + TENDERS_AGREEMENTS_PATH = "tenders/{}/agreements/{}" + TENDERS_AGREEMENTS_DOCUMENTS_COLLECTION_PATH = "tenders/{}/agreements/{}/documents" + TENDERS_AGREEMENTS_CONTRACTS_COLLECTION_PATH = "tenders/{}/agreements/{}/contracts" + TENDERS_AGREEMENTS_CONTRACTS_PATH = "tenders/{}/agreements/{}/contracts/{}" + TENDERS_CREDENTIALS_PATH = "tenders/{}/credentials" + TENDERS_COMPLAINTS_COLLECTION_PATH = "tenders/{}/complaints" + TENDERS_COMPLAINTS_PATH = "tenders/{}/complaints/{}" + TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH = "tenders/{}/awards/{}/complaints" + TENDERS_AWARDS_COMPLAINTS_PATH = "tenders/{}/awards/{}/complaints/{}" + TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH = ( "tenders/{}/qualifications/{}/complaints" ) - QUALIFICATIONS_COMPLAINTS_PATH = "tenders/{}/qualifications/{}/complaints/{}" + TENDERS_QUALIFICATIONS_COMPLAINTS_PATH = ( + "tenders/{}/qualifications/{}/complaints/{}" + ) + + CONTRACTS_PATH = "contracts/{}" + CONTRACTS_BUYERS_SIGNER_INFO_PATH = "contracts/{}/buyer/signer_info" + CONTRACTS_SUPPLIERS_SIGNER_INFO_PATH = "contracts/{}/suppliers/signer_info" + CONTRACTS_CREDENTIALS_PATH = "contracts/{}/credentials" + + AGREEMENTS_PATH = "agreements/{}" + + def get_plan(self, plan_id, **kwargs): + contracts_path = self.PLANS_PATH.format(plan_id) + path = self.get_api_path(contracts_path) + return self.get(path, **kwargs) + + def post_plan(self, json, **kwargs): + tenders_path = self.PLANS_COLLECTION_PATH + path = self.get_api_path(tenders_path) + return self.post(path, json, **kwargs) + + def patch_plan(self, plan_id, acc_token, json, **kwargs): + tenders_path = self.PLANS_PATH.format(plan_id) + path = self.get_api_path(tenders_path, acc_token=acc_token) + return self.patch(path, json, **kwargs) + + def post_plan_tender(self, plan_id, json, **kwargs): + tenders_path = self.PLANS_TENDERS_COLLECTION_PATH.format(plan_id) + path = self.get_api_path(tenders_path) + return self.post(path, json, **kwargs) def get_tender(self, tender_id, **kwargs): tenders_path = self.TENDERS_PATH.format(tender_id) @@ -202,6 +236,11 @@ def patch_tender(self, tender_id, acc_token, json, **kwargs): path = self.get_api_path(tenders_path, acc_token=acc_token) return self.patch(path, json, **kwargs) + def post_tender_plan(self, tender_id, acc_token, json, **kwargs): + tenders_path = self.TENDERS_PLANS_PATH.format(tender_id) + path = self.get_api_path(tenders_path, acc_token=acc_token) + return self.post(path, json, **kwargs) + def post_tender_document(self, tender_id, acc_token, json, **kwargs): documents_path = self.TENDERS_DOCUMENTS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(documents_path, acc_token=acc_token) @@ -212,238 +251,227 @@ def put_tender_document(self, tender_id, document_id, acc_token, json, **kwargs) 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) - return self.post(path, json, **kwargs) - - def post_criteria(self, tender_id, acc_token, json, **kwargs): - criteria_path = self.CRITERIA_COLLECTION_PATH.format(tender_id) + def post_tender_criteria(self, tender_id, acc_token, json, **kwargs): + criteria_path = self.TENDERS_CRITERIA_COLLECTION_PATH.format(tender_id) path = self.get_api_path(criteria_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def get_bids(self, tender_id, **kwargs): - bid_path = self.BIDS_COLLECTION_PATH.format(tender_id) + def get_tender_bids(self, tender_id, **kwargs): + bid_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(bid_path) return self.get(path, **kwargs) - def get_bid(self, tender_id, bid_id, acc_token, **kwargs): - bid_path = self.BIDS_PATH.format(tender_id, bid_id) + def get_tender_bid(self, tender_id, bid_id, acc_token, **kwargs): + bid_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) path = self.get_api_path(bid_path, acc_token=acc_token) return self.get(path, **kwargs) - def post_bid(self, tender_id, json, **kwargs): - bids_path = self.BIDS_COLLECTION_PATH.format(tender_id) + def post_tender_bid(self, tender_id, json, **kwargs): + bids_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(bids_path) return self.post(path, json, **kwargs) - def patch_bid(self, tender_id, bid_id, acc_token, json, **kwargs): - bid_path = self.BIDS_PATH.format(tender_id, bid_id) + def patch_tender_bid(self, tender_id, bid_id, acc_token, json, **kwargs): + bid_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) path = self.get_api_path(bid_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def post_bid_res(self, tender_id, bid_id, acc_token, json, **kwargs): - bid_res_path = self.BIDS_RES_COLLECTION_PATH.format(tender_id, bid_id) + def post_tender_bid_res(self, tender_id, bid_id, acc_token, json, **kwargs): + bid_res_path = self.TENDERS_BIDS_RES_COLLECTION_PATH.format(tender_id, bid_id) path = self.get_api_path(bid_res_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def get_complaints(self, tender_id, **kwargs): - complaints_path = self.COMPLAINTS_COLLECTION_PATH.format(tender_id) + def get_tender_complaints(self, tender_id, **kwargs): + complaints_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def get_complaint(self, tender_id, complaint_id, **kwargs): - complaints_path = self.COMPLAINTS_PATH.format(tender_id, complaint_id) + def get_tender_complaint(self, tender_id, complaint_id, **kwargs): + complaints_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def post_complaint(self, tender_id, acc_token, json, **kwargs): - complaints_path = self.COMPLAINTS_COLLECTION_PATH.format(tender_id) + def post_tender_complaint(self, tender_id, acc_token, json, **kwargs): + complaints_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def patch_complaint(self, tender_id, complaint_id, acc_token, json, **kwargs): - complaints_path = self.COMPLAINTS_PATH.format(tender_id, complaint_id) + def patch_tender_complaint( + self, tender_id, complaint_id, acc_token, json, **kwargs + ): + complaints_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_qualifications(self, tender_id, **kwargs): - qualifications_path = self.QUALIFICATIONS_COLLECTION_PATH.format(tender_id) + def get_tender_qualifications(self, tender_id, **kwargs): + qualifications_path = self.TENDERS_QUALIFICATIONS_COLLECTION_PATH.format( + tender_id + ) path = self.get_api_path(qualifications_path) return self.get(path, **kwargs) - def get_qualification(self, tender_id, qualification_id, **kwargs): - qualifications_path = self.QUALIFICATIONS_PATH.format( + def get_tender_qualification(self, tender_id, qualification_id, **kwargs): + qualifications_path = self.TENDERS_QUALIFICATIONS_PATH.format( tender_id, qualification_id ) path = self.get_api_path(qualifications_path) return self.get(path, **kwargs) - def patch_qualification( + def patch_tender_qualification( self, tender_id, qualification_id, acc_token, json, **kwargs ): - qualifications_path = self.QUALIFICATIONS_PATH.format( + qualifications_path = self.TENDERS_QUALIFICATIONS_PATH.format( tender_id, qualification_id, acc_token ) path = self.get_api_path(qualifications_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_qualification_complaints(self, tender_id, qualification_id, **kwargs): - complaints_path = self.QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( + def get_tender_qualification_complaints( + self, tender_id, qualification_id, **kwargs + ): + complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( tender_id, qualification_id ) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def get_qualification_complaint( + def get_tender_qualification_complaint( self, tender_id, qualification_id, complaint_id, **kwargs ): - complaints_path = self.QUALIFICATIONS_COMPLAINTS_PATH.format( + complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( tender_id, qualification_id, complaint_id ) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def post_qualification_complaint( + def post_tender_qualification_complaint( self, tender_id, qualification_id, acc_token, json, **kwargs ): - complaints_path = self.QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( + complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( tender_id, qualification_id ) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def patch_qualification_complaint( + def patch_tender_qualification_complaint( self, tender_id, qualification_id, complaint_id, acc_token, json, **kwargs ): - complaints_path = self.QUALIFICATIONS_COMPLAINTS_PATH.format( + complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( tender_id, qualification_id, complaint_id ) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_awards(self, tender_id, **kwargs): - awards_path = self.AWARDS_COLLECTION_PATH.format(tender_id) + def get_tender_awards(self, tender_id, **kwargs): + awards_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(awards_path) return self.get(path, **kwargs) - def get_award(self, tender_id, award_id, **kwargs): - awards_path = self.AWARDS_PATH.format(tender_id, award_id) + def get_tender_award(self, tender_id, award_id, **kwargs): + awards_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id) path = self.get_api_path(awards_path) return self.get(path, **kwargs) - def post_award(self, tender_id, acc_token, json, **kwargs): - awards_path = self.AWARDS_COLLECTION_PATH.format(tender_id) + def post_tender_award(self, tender_id, acc_token, json, **kwargs): + awards_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(awards_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def patch_award(self, tender_id, award_id, acc_token, json, **kwargs): - awards_path = self.AWARDS_PATH.format(tender_id, award_id, acc_token) + def patch_tender_award(self, tender_id, award_id, acc_token, json, **kwargs): + awards_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id, acc_token) path = self.get_api_path(awards_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_award_complaints(self, tender_id, award_id, **kwargs): - complaints_path = self.AWARDS_COMPLAINTS_COLLECTION_PATH.format( + def get_tender_award_complaints(self, tender_id, award_id, **kwargs): + complaints_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( tender_id, award_id ) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def get_award_complaint(self, tender_id, award_id, complaint_id, **kwargs): - complaints_path = self.AWARDS_COMPLAINTS_PATH.format( + def get_tender_award_complaint(self, tender_id, award_id, complaint_id, **kwargs): + complaints_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( tender_id, award_id, complaint_id ) path = self.get_api_path(complaints_path) return self.get(path, **kwargs) - def post_award_complaint(self, tender_id, award_id, acc_token, json, **kwargs): - complaints_path = self.AWARDS_COMPLAINTS_COLLECTION_PATH.format( + def post_tender_award_complaint( + self, tender_id, award_id, acc_token, json, **kwargs + ): + complaints_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( tender_id, award_id ) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def patch_award_complaint( + def patch_tender_award_complaint( self, tender_id, award_id, complaint_id, acc_token, json, **kwargs ): - complaints_path = self.AWARDS_COMPLAINTS_PATH.format( + complaints_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( tender_id, award_id, complaint_id ) path = self.get_api_path(complaints_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_contracts(self, tender_id, **kwargs): - awards_path = self.CONTRACTS_COLLECTION_PATH.format(tender_id) + def get_tender_contracts(self, tender_id, **kwargs): + awards_path = self.TENDERS_CONTRACTS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(awards_path) return self.get(path, **kwargs) - def patch_contract(self, tender_id, contract_id, acc_token, json, **kwargs): - awards_path = self.CONTRACTS_PATH.format(tender_id, contract_id, acc_token) + def patch_tender_contract(self, tender_id, contract_id, acc_token, json, **kwargs): + awards_path = self.TENDERS_CONTRACTS_PATH.format( + tender_id, contract_id, acc_token + ) path = self.get_api_path(awards_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def get_agreements(self, tender_id, **kwargs): - agreements_path = self.AGREEMENTS_COLLECTION_PATH.format(tender_id) + def get_tender_agreements(self, tender_id, **kwargs): + agreements_path = self.TENDERS_AGREEMENTS_COLLECTION_PATH.format(tender_id) path = self.get_api_path(agreements_path) return self.get(path, **kwargs) - def patch_agreement(self, tender_id, agreement_id, acc_token, json, **kwargs): - agreements_path = self.AGREEMENTS_PATH.format( + def patch_tender_agreement( + self, tender_id, agreement_id, acc_token, json, **kwargs + ): + agreements_path = self.TENDERS_AGREEMENTS_PATH.format( tender_id, agreement_id, acc_token ) path = self.get_api_path(agreements_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def post_agreement_document( + def post_tender_agreement_document( self, tender_id, agreement_id, acc_token, json, **kwargs ): - agreements_path = self.AGREEMENTS_DOCUMENTS_COLLECTION_PATH.format( + agreements_path = self.TENDERS_AGREEMENTS_DOCUMENTS_COLLECTION_PATH.format( tender_id, agreement_id ) path = self.get_api_path(agreements_path, acc_token=acc_token) return self.post(path, json, **kwargs) - def get_agreement_contracts(self, tender_id, agreement_id, **kwargs): - agreement_contracts_path = self.AGREEMENTS_CONTRACTS_COLLECTION_PATH.format( - tender_id, agreement_id + def get_tender_agreement_contracts(self, tender_id, agreement_id, **kwargs): + agreement_contracts_path = ( + self.TENDERS_AGREEMENTS_CONTRACTS_COLLECTION_PATH.format( + tender_id, agreement_id + ) ) path = self.get_api_path(agreement_contracts_path) return self.get(path, **kwargs) - def patch_agreement_contract( + def patch_tender_agreement_contract( self, tender_id, agreement_id, contract_id, acc_token, json, **kwargs ): - agreement_contracts_path = self.AGREEMENTS_CONTRACTS_PATH.format( + agreement_contracts_path = self.TENDERS_AGREEMENTS_CONTRACTS_PATH.format( tender_id, agreement_id, contract_id, acc_token ) path = self.get_api_path(agreement_contracts_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - def patch_credentials(self, tender_id, acc_token, json, **kwargs): - credentials_path = self.CREDENTIALS_PATH.format(tender_id) + def patch_tender_credentials(self, tender_id, acc_token, json, **kwargs): + credentials_path = self.TENDERS_CREDENTIALS_PATH.format(tender_id) path = self.get_api_path(credentials_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - -class AgreementsApiClient(BaseCDBClient): - name = "agreements" - - AGREEMENTS_PATH = "agreements/{}" - - def get_agreement(self, agreement_id, **kwargs): - agreements_path = self.AGREEMENTS_PATH.format(agreement_id) - path = self.get_api_path(agreements_path) - return self.get(path, **kwargs) - - -class ContractsApiClient(BaseCDBClient): - name = "contracts" - - 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) @@ -455,50 +483,27 @@ def patch_contract(self, contract_id, acc_token, json, **kwargs): 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) + contracts_path = self.CONTRACTS_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) + contracts_path = self.CONTRACTS_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) + def patch_contract_credentials(self, contract_id, acc_token, json, **kwargs): + credentials_path = self.CONTRACTS_CREDENTIALS_PATH.format(contract_id) path = self.get_api_path(credentials_path, acc_token=acc_token) return self.patch(path, json, **kwargs) - -class PlansApiClient(BaseCDBClient): - name = "plans" - - PLANS_COLLECTION_PATH = "plans" - PLANS_PATH = "plans/{}" - TENDERS_COLLECTION_PATH = "plans/{}/tenders" - - def get_plan(self, plan_id, **kwargs): - contracts_path = self.PLANS_PATH.format(plan_id) - path = self.get_api_path(contracts_path) + def get_agreement(self, agreement_id, **kwargs): + agreements_path = self.AGREEMENTS_PATH.format(agreement_id) + path = self.get_api_path(agreements_path) return self.get(path, **kwargs) - def post_plan(self, json, **kwargs): - tenders_path = self.PLANS_COLLECTION_PATH - path = self.get_api_path(tenders_path) - return self.post(path, json, **kwargs) - - def patch_plan(self, plan_id, acc_token, json, **kwargs): - tenders_path = self.PLANS_PATH.format(plan_id) - path = self.get_api_path(tenders_path, acc_token=acc_token) - return self.patch(path, json, **kwargs) - - def post_tender(self, plan_id, json, **kwargs): - tenders_path = self.TENDERS_COLLECTION_PATH.format(plan_id) - path = self.get_api_path(tenders_path) - return self.post(path, json, **kwargs) - class DsApiClient(BaseApiClient): name = "ds" diff --git a/procedure_tools/data/aboveThreshold/bid_patch_0.json b/procedure_tools/data/aboveThreshold/bid_patch_0.json deleted file mode 100644 index 3613fdb..0000000 --- a/procedure_tools/data/aboveThreshold/bid_patch_0.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "data": { - "status": "pending" - } -} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold/bid_patch_1.json b/procedure_tools/data/aboveThreshold/bid_patch_1.json deleted file mode 100644 index 3613fdb..0000000 --- a/procedure_tools/data/aboveThreshold/bid_patch_1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "data": { - "status": "pending" - } -} \ No newline at end of file diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py index bdf56a7..8999bd5 100644 --- a/procedure_tools/procedure.py +++ b/procedure_tools/procedure.py @@ -5,13 +5,7 @@ from faker import Faker -from procedure_tools.client import ( - AgreementsApiClient, - ContractsApiClient, - DsApiClient, - PlansApiClient, - TendersApiClient, -) +from procedure_tools.client import CDBClient, DsApiClient from procedure_tools.utils.data import ( get_access, get_award_id, @@ -27,8 +21,7 @@ get_submission_method_details, get_token, ) -from procedure_tools.utils.date import get_client_timedelta -from procedure_tools.utils.file import get_data_path +from procedure_tools.utils.file import get_data_path, get_numberless_filename from procedure_tools.utils.process import ( create_awards, create_bids, @@ -96,6 +89,9 @@ def set_faker_seed(args): def init_procedure(args, session=None): set_faker_seed(args) + if args.stop: + args.stop = get_numberless_filename(args.stop) + data_path = get_data_path(args.data) if data_path is None: logging.error("Data path not found.\n") @@ -114,49 +110,13 @@ def process_procedure( ): context = context or {} - tenders_client = TendersApiClient( + client = CDBClient( args.host, args.token, args.path, session=session, debug=args.debug, ) - contracts_client = ContractsApiClient( - args.host, - args.token, - args.path, - session=session, - debug=args.debug, - ) - plans_client = PlansApiClient( - args.host, - args.token, - args.path, - session=session, - debug=args.debug, - ) - tenders_reviewer_client = ( - TendersApiClient( - args.host, - args.reviewer_token, - args.path, - session=session, - debug=args.debug, - ) - if args.reviewer_token - else None - ) - tenders_bot_client = ( - TendersApiClient( - args.host, - args.bot_token, - args.path, - session=session, - debug=args.debug, - ) - if args.bot_token - else None - ) ds_client = DsApiClient( args.ds_host, args.ds_username, @@ -167,25 +127,14 @@ def process_procedure( context["acceleration"] = args.acceleration context["submission"] = args.submission - - client_timedelta = get_client_timedelta( - [ - tenders_client, - contracts_client, - plans_client, - tenders_bot_client, - tenders_reviewer_client, - ] - ) - - context["client_timedelta"] = client_timedelta + context["client_timedelta"] = client.client_timedelta if not tender_id and not tender_token: # It means that we are starting a new procedure # not a second stage of another response = create_plan( - plans_client, + client, args, context, prefix=prefix, @@ -196,7 +145,7 @@ def process_procedure( plan_id = get_id(response) plan_token = get_token(response) response = patch_plan( - plans_client, + client, args, context, plan_id, @@ -204,7 +153,7 @@ def process_procedure( prefix=prefix, ) response = create_tender( - plans_client, + client, ds_client, args, context, @@ -215,7 +164,7 @@ def process_procedure( # Start procedure without a plan plan_id = None response = create_tender( - tenders_client, + client, ds_client, args, context, @@ -243,7 +192,7 @@ def process_procedure( # Create multiple plans # Used in central kind procedures plans_responses = create_plans( - plans_client, + client, args, context, prefix=prefix, @@ -252,7 +201,7 @@ def process_procedure( # Attach multiple plans to the tender plan_id = plan_response.json()["data"]["id"] post_tender_plan( - tenders_client, + client, args, context, tender_id, @@ -261,7 +210,7 @@ def process_procedure( prefix=prefix, ) - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) tender = get_data(response) context[f"{prefix}tender"] = tender @@ -273,7 +222,7 @@ def process_procedure( submission_method_details = get_submission_method_details(response) upload_tender_documents( - tenders_client, + client, ds_client, args, context, @@ -295,7 +244,7 @@ def process_procedure( "esco", ): criteria_response = post_criteria( - tenders_client, + client, args, context, tender_id, @@ -310,7 +259,7 @@ def process_procedure( tender_criteria = None upload_tender_notice( - tenders_client, + client, ds_client, args, context, @@ -335,7 +284,7 @@ def process_procedure( "simple.defense", ): response = patch_tender( - tenders_client, + client, args, context, tender_id, @@ -345,7 +294,7 @@ def process_procedure( if method_type in ("closeFrameworkAgreementSelectionUA",): patch_tender_pending( - tenders_client, + client, args, context, tender_id, @@ -355,7 +304,7 @@ def process_procedure( if method_type in ("closeFrameworkAgreementSelectionUA",): wait_status( - tenders_client, + client, args, context, tender_id, @@ -367,7 +316,7 @@ def process_procedure( if method_type in ("belowThreshold",): wait( get_next_check(response), - client_timedelta=client_timedelta, + client_timedelta=client.client_timedelta, date_info_str="next chronograph check", ) @@ -375,10 +324,10 @@ def process_procedure( "belowThreshold", "closeFrameworkAgreementSelectionUA", ): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) wait_status( - tenders_client, + client, args, context, tender_id, @@ -392,7 +341,7 @@ def process_procedure( "competitiveDialogueUA.stage2", ): patch_tender_tendering( - tenders_client, + client, args, context, tender_id, @@ -401,7 +350,7 @@ def process_procedure( ) comp_responses = create_complaints( - tenders_client, + client, args, context, tender_id, @@ -414,9 +363,7 @@ def process_procedure( comp_ids = [comp_json["data"]["id"] for comp_json in comp_jsons] comp_tokens = [comp_json["access"]["token"] for comp_json in comp_jsons] patch_complaints( - tenders_client, - tenders_bot_client, - tenders_reviewer_client, + client, args, context, tender_id, @@ -446,7 +393,7 @@ def process_procedure( "simple.defense", ): bids_responses = create_bids( - tenders_client, + client, ds_client, args, context, @@ -459,7 +406,7 @@ def process_procedure( if tender_criteria: bids_documents = [bid_json["data"]["documents"] for bid_json in bids_jsons] post_bid_res( - tenders_client, + client, args, context, tender_id, @@ -470,7 +417,7 @@ def process_procedure( prefix=prefix, ) patch_bids( - tenders_client, + client, args, context, tender_id, @@ -496,16 +443,16 @@ def process_procedure( "esco", "simple.defense", ): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) wait( get_next_check(response), - client_timedelta=client_timedelta, + client_timedelta=client.client_timedelta, date_info_str="next chronograph check", ) if config["hasPrequalification"]: wait_status( - tenders_client, + client, args, context, tender_id, @@ -516,15 +463,15 @@ def process_procedure( if config["hasPrequalification"]: if WAIT_EDR_PRE_QUAL in args.wait.split(","): - wait_edr_pre_qual(tenders_client, args, context, tender_id) + wait_edr_pre_qual(client, args, context, tender_id) qualifications_ids = [] if config["hasPrequalification"]: - response = get_qualifications(tenders_client, args, context, tender_id) + response = get_qualifications(client, args, context, tender_id) qualifications_ids = get_ids(response) patch_qualifications( - tenders_client, + client, args, context, tender_id, @@ -534,7 +481,7 @@ def process_procedure( ) response = upload_evaluation_report( - tenders_client, + client, ds_client, args, context, @@ -546,7 +493,7 @@ def process_procedure( evaluation_report_document_id = get_id(response) patch_tender_pre( - tenders_client, + client, args, context, tender_id, @@ -557,7 +504,7 @@ def process_procedure( if bids_tokens: for qualification_index, qualification_id in enumerate(qualifications_ids): comp_responses = create_complaints( - tenders_client, + client, args, context, tender_id, @@ -573,9 +520,7 @@ def process_procedure( comp_ids = [comp_json["data"]["id"] for comp_json in comp_jsons] comp_tokens = [comp_json["access"]["token"] for comp_json in comp_jsons] patch_complaints( - tenders_client, - tenders_bot_client, - tenders_reviewer_client, + client, args, context, tender_id, @@ -589,7 +534,7 @@ def process_procedure( prefix=prefix, ) - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) tender_status = response.json()["data"]["status"] if tender_status == "active.pre-qualification": @@ -599,7 +544,7 @@ def process_procedure( # - switch again to active.pre-qualification.stand-still re_upload_evaluation_report( - tenders_client, + client, ds_client, args, context, @@ -610,7 +555,7 @@ def process_procedure( ) patch_tender_pre( - tenders_client, + client, args, context, tender_id, @@ -623,7 +568,7 @@ def process_procedure( "competitiveDialogueUA", ): wait_status( - tenders_client, + client, args, context, tender_id, @@ -631,7 +576,7 @@ def process_procedure( status="active.stage2.pending", fail_status="unsuccessful", ) - patch_tender_waiting(tenders_client, args, context, tender_id, tender_token) + patch_tender_waiting(client, args, context, tender_id, tender_token) if method_type in ( "belowThreshold", @@ -647,7 +592,7 @@ def process_procedure( "simple.defense", ): wait_status( - tenders_client, + client, args, context, tender_id, @@ -669,7 +614,7 @@ def process_procedure( ) ) ): - wait_auction_participation_urls(tenders_client, tender_id, bids_jsons) + wait_auction_participation_urls(client, args, tender_id, bids_jsons) if method_type in ( "belowThreshold", @@ -685,7 +630,7 @@ def process_procedure( "simple.defense", ): wait_status( - tenders_client, + client, args, context, tender_id, @@ -695,11 +640,11 @@ def process_procedure( ) if method_type in ("negotiation", "negotiation.quick", "reporting"): - create_awards(tenders_client, args, context, tender_id, tender_token) + create_awards(client, args, context, tender_id, tender_token) if method_type in ("negotiation", "negotiation.quick", "reporting"): wait_status( - tenders_client, + client, args, context, tender_id, @@ -708,7 +653,7 @@ def process_procedure( ) if WAIT_EDR_QUAL in args.wait.split(","): - wait_edr_qual(tenders_client, args, context, tender_id) + wait_edr_qual(client, args, context, tender_id) awards_ids = [] @@ -728,12 +673,12 @@ def process_procedure( "esco", "simple.defense", ): - response = get_awards(tenders_client, args, context, tender_id) + response = get_awards(client, args, context, tender_id) awards_ids = get_ids(response) award_action_index = 0 while True: responses = patch_award( - tenders_client, + client, args, context, tender_id, @@ -747,16 +692,16 @@ def process_procedure( # that means we have reached the end of actions break award_action_index += 1 - response = get_awards(tenders_client, args, context, tender_id) + response = get_awards(client, args, context, tender_id) awards_ids = get_ids(response) if method_type in ("closeFrameworkAgreementUA",): - patch_tender_qual(tenders_client, args, context, tender_id, tender_token) + patch_tender_qual(client, args, context, tender_id, tender_token) if bids_tokens: for award_index, award_id in enumerate(awards_ids): comp_responses = create_complaints( - tenders_client, + client, args, context, tender_id, @@ -772,9 +717,7 @@ def process_procedure( comp_ids = [comp_json["data"]["id"] for comp_json in comp_jsons] comp_tokens = [comp_json["access"]["token"] for comp_json in comp_jsons] patch_complaints( - tenders_client, - tenders_bot_client, - tenders_reviewer_client, + client, args, context, tender_id, @@ -789,13 +732,13 @@ def process_procedure( ) if method_type in ("closeFrameworkAgreementUA",): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) tender_status = response.json()["data"]["status"] if tender_status == "active.qualification": # satisfied complaint changes tender status to active.qualification, # so we need to switch it again to active.qualification.stand-still - patch_tender_qual(tenders_client, args, context, tender_id, tender_token) + patch_tender_qual(client, args, context, tender_id, tender_token) if method_type in ( "closeFrameworkAgreementUA", @@ -804,7 +747,7 @@ def process_procedure( "esco", ): wait_status( - tenders_client, + client, args, context, tender_id, @@ -825,11 +768,11 @@ def process_procedure( "esco", "simple.defense", ): - response = get_awards(tenders_client, args, context, tender_id) + response = get_awards(client, args, context, tender_id) awards_complaint_dates = get_complaint_period_end_dates(response) wait( max(awards_complaint_dates), - client_timedelta=client_timedelta, + client_timedelta=client.client_timedelta, date_info_str="end of award complaint period", ) @@ -850,12 +793,12 @@ def process_procedure( "esco", "simple.defense", ): - response = get_tender_contracts(tenders_client, args, context, tender_id) + response = get_tender_contracts(client, args, context, tender_id) contracts_ids = get_ids(response, status_exclude="cancelled") if method_type in ("esco",): patch_tender_contracts( - tenders_client, + client, args, context, tender_id, @@ -884,10 +827,10 @@ def process_procedure( "simple.defense", ): for contracts_id in contracts_ids: - response = get_contract(contracts_client, args, context, contracts_id) + response = get_contract(client, args, context, contracts_id) context["contracts"].append(response.json()["data"]) response = patch_contract_credentials( - contracts_client, + client, args, context, contracts_id, @@ -908,7 +851,7 @@ def process_procedure( "simple.defense", ): patch_contracts_buyer_signer_info( - contracts_client, + client, args, context, contracts_ids, @@ -916,7 +859,7 @@ def process_procedure( prefix=prefix, ) - response = get_awards(tenders_client, args, context, tender_id) + response = get_awards(client, args, context, tender_id) contracts_bid_tokens = get_contracts_bid_tokens( response, bids_ids, @@ -925,7 +868,7 @@ def process_procedure( ) patch_contracts_suppliers_signer_info( - contracts_client, + client, args, context, contracts_ids, @@ -948,7 +891,7 @@ def process_procedure( "simple.defense", ): patch_contracts( - contracts_client, + client, args, context, contracts_ids, @@ -957,17 +900,17 @@ def process_procedure( ) if method_type in ("closeFrameworkAgreementUA",): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) contract_period_clarif_date = get_contract_period_clarif_date(response) wait( contract_period_clarif_date, - client_timedelta=client_timedelta, + client_timedelta=client.client_timedelta, date_info_str="contract period clarifications until date", ) - response = get_agreements(tenders_client, args, context, tender_id) + response = get_agreements(client, args, context, tender_id) agreements_ids = get_ids(response) patch_agreements_contracts( - tenders_client, + client, args, context, tender_id, @@ -975,7 +918,7 @@ def process_procedure( tender_token, ) patch_agreements( - tenders_client, + client, ds_client, args, context, @@ -1003,7 +946,7 @@ def process_procedure( "simple.defense", ): wait_status( - tenders_client, + client, args, context, tender_id, @@ -1015,10 +958,10 @@ def process_procedure( "competitiveDialogueEU", "competitiveDialogueUA", ): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) tender_id = response.json()["data"]["stage2TenderID"] response = patch_stage2_credentials( - tenders_client, + client, args, context, tender_id, @@ -1036,21 +979,14 @@ def process_procedure( ) if method_type in ("closeFrameworkAgreementUA",): - response = get_tender(tenders_client, args, context, tender_id) + response = get_tender(client, args, context, tender_id) agreement_id = response.json()["data"]["agreements"][-1]["id"] - agreement_client = AgreementsApiClient( - args.host, - args.token, - args.path, - session=session, - debug=args.debug, - ) - response = get_agreement(agreement_client, args, context, agreement_id) + response = get_agreement(client, args, context, agreement_id) context["agreement"] = response.json()["data"] response = create_tender( - tenders_client, + client, ds_client, args, context, diff --git a/procedure_tools/test.py b/procedure_tools/test.py index 7cba825..b5c14ee 100644 --- a/procedure_tools/test.py +++ b/procedure_tools/test.py @@ -78,7 +78,7 @@ def test_negotiation_quick(): def test_below_threshold(): argv = ["--data", "belowThreshold"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] + argv += ["--stop", "tender_patch.json"] run_test(argv) @@ -86,7 +86,7 @@ def test_below_threshold(): def test_below_threshold_multilot(): argv = ["--data", "belowThreshold.multilot"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] + argv += ["--stop", "tender_patch.json"] run_test(argv) diff --git a/procedure_tools/utils/contextmanagers.py b/procedure_tools/utils/contextmanagers.py index 9f89b60..9367d3e 100644 --- a/procedure_tools/utils/contextmanagers.py +++ b/procedure_tools/utils/contextmanagers.py @@ -18,8 +18,8 @@ def open_file( path, mode="r", encoding="UTF-8", exit_filename=None, silent_error=False, **kwargs ): + _, file_name = os.path.split(path) actual_path = get_actual_file_path(path) - _, file_name = os.path.split(actual_path) logging.info("Processing data file: {}\n".format(file_name)) try: try: diff --git a/procedure_tools/utils/data.py b/procedure_tools/utils/data.py index c378518..f032ecc 100644 --- a/procedure_tools/utils/data.py +++ b/procedure_tools/utils/data.py @@ -1,7 +1,7 @@ from __future__ import absolute_import ACCELERATION_DEFAULT = 460800 -TENDER_SECONDS_BUFFER = 20 +TENDER_SECONDS_BUFFER = 5 SUBMISSION_QUICK = "quick" SUBMISSION_QUICK_NO_AUCTION = "quick(mode:no-auction)" diff --git a/procedure_tools/utils/date.py b/procedure_tools/utils/date.py index 80706db..10172a6 100644 --- a/procedure_tools/utils/date.py +++ b/procedure_tools/utils/date.py @@ -31,16 +31,6 @@ def parse_date(datetime_str): return parser.parse(datetime_str) -def get_client_timedelta(clients): - client_timedelta = timedelta(seconds=0) - for client in clients: - if client: - client_timedelta = min(client_timedelta, client.client_timedelta) - timedelta_string = client_timedelta_string(client_timedelta) - logging.info(f"Using client time delta with server: {timedelta_string}\n") - return client_timedelta - - def client_timedelta_string(client_timedelta): total_seconds = client_timedelta.total_seconds() if total_seconds > 1: diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py index 7c5631f..40a5a2f 100644 --- a/procedure_tools/utils/process.py +++ b/procedure_tools/utils/process.py @@ -47,7 +47,7 @@ def get_bids(client, args, context, tender_id): logging.info("Check bids...\n") while True: - response = client.get_bids(tender_id) + response = client.get_tender_bids(tender_id, auth_token=args.token) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -62,11 +62,12 @@ def patch_bids(client, args, context, tender_id, bids_ids, bids_tokens, prefix=" path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: bid_patch_data = json.loads(content) - client.patch_bid( + client.patch_tender_bid( tender_id, bid_id, bids_tokens[bid_index], bid_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -102,11 +103,12 @@ def post_bid_res( if bid_res["requirement"]["title"] == req["title"]: bid_res["requirement"]["id"] = req["id"] - client.post_bid_res( + client.post_tender_bid_res( tender_id, bid_id, bids_tokens[bid_index], bid_res_data, + auth_token=args.token, ) @@ -159,12 +161,13 @@ def patch_agreement_contract( path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: agreement_contract_patch_data = json.loads(content) - client.patch_agreement_contract( + client.patch_tender_agreement_contract( tender_id, agreement_id, agreement_contract_id, tender_token, agreement_contract_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -183,21 +186,23 @@ def patch_agreements( data_file, ) if ds_response: - client.post_agreement_document( + client.post_tender_agreement_document( tender_id, agreement_id, tender_token, {"data": ds_response.json()["data"]}, + auth_token=args.token, ) data_file = "agreement_patch_{}.json".format(agreement_index) path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: agreement_patch_data = json.loads(content) - client.patch_agreement( + client.patch_tender_agreement( tender_id, agreement_id, tender_token, agreement_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -205,7 +210,7 @@ def patch_agreements( def get_agreement_contract(client, args, context, tender_id, agreement_id): logging.info("Checking agreement contracts...") while True: - response = client.get_agreement_contracts(tender_id, agreement_id) + response = client.get_tender_agreement_contracts(tender_id, agreement_id) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -220,7 +225,7 @@ def get_tender(client, args, context, tender_id): def get_agreements(client, args, context, tender_id): logging.info("Check agreements...\n") while True: - response = client.get_agreements(tender_id) + response = client.get_tender_agreements(tender_id) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -233,6 +238,7 @@ def get_agreement(client, args, context, agreement_id): while True: response = client.get_agreement( agreement_id, + auth_token=args.token, error_handler=default_success_handler, ) if "data" not in response.json().keys(): @@ -247,6 +253,7 @@ def get_contract(client, args, context, contract_id): while True: response = client.get_contract( contract_id, + auth_token=args.token, error_handler=default_success_handler, ) if "data" not in response.json().keys(): @@ -273,6 +280,7 @@ def patch_contracts_buyer_signer_info( contract_id, contract_token, contract_patch_data, + auth_token=args.token, success_handler=default_success_handler, ) @@ -294,6 +302,7 @@ def patch_contracts_suppliers_signer_info( contract_id, contract_token, contract_patch_data, + auth_token=args.token, success_handler=default_success_handler, ) @@ -313,6 +322,7 @@ def patch_contracts(client, args, context, contracts_ids, contracts_tokens, pref contract_id, contract_token, contract_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -327,6 +337,7 @@ def patch_tender_qual(client, args, context, tender_id, tender_token): tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -341,6 +352,7 @@ def patch_tender_waiting(client, args, context, tender_id, tender_token): tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -371,11 +383,12 @@ def patch_award( awards_id = awards_ids[award_index] with read_file(path, context=context, exit_filename=args.stop) as content: award_patch_data = json.loads(content) - response = client.patch_award( + response = client.patch_tender_award( tender_id, awards_id, tender_token, award_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) responses.append(response) @@ -385,7 +398,7 @@ def patch_award( def get_awards(client, args, context, tender_id): logging.info("Checking awards...\n") while True: - response = client.get_awards(tender_id) + response = client.get_tender_awards(tender_id) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -405,11 +418,12 @@ def patch_tender_contracts( path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: contract_patch_data = json.loads(content) - client.patch_contract( + client.patch_tender_contract( tender_id, contract_id, tender_token, contract_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -417,7 +431,7 @@ def patch_tender_contracts( def get_tender_contracts(client, args, context, tender_id): logging.info("Checking contracts...\n") while True: - response = client.get_contracts(tender_id) + response = client.get_tender_contracts(tender_id) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -435,6 +449,7 @@ def patch_tender_pre(client, args, context, tender_id, tender_token, prefix=""): tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -457,11 +472,12 @@ def patch_qualifications( path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: qualification_patch_data = json.loads(content) - client.patch_qualification( + client.patch_tender_qualification( tender_id, qualification_id, tender_token, qualification_patch_data, + auth_token=args.token, success_handler=item_patch_success_handler, ) @@ -469,7 +485,7 @@ def patch_qualifications( def get_qualifications(client, args, context, tender_id): logging.info("Checking qualifications...\n") while True: - response = client.get_qualifications(tender_id) + response = client.get_tender_qualifications(tender_id) if not response.json()["data"]: sleep(TENDER_SECONDS_BUFFER) else: @@ -487,10 +503,11 @@ def create_awards(client, args, context, tender_id, tender_token, prefix=""): path = get_data_file_path(get_data_path(args.data), award_data_file) with read_file(path, context=context, exit_filename=args.stop) as content: award_create_data = json.loads(content) - client.post_award( + client.post_tender_award( tender_id, tender_token, award_create_data, + auth_token=args.token, success_handler=item_create_success_handler, ) @@ -550,9 +567,10 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): bid_create_data["data"][ "qualificationDocuments" ] = bid_qualification_documents - response = client.post_bid( + response = client.post_tender_bid( tender_id, bid_create_data, + auth_token=args.token, success_handler=bid_create_success_handler, ) responses.append(response) @@ -583,6 +601,7 @@ def create_plans(client, args, context, prefix=""): plan_create_data = json.loads(content) response = client.post_plan( plan_create_data, + auth_token=args.token, success_handler=plan_create_success_handler, ) responses.append(response) @@ -599,6 +618,7 @@ def create_plan(client, args, context, prefix=""): plan_create_data = json.loads(content) response = client.post_plan( plan_create_data, + auth_token=args.token, success_handler=plan_create_success_handler, ) return response @@ -616,6 +636,7 @@ def patch_plan(client, args, context, plan_id, plan_token, prefix=""): plan_id, plan_token, plan_patch_data, + auth_token=args.token, success_handler=plan_patch_success_handler, ) return response @@ -635,14 +656,16 @@ def create_tender( with read_file(path, context=context, exit_filename=args.stop) as content: tender_create_data = json.loads(content) if plan_id: - response = client.post_tender( + response = client.post_plan_tender( plan_id, tender_create_data, + auth_token=args.token, success_handler=tender_create_success_handler, ) else: response = client.post_tender( tender_create_data, + auth_token=args.token, success_handler=tender_create_success_handler, ) @@ -662,7 +685,12 @@ def upload_tender_documents( ) if ds_response: data = ds_response.json()["data"] - client.post_tender_document(tender_id, tender_token, {"data": data}) + client.post_tender_document( + tender_id, + tender_token, + {"data": data}, + auth_token=args.token, + ) def upload_tender_notice( @@ -680,7 +708,10 @@ def upload_tender_notice( data = ds_response.json()["data"] data["documentType"] = "notice" response = client.post_tender_document( - tender_id, tender_token, {"data": data} + tender_id, + tender_token, + {"data": data}, + auth_token=args.token, ) return response @@ -703,6 +734,7 @@ def upload_evaluation_report( tender_id, tender_token, {"data": data}, + auth_token=args.token, error_handler=allow_error_handler, # TODO: Remove after feature release ) if not response.status_code == 201: @@ -736,6 +768,7 @@ def re_upload_evaluation_report( document_id, tender_token, {"data": data}, + auth_token=args.token, error_handler=allow_error_handler, # TODO: Remove after feature release ) @@ -794,20 +827,22 @@ def patch_stage2_credentials(client, args, context, stage2_tender_id, tender_tok path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: tender_patch_data = json.loads(content) - return client.patch_credentials( + return client.patch_tender_credentials( stage2_tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_create_success_handler, ) def patch_contract_credentials(client, args, context, contract_id, tender_token): logging.info("Getting credentials for contract...\n") - return client.patch_credentials( + return client.patch_contract_credentials( contract_id, tender_token, {}, + auth_token=args.token, success_handler=contract_credentials_success_handler, ) @@ -822,6 +857,7 @@ def patch_tender_tendering(client, args, context, tender_id, tender_token, prefi tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -836,6 +872,7 @@ def patch_tender_pending(client, args, context, tender_id, tender_token, prefix= tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -846,10 +883,11 @@ def post_criteria(client, args, context, tender_id, tender_token, prefix=""): path = get_data_file_path(get_data_path(args.data), data_file) with read_file(path, context=context, exit_filename=args.stop) as content: criteria_data = json.loads(content) - return client.post_criteria( + return client.post_tender_criteria( tender_id, tender_token, criteria_data, + auth_token=args.token, success_handler=tender_post_criteria_success_handler, ) @@ -864,6 +902,7 @@ def patch_tender(client, args, context, tender_id, tender_token, prefix=""): tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_patch_success_handler, ) @@ -876,8 +915,9 @@ def wait_edr_pre_qual(client, args, context, tender_id): doc["title"] for doc in qualification.get("documents", []) ]: sleep(TENDER_SECONDS_BUFFER) - qualification = client.get_qualification( - tender_id, qualification["id"] + qualification = client.get_tender_qualification( + tender_id, + qualification["id"], ).json()["data"] @@ -887,10 +927,10 @@ def wait_edr_qual(client, args, context, tender_id): for award in response.json()["data"]: while EDR_FILENAME not in [doc["title"] for doc in award.get("documents", [])]: sleep(TENDER_SECONDS_BUFFER) - award = client.get_award(tender_id, award["id"]).json()["data"] + award = client.get_tender_award(tender_id, award["id"]).json()["data"] -def wait_auction_participation_urls(client, tender_id, bids): +def wait_auction_participation_urls(client, args, tender_id, bids): logging.info("Waiting for the auction participation urls...\n") active_bids = [bid for bid in bids if bid["data"].get("status") != "unsuccessful"] active_bids_ids = [bid["data"]["id"] for bid in active_bids] @@ -908,7 +948,12 @@ def wait_auction_participation_urls(client, tender_id, bids): continue if bid_id not in success_lots_ids: success_lots_ids[bid_id] = [] - response = client.get_bid(tender_id, bid_id, bid_token) + response = client.get_tender_bid( + tender_id, + bid_id, + bid_token, + auth_token=args.token, + ) data = response.json()["data"] participation_url_exists = lambda x: "participationUrl" in x if "lotValues" in response.json()["data"]: @@ -964,10 +1009,11 @@ def post_tender_plan( ): logging.info("Connecting plan to tender...\n") tender_patch_data = {"data": {"id": plan_id}} - return client.post_plan( + return client.post_tender_plan( tender_id, tender_token, tender_patch_data, + auth_token=args.token, success_handler=tender_post_plan_success_handler, ) @@ -1013,26 +1059,29 @@ def create_complaints( with read_file(path, context=context, exit_filename=args.stop) as content: complaints_create_data = json.loads(content) if obj_type == "award": - response = client.post_award_complaint( + response = client.post_tender_award_complaint( tender_id, obj_id, acc_token, complaints_create_data, + auth_token=args.token, success_handler=tender_post_complaint_success_handler, ) elif obj_type == "qualification": - response = client.post_qualification_complaint( + response = client.post_tender_qualification_complaint( tender_id, obj_id, acc_token, complaints_create_data, + auth_token=args.token, success_handler=tender_post_complaint_success_handler, ) else: - response = client.post_complaint( + response = client.post_tender_complaint( tender_id, acc_token, complaints_create_data, + auth_token=args.token, success_handler=tender_post_complaint_success_handler, ) responses.append(response) @@ -1041,8 +1090,6 @@ def create_complaints( def patch_complaints( client, - bot_client, - reviewer_client, args, context, tender_id, @@ -1055,15 +1102,15 @@ def patch_complaints( file_subpath="", prefix="", ): - def get_client_for_role(role): + def get_auth_token_for_role(role): if role == "bot": - return bot_client + return args.bot_token elif role == "reviewer": - return reviewer_client + return args.reviewer_token elif role == "tenderer": - return client + return args.token elif role == "complainer": - return client + return args.token else: error("Unknown role: {}".format(role)) @@ -1128,36 +1175,39 @@ def get_access_token_for_role(role, tender_token, complaint_token): ) as content: complaint_patch_data = json.loads(content) role = data_file.split(".")[-2].split("_")[-1] - role_client = get_client_for_role(role) - if not role_client: - error("No client for role: {}".format(role)) + role_auth_token = get_auth_token_for_role(role) + if not role_auth_token: + error("No auth token for role: {}".format(role)) continue role_access_token = get_access_token_for_role( role, tender_token, complaint_token ) if obj_type == "award": - role_client.patch_award_complaint( + client.patch_tender_award_complaint( tender_id, obj_id, complaint_id, role_access_token, complaint_patch_data, + auth_token=role_auth_token, success_handler=item_patch_success_handler, ) elif obj_type == "qualification": - role_client.patch_qualification_complaint( + client.patch_tender_qualification_complaint( tender_id, obj_id, complaint_id, role_access_token, complaint_patch_data, + auth_token=role_auth_token, success_handler=item_patch_success_handler, ) else: - role_client.patch_complaint( + client.patch_tender_complaint( tender_id, complaint_id, role_access_token, complaint_patch_data, + auth_token=role_auth_token, success_handler=item_patch_success_handler, ) From b1757347902ce69f24923043554377eafe1a0feb Mon Sep 17 00:00:00 2001 From: smithumble Date: Fri, 9 Aug 2024 03:50:04 +0300 Subject: [PATCH 02/13] Refactor client request method --- procedure_tools/client.py | 60 +++++++++++++++------------------------ 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/procedure_tools/client.py b/procedure_tools/client.py index 35e1117..8ed5316 100644 --- a/procedure_tools/client.py +++ b/procedure_tools/client.py @@ -44,23 +44,7 @@ def __init__(self, host, session=None, debug=False, **kwargs): else: self.session = requests.Session() adapters.mount(session) - self.set_default_kwargs() - - def set_default_kwargs(self): - headers = copy(self.HEADERS_DEFAULT) - headers.update(self.kwargs.pop("headers", {})) - self.kwargs.update(dict(headers=headers)) - - @staticmethod - def pop_handlers(kwargs, success_handler=None, error_handler=None): - return dict( - (k, v) - for k, v in dict( - success_handler=kwargs.pop("success_handler", success_handler), - error_handler=kwargs.pop("error_handler", error_handler), - ).items() - if v is not None - ) + self.headers = copy(self.HEADERS_DEFAULT) def get_url(self, api_path): return urljoin(self.host, api_path) @@ -88,12 +72,15 @@ def log_response(self, text): logging.debug(f"Response:\n {response_text}") def request(self, method, path, **kwargs): - request_kwargs = deepcopy(self.kwargs) - auth_token = kwargs.pop("auth_token", None) - if auth_token: - request_kwargs["headers"].update({"Authorization": "Bearer " + auth_token}) - handlers = self.pop_handlers(kwargs) - request_kwargs.update(kwargs) + request_kwargs = copy(kwargs) + auth_token = request_kwargs.pop("auth_token", None) + success_handler = request_kwargs.pop("success_handler", None) + error_handler = request_kwargs.pop("error_handler", None) + request_kwargs["headers"] = copy(self.headers) + request_kwargs["headers"].update( + {"Authorization": "Bearer " + auth_token} if auth_token else {} + ) + request_kwargs["headers"].update(kwargs.get("headers", {})) url = self.get_url(path) response = self.session.request(method=method, url=url, **request_kwargs) if self.debug: @@ -102,6 +89,11 @@ def request(self, method, path, **kwargs): if response.status_code == 409: response = self.request(method, path, **kwargs) else: + handlers = {} + if success_handler: + handlers["success_handler"] = success_handler + if error_handler: + handlers["error_handler"] = error_handler response_handler(response, **handlers) return response @@ -133,10 +125,11 @@ def __init__( ): super(BaseCDBClient, self).__init__(host, session=session, **request_kwargs) self.path_prefix = path_prefix - self.set_kwargs() + self.headers.update({"Content-Type": "application/json"}) spore_url = self.get_url(self.get_api_path(self.SPORE_PATH)) # GET request to retrieve cookies and server time response = self.session.get(spore_url) + # Calculate client time delta with server client_datetime = get_utcnow() try: server_datetime = parse_date_header(response.headers.get("date")) @@ -145,9 +138,6 @@ def __init__( self.client_timedelta = timedelta() client_init_response_handler(response, self.client_timedelta) - def set_kwargs(self): - self.kwargs["headers"].update({"Content-Type": "application/json"}) - def get_api_path(self, path, acc_token=None): return urljoin( self.path_prefix, @@ -514,16 +504,12 @@ def __init__( self, host, username=None, password=None, session=None, **request_kwargs ): super(DsApiClient, self).__init__(host, session=session, **request_kwargs) - self.set_kwargs(username, password) - - def set_kwargs(self, username, password): - if username and password: - self.kwargs["headers"].update( - { - "Authorization": "Basic " - + b64encode("{}:{}".format(username, password).encode()).decode() - } - ) + self.headers.update( + { + "Authorization": "Basic " + + b64encode("{}:{}".format(username, password).encode()).decode() + } + ) def post_document_upload(self, files, **kwargs): path = self.UPLOAD_PATH From 616cdef212c06ba0e6b1948679a02370b97e4d83 Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 16:41:37 +0300 Subject: [PATCH 03/13] Refactor documents upload. Add bid proposal document. --- procedure_tools/client.py | 218 +++++++++--------- .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + ...notice.p7s => 2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s} | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s} | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../belowThreshold/2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 ...0.json => 4140_selection_bid_patch_0.json} | 0 ...1.json => 4140_selection_bid_patch_1.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 ...0.json => 4140_selection_bid_patch_0.json} | 0 ...1.json => 4140_selection_bid_patch_1.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 ...s_post_4.json => 2120_bid_res_post_4.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_4_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 ...bid_patch_4.json => 2140_bid_patch_4.json} | 0 ...stage2_bid_confidential_document_file.txt} | 0 ....txt => 4110_stage2_bid_document_file.txt} | 0 ..._stage2_bid_eligibility_document_file.txt} | 0 ...10_stage2_bid_financial_document_file.txt} | 0 ...tage2_bid_qualification_document_file.txt} | 0 ...0.json => 4120_stage2_bid_res_post_0.json} | 0 ...1.json => 4120_stage2_bid_res_post_1.json} | 0 ...2.json => 4120_stage2_bid_res_post_2.json} | 0 ...3.json => 4120_stage2_bid_res_post_3.json} | 0 .../4130_stage2_bid_proposal_0_attach.json | 6 + .../4130_stage2_bid_proposal_1_attach.json | 6 + .../4130_stage2_bid_proposal_2_attach.json | 6 + .../4130_stage2_bid_proposal_3_attach.json | 6 + .../4130_stage2_bid_proposal_file.p7s | 0 ...ch_0.json => 4140_stage2_bid_patch_0.json} | 0 ...ch_1.json => 4140_stage2_bid_patch_1.json} | 0 ...ch_2.json => 4140_stage2_bid_patch_2.json} | 0 ...ch_3.json => 4140_stage2_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 ...s_post_4.json => 2120_bid_res_post_4.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_4_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 ...bid_patch_4.json => 2140_bid_patch_4.json} | 0 ...stage2_bid_confidential_document_file.txt} | 0 ....txt => 4110_stage2_bid_document_file.txt} | 0 ..._stage2_bid_eligibility_document_file.txt} | 0 ...10_stage2_bid_financial_document_file.txt} | 0 ...tage2_bid_qualification_document_file.txt} | 0 ...0.json => 4120_stage2_bid_res_post_0.json} | 0 ...1.json => 4120_stage2_bid_res_post_1.json} | 0 ...2.json => 4120_stage2_bid_res_post_2.json} | 0 ...3.json => 4120_stage2_bid_res_post_3.json} | 0 .../4130_stage2_bid_proposal_0_attach.json | 6 + .../4130_stage2_bid_proposal_1_attach.json | 6 + .../4130_stage2_bid_proposal_2_attach.json | 6 + .../4130_stage2_bid_proposal_3_attach.json | 6 + .../4130_stage2_bid_proposal_file.p7s | 0 ...ch_0.json => 4140_stage2_bid_patch_0.json} | 0 ...ch_1.json => 4140_stage2_bid_patch_1.json} | 0 ...ch_2.json => 4140_stage2_bid_patch_2.json} | 0 ...ch_3.json => 4140_stage2_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 ...s_post_4.json => 2120_bid_res_post_4.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../2130_bid_proposal_4_attach.json | 6 + .../2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 ...bid_patch_4.json => 2140_bid_patch_4.json} | 0 ...stage2_bid_confidential_document_file.txt} | 0 ....txt => 4110_stage2_bid_document_file.txt} | 0 ..._stage2_bid_eligibility_document_file.txt} | 0 ...10_stage2_bid_financial_document_file.txt} | 0 ...tage2_bid_qualification_document_file.txt} | 0 ...0.json => 4120_stage2_bid_res_post_0.json} | 0 ...1.json => 4120_stage2_bid_res_post_1.json} | 0 ...2.json => 4120_stage2_bid_res_post_2.json} | 0 ...3.json => 4120_stage2_bid_res_post_3.json} | 0 .../4130_stage2_bid_proposal_0_attach.json | 6 + .../4130_stage2_bid_proposal_1_attach.json | 6 + .../4130_stage2_bid_proposal_2_attach.json | 6 + .../4130_stage2_bid_proposal_3_attach.json | 6 + .../4130_stage2_bid_proposal_file.p7s | 0 ...ch_0.json => 4140_stage2_bid_patch_0.json} | 0 ...ch_1.json => 4140_stage2_bid_patch_1.json} | 0 ...ch_2.json => 4140_stage2_bid_patch_2.json} | 0 ...ch_3.json => 4140_stage2_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../esco.features/2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../2130_bid_proposal_2_attach.json | 6 + .../2130_bid_proposal_3_attach.json | 6 + .../esco.features/2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 .../esco/2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../data/esco/2030_tender_notice_attach.json | 6 + .../data/esco/2030_tender_notice_file.p7s | 0 ...> 2110_bid_confidential_document_file.txt} | 0 ...ocument.txt => 2110_bid_document_file.txt} | 0 ...=> 2110_bid_eligibility_document_file.txt} | 0 ...t => 2110_bid_financial_document_file.txt} | 0 ... 2110_bid_qualification_document_file.txt} | 0 ...s_post_0.json => 2120_bid_res_post_0.json} | 0 ...s_post_1.json => 2120_bid_res_post_1.json} | 0 ...s_post_2.json => 2120_bid_res_post_2.json} | 0 ...s_post_3.json => 2120_bid_res_post_3.json} | 0 .../data/esco/2130_bid_proposal_0_attach.json | 6 + .../data/esco/2130_bid_proposal_1_attach.json | 6 + .../data/esco/2130_bid_proposal_2_attach.json | 6 + .../data/esco/2130_bid_proposal_3_attach.json | 6 + .../data/esco/2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 ...bid_patch_2.json => 2140_bid_patch_2.json} | 0 ...bid_patch_3.json => 2140_bid_patch_3.json} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 procedure_tools/data/reorder.py | 15 +- .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2010_tender_document_attach.json | 5 + ...ment.txt => 2010_tender_document_file.txt} | 0 .../2030_tender_notice_attach.json | 6 + .../2030_tender_notice_file.p7s | 0 .../2110_bid_confidential_document_file.txt | 1 + .../simple.defense/2110_bid_document_file.txt | 1 + .../2110_bid_eligibility_document_file.txt | 1 + .../2110_bid_financial_document_file.txt | 1 + .../2110_bid_qualification_document_file.txt | 1 + .../2130_bid_proposal_0_attach.json | 6 + .../2130_bid_proposal_1_attach.json | 6 + .../simple.defense/2130_bid_proposal_file.p7s | 0 ...bid_patch_0.json => 2140_bid_patch_0.json} | 0 ...bid_patch_1.json => 2140_bid_patch_1.json} | 0 procedure_tools/procedure.py | 11 + procedure_tools/utils/handlers.py | 14 ++ procedure_tools/utils/process.py | 199 ++++++++++------ 473 files changed, 994 insertions(+), 183 deletions(-) create mode 100644 procedure_tools/data/aboveThreshold.features/2010_tender_document_attach.json rename procedure_tools/data/aboveThreshold.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThreshold.features/2030_tender_notice_attach.json rename procedure_tools/data/aboveThreshold.features/{2030_tender_notice.p7s => 2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThreshold.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThreshold.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThreshold.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/aboveThreshold.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThreshold.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThreshold.features/2130_bid_proposal_2_attach.json rename procedure_tools/data/{aboveThreshold.lcc/2030_tender_notice.p7s => aboveThreshold.features/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThreshold.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThreshold.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThreshold.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/aboveThreshold.lcc/2010_tender_document_attach.json rename procedure_tools/data/aboveThreshold.lcc/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_attach.json rename procedure_tools/data/{aboveThreshold/2030_tender_notice.p7s => aboveThreshold.lcc/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_2_attach.json rename procedure_tools/data/{aboveThresholdEU.features/2030_tender_notice.p7s => aboveThreshold.lcc/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThreshold.lcc/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/aboveThreshold/2010_tender_document_attach.json rename procedure_tools/data/aboveThreshold/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThreshold/2030_tender_notice_attach.json rename procedure_tools/data/{aboveThresholdEU.lcc/2030_tender_notice.p7s => aboveThreshold/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThreshold/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThreshold/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThreshold/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) create mode 100644 procedure_tools/data/aboveThreshold/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThreshold/2130_bid_proposal_1_attach.json rename procedure_tools/data/{aboveThresholdEU/2030_tender_notice.p7s => aboveThreshold/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThreshold/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThreshold/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.features/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdEU.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_attach.json rename procedure_tools/data/{aboveThresholdUA.features/2030_tender_notice.p7s => aboveThresholdEU.features/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_3_attach.json rename procedure_tools/data/{aboveThresholdUA.lcc/2030_tender_notice.p7s => aboveThresholdEU.features/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/aboveThresholdEU.features/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdEU.lcc/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_attach.json rename procedure_tools/data/{aboveThresholdUA/2030_tender_notice.p7s => aboveThresholdEU.lcc/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_3_attach.json rename procedure_tools/data/{belowThreshold.central/2030_tender_notice.p7s => aboveThresholdEU.lcc/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/aboveThresholdEU.lcc/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdEU/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU/2030_tender_notice_attach.json rename procedure_tools/data/{belowThreshold.features/2030_tender_notice.p7s => aboveThresholdEU/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdEU/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/aboveThresholdEU/2130_bid_proposal_3_attach.json rename procedure_tools/data/{belowThreshold/2030_tender_notice.p7s => aboveThresholdEU/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdEU/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/aboveThresholdEU/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.features/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdUA.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_attach.json rename procedure_tools/data/{closeFrameworkAgreementUA.central/2030_tender_notice.p7s => aboveThresholdUA.features/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_2_attach.json rename procedure_tools/data/{closeFrameworkAgreementUA/2030_tender_notice.p7s => aboveThresholdUA.features/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdUA.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdUA.lcc/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_attach.json rename procedure_tools/data/{competitiveDialogueEU/2030_tender_notice.p7s => aboveThresholdUA.lcc/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_2_attach.json rename procedure_tools/data/{competitiveDialogueUA.features/2030_tender_notice.p7s => aboveThresholdUA.lcc/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdUA.lcc/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA/2010_tender_document_attach.json rename procedure_tools/data/aboveThresholdUA/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA/2030_tender_notice_attach.json rename procedure_tools/data/{competitiveDialogueUA/2030_tender_notice.p7s => aboveThresholdUA/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/aboveThresholdUA/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/aboveThresholdUA/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/aboveThresholdUA/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/aboveThresholdUA/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/aboveThresholdUA/2130_bid_proposal_2_attach.json rename procedure_tools/data/{esco.features/2030_tender_notice.p7s => aboveThresholdUA/2130_bid_proposal_file.p7s} (100%) rename procedure_tools/data/aboveThresholdUA/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/aboveThresholdUA/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/aboveThresholdUA/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/belowThreshold.central/2010_tender_document_attach.json rename procedure_tools/data/belowThreshold.central/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/belowThreshold.central/2030_tender_notice_attach.json rename procedure_tools/data/{esco/2030_tender_notice.p7s => belowThreshold.central/2030_tender_notice_file.p7s} (100%) rename procedure_tools/data/belowThreshold.central/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.central/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.central/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.central/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.central/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.central/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/belowThreshold.central/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) create mode 100644 procedure_tools/data/belowThreshold.central/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/belowThreshold.central/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/belowThreshold.central/2130_bid_proposal_file.p7s rename procedure_tools/data/belowThreshold.central/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/belowThreshold.central/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) create mode 100644 procedure_tools/data/belowThreshold.features/2010_tender_document_attach.json rename procedure_tools/data/belowThreshold.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/belowThreshold.features/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/belowThreshold.features/2030_tender_notice_file.p7s rename procedure_tools/data/belowThreshold.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/belowThreshold.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/belowThreshold.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/belowThreshold.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) create mode 100644 procedure_tools/data/belowThreshold.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/belowThreshold.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/belowThreshold.features/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/belowThreshold.features/2130_bid_proposal_file.p7s rename procedure_tools/data/belowThreshold.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/belowThreshold.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/belowThreshold.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) create mode 100644 procedure_tools/data/belowThreshold/2010_tender_document_attach.json rename procedure_tools/data/belowThreshold/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/belowThreshold/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/belowThreshold/2030_tender_notice_file.p7s rename procedure_tools/data/belowThreshold/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/belowThreshold/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/belowThreshold/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/belowThreshold/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/belowThreshold/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/belowThreshold/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/belowThreshold/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) create mode 100644 procedure_tools/data/belowThreshold/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/belowThreshold/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/belowThreshold/2130_bid_proposal_file.p7s rename procedure_tools/data/belowThreshold/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/belowThreshold/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_attach.json rename procedure_tools/data/closeFrameworkAgreementUA.central/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_file.p7s rename procedure_tools/data/closeFrameworkAgreementUA.central/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_file.p7s rename procedure_tools/data/closeFrameworkAgreementUA.central/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{4120_selection_bid_patch_0.json => 4140_selection_bid_patch_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA.central/{4120_selection_bid_patch_1.json => 4140_selection_bid_patch_1.json} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_attach.json rename procedure_tools/data/closeFrameworkAgreementUA/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_file.p7s rename procedure_tools/data/closeFrameworkAgreementUA/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_file.p7s rename procedure_tools/data/closeFrameworkAgreementUA/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{4120_selection_bid_patch_0.json => 4140_selection_bid_patch_0.json} (100%) rename procedure_tools/data/closeFrameworkAgreementUA/{4120_selection_bid_patch_1.json => 4140_selection_bid_patch_1.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/2010_tender_document_attach.json rename procedure_tools/data/competitiveDialogueEU/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2030_tender_notice_file.p7s rename procedure_tools/data/competitiveDialogueEU/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2110_bid_res_post_4.json => 2120_bid_res_post_4.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_4_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueEU/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{2120_bid_patch_4.json => 2140_bid_patch_4.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4100_stage2_bid_confidential_document.txt => 4110_stage2_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{4100_stage2_bid_document.txt => 4110_stage2_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{4100_stage2_bid_eligibility_document.txt => 4110_stage2_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{4100_stage2_bid_financial_document.txt => 4110_stage2_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{4100_stage2_bid_qualification_document.txt => 4110_stage2_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueEU/{4110_stage2_bid_res_post_0.json => 4120_stage2_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4110_stage2_bid_res_post_1.json => 4120_stage2_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4110_stage2_bid_res_post_2.json => 4120_stage2_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4110_stage2_bid_res_post_3.json => 4120_stage2_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueEU/{4120_stage2_bid_patch_0.json => 4140_stage2_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4120_stage2_bid_patch_1.json => 4140_stage2_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4120_stage2_bid_patch_2.json => 4140_stage2_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueEU/{4120_stage2_bid_patch_3.json => 4140_stage2_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_attach.json rename procedure_tools/data/competitiveDialogueUA.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_file.p7s rename procedure_tools/data/competitiveDialogueUA.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2110_bid_res_post_4.json => 2120_bid_res_post_4.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_4_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueUA.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{2120_bid_patch_4.json => 2140_bid_patch_4.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4100_stage2_bid_confidential_document.txt => 4110_stage2_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4100_stage2_bid_document.txt => 4110_stage2_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4100_stage2_bid_eligibility_document.txt => 4110_stage2_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4100_stage2_bid_financial_document.txt => 4110_stage2_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4100_stage2_bid_qualification_document.txt => 4110_stage2_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4110_stage2_bid_res_post_0.json => 4120_stage2_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4110_stage2_bid_res_post_1.json => 4120_stage2_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4110_stage2_bid_res_post_2.json => 4120_stage2_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4110_stage2_bid_res_post_3.json => 4120_stage2_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueUA.features/{4120_stage2_bid_patch_0.json => 4140_stage2_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4120_stage2_bid_patch_1.json => 4140_stage2_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4120_stage2_bid_patch_2.json => 4140_stage2_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA.features/{4120_stage2_bid_patch_3.json => 4140_stage2_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA/2010_tender_document_attach.json rename procedure_tools/data/competitiveDialogueUA/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2030_tender_notice_file.p7s rename procedure_tools/data/competitiveDialogueUA/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2110_bid_res_post_4.json => 2120_bid_res_post_4.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_4_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueUA/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{2120_bid_patch_4.json => 2140_bid_patch_4.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4100_stage2_bid_confidential_document.txt => 4110_stage2_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{4100_stage2_bid_document.txt => 4110_stage2_bid_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{4100_stage2_bid_eligibility_document.txt => 4110_stage2_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{4100_stage2_bid_financial_document.txt => 4110_stage2_bid_financial_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{4100_stage2_bid_qualification_document.txt => 4110_stage2_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/competitiveDialogueUA/{4110_stage2_bid_res_post_0.json => 4120_stage2_bid_res_post_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4110_stage2_bid_res_post_1.json => 4120_stage2_bid_res_post_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4110_stage2_bid_res_post_2.json => 4120_stage2_bid_res_post_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4110_stage2_bid_res_post_3.json => 4120_stage2_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_file.p7s rename procedure_tools/data/competitiveDialogueUA/{4120_stage2_bid_patch_0.json => 4140_stage2_bid_patch_0.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4120_stage2_bid_patch_1.json => 4140_stage2_bid_patch_1.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4120_stage2_bid_patch_2.json => 4140_stage2_bid_patch_2.json} (100%) rename procedure_tools/data/competitiveDialogueUA/{4120_stage2_bid_patch_3.json => 4140_stage2_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/esco.features/2010_tender_document_attach.json rename procedure_tools/data/esco.features/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/esco.features/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/esco.features/2030_tender_notice_file.p7s rename procedure_tools/data/esco.features/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/esco.features/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/esco.features/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/esco.features/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/esco.features/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/esco.features/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/esco.features/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/esco.features/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/esco.features/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/esco.features/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/esco.features/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/esco.features/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/esco.features/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/esco.features/2130_bid_proposal_file.p7s rename procedure_tools/data/esco.features/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/esco.features/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/esco.features/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/esco.features/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/esco/2010_tender_document_attach.json rename procedure_tools/data/esco/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/esco/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/esco/2030_tender_notice_file.p7s rename procedure_tools/data/esco/{2100_bid_confidential_document.txt => 2110_bid_confidential_document_file.txt} (100%) rename procedure_tools/data/esco/{2100_bid_document.txt => 2110_bid_document_file.txt} (100%) rename procedure_tools/data/esco/{2100_bid_eligibility_document.txt => 2110_bid_eligibility_document_file.txt} (100%) rename procedure_tools/data/esco/{2100_bid_financial_document.txt => 2110_bid_financial_document_file.txt} (100%) rename procedure_tools/data/esco/{2100_bid_qualification_document.txt => 2110_bid_qualification_document_file.txt} (100%) rename procedure_tools/data/esco/{2110_bid_res_post_0.json => 2120_bid_res_post_0.json} (100%) rename procedure_tools/data/esco/{2110_bid_res_post_1.json => 2120_bid_res_post_1.json} (100%) rename procedure_tools/data/esco/{2110_bid_res_post_2.json => 2120_bid_res_post_2.json} (100%) rename procedure_tools/data/esco/{2110_bid_res_post_3.json => 2120_bid_res_post_3.json} (100%) create mode 100644 procedure_tools/data/esco/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/esco/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/esco/2130_bid_proposal_2_attach.json create mode 100644 procedure_tools/data/esco/2130_bid_proposal_3_attach.json create mode 100644 procedure_tools/data/esco/2130_bid_proposal_file.p7s rename procedure_tools/data/esco/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/esco/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) rename procedure_tools/data/esco/{2120_bid_patch_2.json => 2140_bid_patch_2.json} (100%) rename procedure_tools/data/esco/{2120_bid_patch_3.json => 2140_bid_patch_3.json} (100%) create mode 100644 procedure_tools/data/negotiation.quick/2010_tender_document_attach.json rename procedure_tools/data/negotiation.quick/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/negotiation/2010_tender_document_attach.json rename procedure_tools/data/negotiation/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/reporting/2010_tender_document_attach.json rename procedure_tools/data/reporting/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/simple.defense/2010_tender_document_attach.json rename procedure_tools/data/simple.defense/{2010_tender_document.txt => 2010_tender_document_file.txt} (100%) create mode 100644 procedure_tools/data/simple.defense/2030_tender_notice_attach.json create mode 100644 procedure_tools/data/simple.defense/2030_tender_notice_file.p7s create mode 100644 procedure_tools/data/simple.defense/2110_bid_confidential_document_file.txt create mode 100644 procedure_tools/data/simple.defense/2110_bid_document_file.txt create mode 100644 procedure_tools/data/simple.defense/2110_bid_eligibility_document_file.txt create mode 100644 procedure_tools/data/simple.defense/2110_bid_financial_document_file.txt create mode 100644 procedure_tools/data/simple.defense/2110_bid_qualification_document_file.txt create mode 100644 procedure_tools/data/simple.defense/2130_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/simple.defense/2130_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/simple.defense/2130_bid_proposal_file.p7s rename procedure_tools/data/simple.defense/{2120_bid_patch_0.json => 2140_bid_patch_0.json} (100%) rename procedure_tools/data/simple.defense/{2120_bid_patch_1.json => 2140_bid_patch_1.json} (100%) diff --git a/procedure_tools/client.py b/procedure_tools/client.py index 8ed5316..0a16f46 100644 --- a/procedure_tools/client.py +++ b/procedure_tools/client.py @@ -155,11 +155,12 @@ class CDBClient(BaseCDBClient): TENDERS_COLLECTION_PATH = "tenders" TENDERS_PATH = "tenders/{}" TENDERS_PLANS_PATH = "tenders/{}/plans" - TENDERS_DOCUMENTS_COLLECTION_PATH = "tenders/{}/documents" - TENDERS_DOCUMENTS_PATH = "tenders/{}/documents/{}" + TENDERS_DOCS_COLLECTION_PATH = "tenders/{}/documents" + TENDERS_DOCS_PATH = "tenders/{}/documents/{}" TENDERS_CRITERIA_COLLECTION_PATH = "tenders/{}/criteria" TENDERS_BIDS_COLLECTION_PATH = "tenders/{}/bids" TENDERS_BIDS_PATH = "tenders/{}/bids/{}" + TENDERS_BIDS_DOCS_COLLECTION_PATH = "tenders/{}/bids/{}/documents" TENDERS_BIDS_RES_COLLECTION_PATH = "tenders/{}/bids/{}/requirement_responses" TENDERS_AWARDS_COLLECTION_PATH = "tenders/{}/awards" TENDERS_AWARDS_PATH = "tenders/{}/awards/{}" @@ -169,7 +170,7 @@ class CDBClient(BaseCDBClient): TENDERS_QUALIFICATIONS_PATH = "tenders/{}/qualifications/{}" TENDERS_AGREEMENTS_COLLECTION_PATH = "tenders/{}/agreements" TENDERS_AGREEMENTS_PATH = "tenders/{}/agreements/{}" - TENDERS_AGREEMENTS_DOCUMENTS_COLLECTION_PATH = "tenders/{}/agreements/{}/documents" + TENDERS_AGREEMENTS_DOCS_COLLECTION_PATH = "tenders/{}/agreements/{}/documents" TENDERS_AGREEMENTS_CONTRACTS_COLLECTION_PATH = "tenders/{}/agreements/{}/contracts" TENDERS_AGREEMENTS_CONTRACTS_PATH = "tenders/{}/agreements/{}/contracts/{}" TENDERS_CREDENTIALS_PATH = "tenders/{}/credentials" @@ -192,306 +193,303 @@ class CDBClient(BaseCDBClient): AGREEMENTS_PATH = "agreements/{}" def get_plan(self, plan_id, **kwargs): - contracts_path = self.PLANS_PATH.format(plan_id) - path = self.get_api_path(contracts_path) + sub_path = self.PLANS_PATH.format(plan_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_plan(self, json, **kwargs): - tenders_path = self.PLANS_COLLECTION_PATH - path = self.get_api_path(tenders_path) + sub_path = self.PLANS_COLLECTION_PATH + path = self.get_api_path(sub_path) return self.post(path, json, **kwargs) def patch_plan(self, plan_id, acc_token, json, **kwargs): - tenders_path = self.PLANS_PATH.format(plan_id) - path = self.get_api_path(tenders_path, acc_token=acc_token) + sub_path = self.PLANS_PATH.format(plan_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def post_plan_tender(self, plan_id, json, **kwargs): - tenders_path = self.PLANS_TENDERS_COLLECTION_PATH.format(plan_id) - path = self.get_api_path(tenders_path) + sub_path = self.PLANS_TENDERS_COLLECTION_PATH.format(plan_id) + path = self.get_api_path(sub_path) return self.post(path, json, **kwargs) def get_tender(self, tender_id, **kwargs): - tenders_path = self.TENDERS_PATH.format(tender_id) - path = self.get_api_path(tenders_path) + sub_path = self.TENDERS_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_tender(self, json, **kwargs): - tenders_path = self.TENDERS_COLLECTION_PATH - path = self.get_api_path(tenders_path) + sub_path = self.TENDERS_COLLECTION_PATH + path = self.get_api_path(sub_path) return self.post(path, json, **kwargs) def patch_tender(self, tender_id, acc_token, json, **kwargs): - tenders_path = self.TENDERS_PATH.format(tender_id) - path = self.get_api_path(tenders_path, acc_token=acc_token) + sub_path = self.TENDERS_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def post_tender_plan(self, tender_id, acc_token, json, **kwargs): - tenders_path = self.TENDERS_PLANS_PATH.format(tender_id) - path = self.get_api_path(tenders_path, acc_token=acc_token) + sub_path = self.TENDERS_PLANS_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def post_tender_document(self, tender_id, acc_token, json, **kwargs): - documents_path = self.TENDERS_DOCUMENTS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(documents_path, acc_token=acc_token) + sub_path = self.TENDERS_DOCS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_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) + sub_path = self.TENDERS_DOCS_PATH.format(tender_id, document_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.put(path, json, **kwargs) def post_tender_criteria(self, tender_id, acc_token, json, **kwargs): - criteria_path = self.TENDERS_CRITERIA_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(criteria_path, acc_token=acc_token) + sub_path = self.TENDERS_CRITERIA_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def get_tender_bids(self, tender_id, **kwargs): - bid_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(bid_path) + sub_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_bid(self, tender_id, bid_id, acc_token, **kwargs): - bid_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) - path = self.get_api_path(bid_path, acc_token=acc_token) + sub_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.get(path, **kwargs) def post_tender_bid(self, tender_id, json, **kwargs): - bids_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(bids_path) + sub_path = self.TENDERS_BIDS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.post(path, json, **kwargs) def patch_tender_bid(self, tender_id, bid_id, acc_token, json, **kwargs): - bid_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) - path = self.get_api_path(bid_path, acc_token=acc_token) + sub_path = self.TENDERS_BIDS_PATH.format(tender_id, bid_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) + def post_tender_bid_document(self, tender_id, bid_id, acc_token, json, **kwargs): + sub_path = self.TENDERS_BIDS_DOCS_COLLECTION_PATH.format(tender_id, bid_id) + path = self.get_api_path(sub_path, acc_token=acc_token) + return self.post(path, json, **kwargs) + def post_tender_bid_res(self, tender_id, bid_id, acc_token, json, **kwargs): - bid_res_path = self.TENDERS_BIDS_RES_COLLECTION_PATH.format(tender_id, bid_id) - path = self.get_api_path(bid_res_path, acc_token=acc_token) + sub_path = self.TENDERS_BIDS_RES_COLLECTION_PATH.format(tender_id, bid_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def get_tender_complaints(self, tender_id, **kwargs): - complaints_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(complaints_path) + sub_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_complaint(self, tender_id, complaint_id, **kwargs): - complaints_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) - path = self.get_api_path(complaints_path) + sub_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_tender_complaint(self, tender_id, acc_token, json, **kwargs): - complaints_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(complaints_path, acc_token=acc_token) + sub_path = self.TENDERS_COMPLAINTS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def patch_tender_complaint( self, tender_id, complaint_id, acc_token, json, **kwargs ): - complaints_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) - path = self.get_api_path(complaints_path, acc_token=acc_token) + sub_path = self.TENDERS_COMPLAINTS_PATH.format(tender_id, complaint_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_qualifications(self, tender_id, **kwargs): - qualifications_path = self.TENDERS_QUALIFICATIONS_COLLECTION_PATH.format( - tender_id - ) - path = self.get_api_path(qualifications_path) + sub_path = self.TENDERS_QUALIFICATIONS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_qualification(self, tender_id, qualification_id, **kwargs): - qualifications_path = self.TENDERS_QUALIFICATIONS_PATH.format( - tender_id, qualification_id - ) - path = self.get_api_path(qualifications_path) + sub_path = self.TENDERS_QUALIFICATIONS_PATH.format(tender_id, qualification_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def patch_tender_qualification( self, tender_id, qualification_id, acc_token, json, **kwargs ): - qualifications_path = self.TENDERS_QUALIFICATIONS_PATH.format( + sub_path = self.TENDERS_QUALIFICATIONS_PATH.format( tender_id, qualification_id, acc_token ) - path = self.get_api_path(qualifications_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_qualification_complaints( self, tender_id, qualification_id, **kwargs ): - complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( + sub_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( tender_id, qualification_id ) - path = self.get_api_path(complaints_path) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_qualification_complaint( self, tender_id, qualification_id, complaint_id, **kwargs ): - complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( + sub_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( tender_id, qualification_id, complaint_id ) - path = self.get_api_path(complaints_path) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_tender_qualification_complaint( self, tender_id, qualification_id, acc_token, json, **kwargs ): - complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( + sub_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_COLLECTION_PATH.format( tender_id, qualification_id ) - path = self.get_api_path(complaints_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def patch_tender_qualification_complaint( self, tender_id, qualification_id, complaint_id, acc_token, json, **kwargs ): - complaints_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( + sub_path = self.TENDERS_QUALIFICATIONS_COMPLAINTS_PATH.format( tender_id, qualification_id, complaint_id ) - path = self.get_api_path(complaints_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_awards(self, tender_id, **kwargs): - awards_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(awards_path) + sub_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_award(self, tender_id, award_id, **kwargs): - awards_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id) - path = self.get_api_path(awards_path) + sub_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_tender_award(self, tender_id, acc_token, json, **kwargs): - awards_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(awards_path, acc_token=acc_token) + sub_path = self.TENDERS_AWARDS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def patch_tender_award(self, tender_id, award_id, acc_token, json, **kwargs): - awards_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id, acc_token) - path = self.get_api_path(awards_path, acc_token=acc_token) + sub_path = self.TENDERS_AWARDS_PATH.format(tender_id, award_id, acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_award_complaints(self, tender_id, award_id, **kwargs): - complaints_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( + sub_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( tender_id, award_id ) - path = self.get_api_path(complaints_path) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def get_tender_award_complaint(self, tender_id, award_id, complaint_id, **kwargs): - complaints_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( + sub_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( tender_id, award_id, complaint_id ) - path = self.get_api_path(complaints_path) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def post_tender_award_complaint( self, tender_id, award_id, acc_token, json, **kwargs ): - complaints_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( + sub_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format( tender_id, award_id ) - path = self.get_api_path(complaints_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def patch_tender_award_complaint( self, tender_id, award_id, complaint_id, acc_token, json, **kwargs ): - complaints_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( + sub_path = self.TENDERS_AWARDS_COMPLAINTS_PATH.format( tender_id, award_id, complaint_id ) - path = self.get_api_path(complaints_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_contracts(self, tender_id, **kwargs): - awards_path = self.TENDERS_CONTRACTS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(awards_path) + sub_path = self.TENDERS_CONTRACTS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def patch_tender_contract(self, tender_id, contract_id, acc_token, json, **kwargs): - awards_path = self.TENDERS_CONTRACTS_PATH.format( - tender_id, contract_id, acc_token - ) - path = self.get_api_path(awards_path, acc_token=acc_token) + sub_path = self.TENDERS_CONTRACTS_PATH.format(tender_id, contract_id, acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_tender_agreements(self, tender_id, **kwargs): - agreements_path = self.TENDERS_AGREEMENTS_COLLECTION_PATH.format(tender_id) - path = self.get_api_path(agreements_path) + sub_path = self.TENDERS_AGREEMENTS_COLLECTION_PATH.format(tender_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def patch_tender_agreement( self, tender_id, agreement_id, acc_token, json, **kwargs ): - agreements_path = self.TENDERS_AGREEMENTS_PATH.format( + sub_path = self.TENDERS_AGREEMENTS_PATH.format( tender_id, agreement_id, acc_token ) - path = self.get_api_path(agreements_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def post_tender_agreement_document( self, tender_id, agreement_id, acc_token, json, **kwargs ): - agreements_path = self.TENDERS_AGREEMENTS_DOCUMENTS_COLLECTION_PATH.format( + sub_path = self.TENDERS_AGREEMENTS_DOCS_COLLECTION_PATH.format( tender_id, agreement_id ) - path = self.get_api_path(agreements_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.post(path, json, **kwargs) def get_tender_agreement_contracts(self, tender_id, agreement_id, **kwargs): - agreement_contracts_path = ( - self.TENDERS_AGREEMENTS_CONTRACTS_COLLECTION_PATH.format( - tender_id, agreement_id - ) + sub_path = self.TENDERS_AGREEMENTS_CONTRACTS_COLLECTION_PATH.format( + tender_id, agreement_id ) - path = self.get_api_path(agreement_contracts_path) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) def patch_tender_agreement_contract( self, tender_id, agreement_id, contract_id, acc_token, json, **kwargs ): - agreement_contracts_path = self.TENDERS_AGREEMENTS_CONTRACTS_PATH.format( + sub_path = self.TENDERS_AGREEMENTS_CONTRACTS_PATH.format( tender_id, agreement_id, contract_id, acc_token ) - path = self.get_api_path(agreement_contracts_path, acc_token=acc_token) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def patch_tender_credentials(self, tender_id, acc_token, json, **kwargs): - credentials_path = self.TENDERS_CREDENTIALS_PATH.format(tender_id) - path = self.get_api_path(credentials_path, acc_token=acc_token) + sub_path = self.TENDERS_CREDENTIALS_PATH.format(tender_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_contract(self, contract_id, **kwargs): - contracts_path = self.CONTRACTS_PATH.format(contract_id) - path = self.get_api_path(contracts_path) + sub_path = self.CONTRACTS_PATH.format(contract_id) + path = self.get_api_path(sub_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) + sub_path = self.CONTRACTS_PATH.format(contract_id) + path = self.get_api_path(sub_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.CONTRACTS_BUYERS_SIGNER_INFO_PATH.format(contract_id) - path = self.get_api_path(contracts_path, acc_token=acc_token) + sub_path = self.CONTRACTS_BUYERS_SIGNER_INFO_PATH.format(contract_id) + path = self.get_api_path(sub_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.CONTRACTS_SUPPLIERS_SIGNER_INFO_PATH.format(contract_id) - path = self.get_api_path(contracts_path, acc_token=acc_token) + sub_path = self.CONTRACTS_SUPPLIERS_SIGNER_INFO_PATH.format(contract_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.put(path, json, **kwargs) def patch_contract_credentials(self, contract_id, acc_token, json, **kwargs): - credentials_path = self.CONTRACTS_CREDENTIALS_PATH.format(contract_id) - path = self.get_api_path(credentials_path, acc_token=acc_token) + sub_path = self.CONTRACTS_CREDENTIALS_PATH.format(contract_id) + path = self.get_api_path(sub_path, acc_token=acc_token) return self.patch(path, json, **kwargs) def get_agreement(self, agreement_id, **kwargs): - agreements_path = self.AGREEMENTS_PATH.format(agreement_id) - path = self.get_api_path(agreements_path) + sub_path = self.AGREEMENTS_PATH.format(agreement_id) + path = self.get_api_path(sub_path) return self.get(path, **kwargs) diff --git a/procedure_tools/data/aboveThreshold.features/2010_tender_document_attach.json b/procedure_tools/data/aboveThreshold.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.features/2010_tender_document.txt b/procedure_tools/data/aboveThreshold.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2010_tender_document.txt rename to procedure_tools/data/aboveThreshold.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2030_tender_notice_attach.json b/procedure_tools/data/aboveThreshold.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold.features/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold.features/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThreshold.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThreshold.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_document.txt b/procedure_tools/data/aboveThreshold.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2100_bid_document.txt rename to procedure_tools/data/aboveThreshold.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThreshold.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThreshold.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_financial_document.txt b/procedure_tools/data/aboveThreshold.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThreshold.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThreshold.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThreshold.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.features/2110_bid_res_post_0.json b/procedure_tools/data/aboveThreshold.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThreshold.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThreshold.features/2110_bid_res_post_1.json b/procedure_tools/data/aboveThreshold.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThreshold.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThreshold.features/2110_bid_res_post_2.json b/procedure_tools/data/aboveThreshold.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThreshold.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.lcc/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold.features/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold.features/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThreshold.features/2120_bid_patch_0.json b/procedure_tools/data/aboveThreshold.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2120_bid_patch_0.json rename to procedure_tools/data/aboveThreshold.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThreshold.features/2120_bid_patch_1.json b/procedure_tools/data/aboveThreshold.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2120_bid_patch_1.json rename to procedure_tools/data/aboveThreshold.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThreshold.features/2120_bid_patch_2.json b/procedure_tools/data/aboveThreshold.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThreshold.features/2120_bid_patch_2.json rename to procedure_tools/data/aboveThreshold.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2010_tender_document_attach.json b/procedure_tools/data/aboveThreshold.lcc/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.lcc/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.lcc/2010_tender_document.txt b/procedure_tools/data/aboveThreshold.lcc/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2010_tender_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_attach.json b/procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/aboveThreshold/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold.lcc/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThreshold.lcc/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_document.txt b/procedure_tools/data/aboveThreshold.lcc/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2100_bid_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThreshold.lcc/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_financial_document.txt b/procedure_tools/data/aboveThreshold.lcc/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThreshold.lcc/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThreshold.lcc/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_0.json b/procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_1.json b/procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_2.json b/procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThreshold.lcc/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold.lcc/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_0.json b/procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_0.json rename to procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_1.json b/procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_1.json rename to procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_2.json b/procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThreshold.lcc/2120_bid_patch_2.json rename to procedure_tools/data/aboveThreshold.lcc/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThreshold/2010_tender_document_attach.json b/procedure_tools/data/aboveThreshold/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThreshold/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold/2010_tender_document.txt b/procedure_tools/data/aboveThreshold/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2010_tender_document.txt rename to procedure_tools/data/aboveThreshold/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2030_tender_notice_attach.json b/procedure_tools/data/aboveThreshold/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThreshold/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThreshold/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThreshold/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThreshold/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2100_bid_document.txt b/procedure_tools/data/aboveThreshold/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2100_bid_document.txt rename to procedure_tools/data/aboveThreshold/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThreshold/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThreshold/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2100_bid_financial_document.txt b/procedure_tools/data/aboveThreshold/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThreshold/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThreshold/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThreshold/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThreshold/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThreshold/2110_bid_res_post_0.json b/procedure_tools/data/aboveThreshold/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThreshold/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThreshold/2110_bid_res_post_1.json b/procedure_tools/data/aboveThreshold/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThreshold/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThreshold/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThreshold/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThreshold/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThreshold/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThreshold/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2030_tender_notice.p7s b/procedure_tools/data/aboveThreshold/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2030_tender_notice.p7s rename to procedure_tools/data/aboveThreshold/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThreshold/2120_bid_patch_0.json b/procedure_tools/data/aboveThreshold/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThreshold/2120_bid_patch_0.json rename to procedure_tools/data/aboveThreshold/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThreshold/2120_bid_patch_1.json b/procedure_tools/data/aboveThreshold/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThreshold/2120_bid_patch_1.json rename to procedure_tools/data/aboveThreshold/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdEU.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2010_tender_document.txt b/procedure_tools/data/aboveThresholdEU.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU.features/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdEU.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_document.txt b/procedure_tools/data/aboveThresholdEU.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdEU.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdEU.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdEU.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdEU.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_3.json b/procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2110_bid_res_post_3.json rename to procedure_tools/data/aboveThresholdEU.features/2120_bid_res_post_3.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_3_attach.json b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU.features/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_3.json b/procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2120_bid_patch_3.json rename to procedure_tools/data/aboveThresholdEU.features/2140_bid_patch_3.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU.lcc/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdEU.lcc/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_3.json b/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2110_bid_res_post_3.json rename to procedure_tools/data/aboveThresholdEU.lcc/2120_bid_res_post_3.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_3_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.central/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/belowThreshold.central/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU.lcc/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_3.json b/procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2120_bid_patch_3.json rename to procedure_tools/data/aboveThresholdEU.lcc/2140_bid_patch_3.json diff --git a/procedure_tools/data/aboveThresholdEU/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdEU/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2010_tender_document.txt b/procedure_tools/data/aboveThresholdEU/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdEU/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdEU/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/belowThreshold.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdEU/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdEU/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_document.txt b/procedure_tools/data/aboveThresholdEU/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdEU/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdEU/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdEU/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdEU/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdEU/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdEU/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdEU/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdEU/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdEU/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdEU/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdEU/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdEU/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdEU/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdEU/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdEU/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdEU/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdEU/2110_bid_res_post_3.json b/procedure_tools/data/aboveThresholdEU/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2110_bid_res_post_3.json rename to procedure_tools/data/aboveThresholdEU/2120_bid_res_post_3.json diff --git a/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_3_attach.json b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdEU/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/belowThreshold/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdEU/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdEU/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdEU/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdEU/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdEU/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdEU/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdEU/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdEU/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdEU/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThresholdEU/2120_bid_patch_3.json b/procedure_tools/data/aboveThresholdEU/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2120_bid_patch_3.json rename to procedure_tools/data/aboveThresholdEU/2140_bid_patch_3.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdUA.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.features/2010_tender_document.txt b/procedure_tools/data/aboveThresholdUA.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA.features/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdUA.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_document.txt b/procedure_tools/data/aboveThresholdUA.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdUA.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdUA.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdUA.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdUA.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdUA.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA.features/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.features/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdUA.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA.lcc/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdUA.lcc/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdUA.lcc/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA.lcc/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA.lcc/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdUA.lcc/2140_bid_patch_2.json diff --git a/procedure_tools/data/aboveThresholdUA/2010_tender_document_attach.json b/procedure_tools/data/aboveThresholdUA/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA/2010_tender_document.txt b/procedure_tools/data/aboveThresholdUA/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2010_tender_document.txt rename to procedure_tools/data/aboveThresholdUA/2010_tender_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2030_tender_notice_attach.json b/procedure_tools/data/aboveThresholdUA/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_confidential_document.txt b/procedure_tools/data/aboveThresholdUA/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2100_bid_confidential_document.txt rename to procedure_tools/data/aboveThresholdUA/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_document.txt b/procedure_tools/data/aboveThresholdUA/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2100_bid_document.txt rename to procedure_tools/data/aboveThresholdUA/2110_bid_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_eligibility_document.txt b/procedure_tools/data/aboveThresholdUA/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2100_bid_eligibility_document.txt rename to procedure_tools/data/aboveThresholdUA/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_financial_document.txt b/procedure_tools/data/aboveThresholdUA/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2100_bid_financial_document.txt rename to procedure_tools/data/aboveThresholdUA/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_qualification_document.txt b/procedure_tools/data/aboveThresholdUA/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2100_bid_qualification_document.txt rename to procedure_tools/data/aboveThresholdUA/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/aboveThresholdUA/2110_bid_res_post_0.json b/procedure_tools/data/aboveThresholdUA/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2110_bid_res_post_0.json rename to procedure_tools/data/aboveThresholdUA/2120_bid_res_post_0.json diff --git a/procedure_tools/data/aboveThresholdUA/2110_bid_res_post_1.json b/procedure_tools/data/aboveThresholdUA/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2110_bid_res_post_1.json rename to procedure_tools/data/aboveThresholdUA/2120_bid_res_post_1.json diff --git a/procedure_tools/data/aboveThresholdUA/2110_bid_res_post_2.json b/procedure_tools/data/aboveThresholdUA/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2110_bid_res_post_2.json rename to procedure_tools/data/aboveThresholdUA/2120_bid_res_post_2.json diff --git a/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_0_attach.json b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_1_attach.json b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_2_attach.json b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2030_tender_notice.p7s b/procedure_tools/data/aboveThresholdUA/2130_bid_proposal_file.p7s similarity index 100% rename from procedure_tools/data/esco.features/2030_tender_notice.p7s rename to procedure_tools/data/aboveThresholdUA/2130_bid_proposal_file.p7s diff --git a/procedure_tools/data/aboveThresholdUA/2120_bid_patch_0.json b/procedure_tools/data/aboveThresholdUA/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2120_bid_patch_0.json rename to procedure_tools/data/aboveThresholdUA/2140_bid_patch_0.json diff --git a/procedure_tools/data/aboveThresholdUA/2120_bid_patch_1.json b/procedure_tools/data/aboveThresholdUA/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2120_bid_patch_1.json rename to procedure_tools/data/aboveThresholdUA/2140_bid_patch_1.json diff --git a/procedure_tools/data/aboveThresholdUA/2120_bid_patch_2.json b/procedure_tools/data/aboveThresholdUA/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/aboveThresholdUA/2120_bid_patch_2.json rename to procedure_tools/data/aboveThresholdUA/2140_bid_patch_2.json diff --git a/procedure_tools/data/belowThreshold.central/2010_tender_document_attach.json b/procedure_tools/data/belowThreshold.central/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/belowThreshold.central/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.central/2010_tender_document.txt b/procedure_tools/data/belowThreshold.central/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2010_tender_document.txt rename to procedure_tools/data/belowThreshold.central/2010_tender_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2030_tender_notice_attach.json b/procedure_tools/data/belowThreshold.central/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/belowThreshold.central/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2030_tender_notice.p7s b/procedure_tools/data/belowThreshold.central/2030_tender_notice_file.p7s similarity index 100% rename from procedure_tools/data/esco/2030_tender_notice.p7s rename to procedure_tools/data/belowThreshold.central/2030_tender_notice_file.p7s diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_confidential_document.txt b/procedure_tools/data/belowThreshold.central/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2100_bid_confidential_document.txt rename to procedure_tools/data/belowThreshold.central/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_document.txt b/procedure_tools/data/belowThreshold.central/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2100_bid_document.txt rename to procedure_tools/data/belowThreshold.central/2110_bid_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_eligibility_document.txt b/procedure_tools/data/belowThreshold.central/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2100_bid_eligibility_document.txt rename to procedure_tools/data/belowThreshold.central/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_financial_document.txt b/procedure_tools/data/belowThreshold.central/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2100_bid_financial_document.txt rename to procedure_tools/data/belowThreshold.central/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_qualification_document.txt b/procedure_tools/data/belowThreshold.central/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.central/2100_bid_qualification_document.txt rename to procedure_tools/data/belowThreshold.central/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/belowThreshold.central/2110_bid_res_post_0.json b/procedure_tools/data/belowThreshold.central/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/belowThreshold.central/2110_bid_res_post_0.json rename to procedure_tools/data/belowThreshold.central/2120_bid_res_post_0.json diff --git a/procedure_tools/data/belowThreshold.central/2110_bid_res_post_1.json b/procedure_tools/data/belowThreshold.central/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/belowThreshold.central/2110_bid_res_post_1.json rename to procedure_tools/data/belowThreshold.central/2120_bid_res_post_1.json diff --git a/procedure_tools/data/belowThreshold.central/2130_bid_proposal_0_attach.json b/procedure_tools/data/belowThreshold.central/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold.central/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.central/2130_bid_proposal_1_attach.json b/procedure_tools/data/belowThreshold.central/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold.central/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.central/2130_bid_proposal_file.p7s b/procedure_tools/data/belowThreshold.central/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/belowThreshold.central/2120_bid_patch_0.json b/procedure_tools/data/belowThreshold.central/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/belowThreshold.central/2120_bid_patch_0.json rename to procedure_tools/data/belowThreshold.central/2140_bid_patch_0.json diff --git a/procedure_tools/data/belowThreshold.central/2120_bid_patch_1.json b/procedure_tools/data/belowThreshold.central/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/belowThreshold.central/2120_bid_patch_1.json rename to procedure_tools/data/belowThreshold.central/2140_bid_patch_1.json diff --git a/procedure_tools/data/belowThreshold.features/2010_tender_document_attach.json b/procedure_tools/data/belowThreshold.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/belowThreshold.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2010_tender_document.txt b/procedure_tools/data/belowThreshold.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2010_tender_document.txt rename to procedure_tools/data/belowThreshold.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2030_tender_notice_attach.json b/procedure_tools/data/belowThreshold.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/belowThreshold.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2030_tender_notice_file.p7s b/procedure_tools/data/belowThreshold.features/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_confidential_document.txt b/procedure_tools/data/belowThreshold.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2100_bid_confidential_document.txt rename to procedure_tools/data/belowThreshold.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_document.txt b/procedure_tools/data/belowThreshold.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2100_bid_document.txt rename to procedure_tools/data/belowThreshold.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_eligibility_document.txt b/procedure_tools/data/belowThreshold.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/belowThreshold.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_financial_document.txt b/procedure_tools/data/belowThreshold.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2100_bid_financial_document.txt rename to procedure_tools/data/belowThreshold.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_qualification_document.txt b/procedure_tools/data/belowThreshold.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold.features/2100_bid_qualification_document.txt rename to procedure_tools/data/belowThreshold.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/belowThreshold.features/2110_bid_res_post_0.json b/procedure_tools/data/belowThreshold.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2110_bid_res_post_0.json rename to procedure_tools/data/belowThreshold.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/belowThreshold.features/2110_bid_res_post_1.json b/procedure_tools/data/belowThreshold.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2110_bid_res_post_1.json rename to procedure_tools/data/belowThreshold.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/belowThreshold.features/2110_bid_res_post_2.json b/procedure_tools/data/belowThreshold.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2110_bid_res_post_2.json rename to procedure_tools/data/belowThreshold.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/belowThreshold.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold.features/2130_bid_proposal_file.p7s b/procedure_tools/data/belowThreshold.features/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/belowThreshold.features/2120_bid_patch_0.json b/procedure_tools/data/belowThreshold.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2120_bid_patch_0.json rename to procedure_tools/data/belowThreshold.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/belowThreshold.features/2120_bid_patch_1.json b/procedure_tools/data/belowThreshold.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2120_bid_patch_1.json rename to procedure_tools/data/belowThreshold.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/belowThreshold.features/2120_bid_patch_2.json b/procedure_tools/data/belowThreshold.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/belowThreshold.features/2120_bid_patch_2.json rename to procedure_tools/data/belowThreshold.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/belowThreshold/2010_tender_document_attach.json b/procedure_tools/data/belowThreshold/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/belowThreshold/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold/2010_tender_document.txt b/procedure_tools/data/belowThreshold/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2010_tender_document.txt rename to procedure_tools/data/belowThreshold/2010_tender_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2030_tender_notice_attach.json b/procedure_tools/data/belowThreshold/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/belowThreshold/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold/2030_tender_notice_file.p7s b/procedure_tools/data/belowThreshold/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/belowThreshold/2100_bid_confidential_document.txt b/procedure_tools/data/belowThreshold/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2100_bid_confidential_document.txt rename to procedure_tools/data/belowThreshold/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2100_bid_document.txt b/procedure_tools/data/belowThreshold/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2100_bid_document.txt rename to procedure_tools/data/belowThreshold/2110_bid_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2100_bid_eligibility_document.txt b/procedure_tools/data/belowThreshold/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2100_bid_eligibility_document.txt rename to procedure_tools/data/belowThreshold/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2100_bid_financial_document.txt b/procedure_tools/data/belowThreshold/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2100_bid_financial_document.txt rename to procedure_tools/data/belowThreshold/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2100_bid_qualification_document.txt b/procedure_tools/data/belowThreshold/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/belowThreshold/2100_bid_qualification_document.txt rename to procedure_tools/data/belowThreshold/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/belowThreshold/2110_bid_res_post_0.json b/procedure_tools/data/belowThreshold/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/belowThreshold/2110_bid_res_post_0.json rename to procedure_tools/data/belowThreshold/2120_bid_res_post_0.json diff --git a/procedure_tools/data/belowThreshold/2110_bid_res_post_1.json b/procedure_tools/data/belowThreshold/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/belowThreshold/2110_bid_res_post_1.json rename to procedure_tools/data/belowThreshold/2120_bid_res_post_1.json diff --git a/procedure_tools/data/belowThreshold/2130_bid_proposal_0_attach.json b/procedure_tools/data/belowThreshold/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold/2130_bid_proposal_1_attach.json b/procedure_tools/data/belowThreshold/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/belowThreshold/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/belowThreshold/2130_bid_proposal_file.p7s b/procedure_tools/data/belowThreshold/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/belowThreshold/2120_bid_patch_0.json b/procedure_tools/data/belowThreshold/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/belowThreshold/2120_bid_patch_0.json rename to procedure_tools/data/belowThreshold/2140_bid_patch_0.json diff --git a/procedure_tools/data/belowThreshold/2120_bid_patch_1.json b/procedure_tools/data/belowThreshold/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/belowThreshold/2120_bid_patch_1.json rename to procedure_tools/data/belowThreshold/2140_bid_patch_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2010_tender_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_confidential_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_confidential_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_eligibility_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_eligibility_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_financial_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_financial_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_qualification_document.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_qualification_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_0.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_1.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_2.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_2.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_3.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2110_bid_res_post_3.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_res_post_3.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_0_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_1_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_2_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_3_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_0.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_1.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_2.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_2.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_3.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2120_bid_patch_3.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/2140_bid_patch_3.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4120_selection_bid_patch_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4140_selection_bid_patch_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/4120_selection_bid_patch_0.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/4140_selection_bid_patch_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4120_selection_bid_patch_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4140_selection_bid_patch_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/4120_selection_bid_patch_1.json rename to procedure_tools/data/closeFrameworkAgreementUA.central/4140_selection_bid_patch_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2010_tender_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_confidential_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2100_bid_confidential_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2100_bid_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2110_bid_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_eligibility_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2100_bid_eligibility_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_financial_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2100_bid_financial_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_qualification_document.txt b/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2100_bid_qualification_document.txt rename to procedure_tools/data/closeFrameworkAgreementUA/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_0.json rename to procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_1.json b/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_1.json rename to procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_2.json rename to procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_2.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_3.json b/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2110_bid_res_post_3.json rename to procedure_tools/data/closeFrameworkAgreementUA/2120_bid_res_post_3.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_0_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_1_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_2_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_0.json rename to procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_1.json b/procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_1.json rename to procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_1.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_2.json rename to procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_2.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_3.json b/procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2120_bid_patch_3.json rename to procedure_tools/data/closeFrameworkAgreementUA/2140_bid_patch_3.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4120_selection_bid_patch_0.json b/procedure_tools/data/closeFrameworkAgreementUA/4140_selection_bid_patch_0.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/4120_selection_bid_patch_0.json rename to procedure_tools/data/closeFrameworkAgreementUA/4140_selection_bid_patch_0.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4120_selection_bid_patch_1.json b/procedure_tools/data/closeFrameworkAgreementUA/4140_selection_bid_patch_1.json similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/4120_selection_bid_patch_1.json rename to procedure_tools/data/closeFrameworkAgreementUA/4140_selection_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueEU/2010_tender_document_attach.json b/procedure_tools/data/competitiveDialogueEU/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2010_tender_document.txt b/procedure_tools/data/competitiveDialogueEU/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2010_tender_document.txt rename to procedure_tools/data/competitiveDialogueEU/2010_tender_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2030_tender_notice_attach.json b/procedure_tools/data/competitiveDialogueEU/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2030_tender_notice_file.p7s b/procedure_tools/data/competitiveDialogueEU/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueEU/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2100_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueEU/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_document.txt b/procedure_tools/data/competitiveDialogueEU/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2100_bid_document.txt rename to procedure_tools/data/competitiveDialogueEU/2110_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueEU/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2100_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueEU/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueEU/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2100_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueEU/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueEU/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2100_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueEU/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_4.json b/procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2110_bid_res_post_4.json rename to procedure_tools/data/competitiveDialogueEU/2120_bid_res_post_4.json diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_4_attach.json b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_4_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_4_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueEU/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueEU/2120_bid_patch_0.json b/procedure_tools/data/competitiveDialogueEU/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2120_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueEU/2140_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueEU/2120_bid_patch_1.json b/procedure_tools/data/competitiveDialogueEU/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2120_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueEU/2140_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueEU/2120_bid_patch_2.json b/procedure_tools/data/competitiveDialogueEU/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2120_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueEU/2140_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueEU/2120_bid_patch_3.json b/procedure_tools/data/competitiveDialogueEU/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2120_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueEU/2140_bid_patch_3.json diff --git a/procedure_tools/data/competitiveDialogueEU/2120_bid_patch_4.json b/procedure_tools/data/competitiveDialogueEU/2140_bid_patch_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2120_bid_patch_4.json rename to procedure_tools/data/competitiveDialogueEU/2140_bid_patch_4.json diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_document.txt b/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_document.txt rename to procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4110_stage2_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueEU/4130_stage2_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_0.json b/procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_1.json b/procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_2.json b/procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_3.json b/procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4120_stage2_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueEU/4140_stage2_bid_patch_3.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2010_tender_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2010_tender_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2100_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2100_bid_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2100_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueUA.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2100_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_4.json b/procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2110_bid_res_post_4.json rename to procedure_tools/data/competitiveDialogueUA.features/2120_bid_res_post_4.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_4_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_4_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_4_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_0.json b/procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_1.json b/procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_2.json b/procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_3.json b/procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_3.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_4.json b/procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2120_bid_patch_4.json rename to procedure_tools/data/competitiveDialogueUA.features/2140_bid_patch_4.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_document.txt b/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4110_stage2_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/4130_stage2_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_0.json b/procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_1.json b/procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_2.json b/procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_3.json b/procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4120_stage2_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueUA.features/4140_stage2_bid_patch_3.json diff --git a/procedure_tools/data/competitiveDialogueUA/2010_tender_document_attach.json b/procedure_tools/data/competitiveDialogueUA/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2010_tender_document.txt b/procedure_tools/data/competitiveDialogueUA/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2010_tender_document.txt rename to procedure_tools/data/competitiveDialogueUA/2010_tender_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2030_tender_notice_attach.json b/procedure_tools/data/competitiveDialogueUA/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2030_tender_notice_file.p7s b/procedure_tools/data/competitiveDialogueUA/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueUA/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2100_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueUA/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_document.txt b/procedure_tools/data/competitiveDialogueUA/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2100_bid_document.txt rename to procedure_tools/data/competitiveDialogueUA/2110_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueUA/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2100_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueUA/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueUA/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2100_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueUA/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueUA/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2100_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueUA/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_4.json b/procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2110_bid_res_post_4.json rename to procedure_tools/data/competitiveDialogueUA/2120_bid_res_post_4.json diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_4_attach.json b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_4_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_4_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueUA/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA/2120_bid_patch_0.json b/procedure_tools/data/competitiveDialogueUA/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2120_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueUA/2140_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueUA/2120_bid_patch_1.json b/procedure_tools/data/competitiveDialogueUA/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2120_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueUA/2140_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueUA/2120_bid_patch_2.json b/procedure_tools/data/competitiveDialogueUA/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2120_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueUA/2140_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueUA/2120_bid_patch_3.json b/procedure_tools/data/competitiveDialogueUA/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2120_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueUA/2140_bid_patch_3.json diff --git a/procedure_tools/data/competitiveDialogueUA/2120_bid_patch_4.json b/procedure_tools/data/competitiveDialogueUA/2140_bid_patch_4.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2120_bid_patch_4.json rename to procedure_tools/data/competitiveDialogueUA/2140_bid_patch_4.json diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_confidential_document.txt b/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_confidential_document.txt rename to procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_confidential_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_document.txt b/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_document.txt rename to procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_eligibility_document.txt b/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_eligibility_document.txt rename to procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_financial_document.txt b/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_financial_document.txt rename to procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_financial_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_qualification_document.txt b/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_qualification_document.txt rename to procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_qualification_document_file.txt diff --git a/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_0.json b/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_0.json rename to procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_0.json diff --git a/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_1.json b/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_1.json rename to procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_1.json diff --git a/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_2.json b/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_2.json rename to procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_2.json diff --git a/procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_3.json b/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4110_stage2_bid_res_post_3.json rename to procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_res_post_3.json diff --git a/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_0_attach.json b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_1_attach.json b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_2_attach.json b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_3_attach.json b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_file.p7s b/procedure_tools/data/competitiveDialogueUA/4130_stage2_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_0.json b/procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_0.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_0.json rename to procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_0.json diff --git a/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_1.json b/procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_1.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_1.json rename to procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_1.json diff --git a/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_2.json b/procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_2.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_2.json rename to procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_2.json diff --git a/procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_3.json b/procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_3.json similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/4120_stage2_bid_patch_3.json rename to procedure_tools/data/competitiveDialogueUA/4140_stage2_bid_patch_3.json diff --git a/procedure_tools/data/esco.features/2010_tender_document_attach.json b/procedure_tools/data/esco.features/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/esco.features/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2010_tender_document.txt b/procedure_tools/data/esco.features/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2010_tender_document.txt rename to procedure_tools/data/esco.features/2010_tender_document_file.txt diff --git a/procedure_tools/data/esco.features/2030_tender_notice_attach.json b/procedure_tools/data/esco.features/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/esco.features/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2030_tender_notice_file.p7s b/procedure_tools/data/esco.features/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/esco.features/2100_bid_confidential_document.txt b/procedure_tools/data/esco.features/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2100_bid_confidential_document.txt rename to procedure_tools/data/esco.features/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/esco.features/2100_bid_document.txt b/procedure_tools/data/esco.features/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2100_bid_document.txt rename to procedure_tools/data/esco.features/2110_bid_document_file.txt diff --git a/procedure_tools/data/esco.features/2100_bid_eligibility_document.txt b/procedure_tools/data/esco.features/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2100_bid_eligibility_document.txt rename to procedure_tools/data/esco.features/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/esco.features/2100_bid_financial_document.txt b/procedure_tools/data/esco.features/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2100_bid_financial_document.txt rename to procedure_tools/data/esco.features/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/esco.features/2100_bid_qualification_document.txt b/procedure_tools/data/esco.features/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/esco.features/2100_bid_qualification_document.txt rename to procedure_tools/data/esco.features/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/esco.features/2110_bid_res_post_0.json b/procedure_tools/data/esco.features/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/esco.features/2110_bid_res_post_0.json rename to procedure_tools/data/esco.features/2120_bid_res_post_0.json diff --git a/procedure_tools/data/esco.features/2110_bid_res_post_1.json b/procedure_tools/data/esco.features/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/esco.features/2110_bid_res_post_1.json rename to procedure_tools/data/esco.features/2120_bid_res_post_1.json diff --git a/procedure_tools/data/esco.features/2110_bid_res_post_2.json b/procedure_tools/data/esco.features/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/esco.features/2110_bid_res_post_2.json rename to procedure_tools/data/esco.features/2120_bid_res_post_2.json diff --git a/procedure_tools/data/esco.features/2110_bid_res_post_3.json b/procedure_tools/data/esco.features/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/esco.features/2110_bid_res_post_3.json rename to procedure_tools/data/esco.features/2120_bid_res_post_3.json diff --git a/procedure_tools/data/esco.features/2130_bid_proposal_0_attach.json b/procedure_tools/data/esco.features/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco.features/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2130_bid_proposal_1_attach.json b/procedure_tools/data/esco.features/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco.features/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2130_bid_proposal_2_attach.json b/procedure_tools/data/esco.features/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco.features/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2130_bid_proposal_3_attach.json b/procedure_tools/data/esco.features/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco.features/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2130_bid_proposal_file.p7s b/procedure_tools/data/esco.features/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/esco.features/2120_bid_patch_0.json b/procedure_tools/data/esco.features/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/esco.features/2120_bid_patch_0.json rename to procedure_tools/data/esco.features/2140_bid_patch_0.json diff --git a/procedure_tools/data/esco.features/2120_bid_patch_1.json b/procedure_tools/data/esco.features/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/esco.features/2120_bid_patch_1.json rename to procedure_tools/data/esco.features/2140_bid_patch_1.json diff --git a/procedure_tools/data/esco.features/2120_bid_patch_2.json b/procedure_tools/data/esco.features/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/esco.features/2120_bid_patch_2.json rename to procedure_tools/data/esco.features/2140_bid_patch_2.json diff --git a/procedure_tools/data/esco.features/2120_bid_patch_3.json b/procedure_tools/data/esco.features/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/esco.features/2120_bid_patch_3.json rename to procedure_tools/data/esco.features/2140_bid_patch_3.json diff --git a/procedure_tools/data/esco/2010_tender_document_attach.json b/procedure_tools/data/esco/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/esco/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2010_tender_document.txt b/procedure_tools/data/esco/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2010_tender_document.txt rename to procedure_tools/data/esco/2010_tender_document_file.txt diff --git a/procedure_tools/data/esco/2030_tender_notice_attach.json b/procedure_tools/data/esco/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/esco/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2030_tender_notice_file.p7s b/procedure_tools/data/esco/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/esco/2100_bid_confidential_document.txt b/procedure_tools/data/esco/2110_bid_confidential_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2100_bid_confidential_document.txt rename to procedure_tools/data/esco/2110_bid_confidential_document_file.txt diff --git a/procedure_tools/data/esco/2100_bid_document.txt b/procedure_tools/data/esco/2110_bid_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2100_bid_document.txt rename to procedure_tools/data/esco/2110_bid_document_file.txt diff --git a/procedure_tools/data/esco/2100_bid_eligibility_document.txt b/procedure_tools/data/esco/2110_bid_eligibility_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2100_bid_eligibility_document.txt rename to procedure_tools/data/esco/2110_bid_eligibility_document_file.txt diff --git a/procedure_tools/data/esco/2100_bid_financial_document.txt b/procedure_tools/data/esco/2110_bid_financial_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2100_bid_financial_document.txt rename to procedure_tools/data/esco/2110_bid_financial_document_file.txt diff --git a/procedure_tools/data/esco/2100_bid_qualification_document.txt b/procedure_tools/data/esco/2110_bid_qualification_document_file.txt similarity index 100% rename from procedure_tools/data/esco/2100_bid_qualification_document.txt rename to procedure_tools/data/esco/2110_bid_qualification_document_file.txt diff --git a/procedure_tools/data/esco/2110_bid_res_post_0.json b/procedure_tools/data/esco/2120_bid_res_post_0.json similarity index 100% rename from procedure_tools/data/esco/2110_bid_res_post_0.json rename to procedure_tools/data/esco/2120_bid_res_post_0.json diff --git a/procedure_tools/data/esco/2110_bid_res_post_1.json b/procedure_tools/data/esco/2120_bid_res_post_1.json similarity index 100% rename from procedure_tools/data/esco/2110_bid_res_post_1.json rename to procedure_tools/data/esco/2120_bid_res_post_1.json diff --git a/procedure_tools/data/esco/2110_bid_res_post_2.json b/procedure_tools/data/esco/2120_bid_res_post_2.json similarity index 100% rename from procedure_tools/data/esco/2110_bid_res_post_2.json rename to procedure_tools/data/esco/2120_bid_res_post_2.json diff --git a/procedure_tools/data/esco/2110_bid_res_post_3.json b/procedure_tools/data/esco/2120_bid_res_post_3.json similarity index 100% rename from procedure_tools/data/esco/2110_bid_res_post_3.json rename to procedure_tools/data/esco/2120_bid_res_post_3.json diff --git a/procedure_tools/data/esco/2130_bid_proposal_0_attach.json b/procedure_tools/data/esco/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2130_bid_proposal_1_attach.json b/procedure_tools/data/esco/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2130_bid_proposal_2_attach.json b/procedure_tools/data/esco/2130_bid_proposal_2_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco/2130_bid_proposal_2_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2130_bid_proposal_3_attach.json b/procedure_tools/data/esco/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/esco/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco/2130_bid_proposal_file.p7s b/procedure_tools/data/esco/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/esco/2120_bid_patch_0.json b/procedure_tools/data/esco/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/esco/2120_bid_patch_0.json rename to procedure_tools/data/esco/2140_bid_patch_0.json diff --git a/procedure_tools/data/esco/2120_bid_patch_1.json b/procedure_tools/data/esco/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/esco/2120_bid_patch_1.json rename to procedure_tools/data/esco/2140_bid_patch_1.json diff --git a/procedure_tools/data/esco/2120_bid_patch_2.json b/procedure_tools/data/esco/2140_bid_patch_2.json similarity index 100% rename from procedure_tools/data/esco/2120_bid_patch_2.json rename to procedure_tools/data/esco/2140_bid_patch_2.json diff --git a/procedure_tools/data/esco/2120_bid_patch_3.json b/procedure_tools/data/esco/2140_bid_patch_3.json similarity index 100% rename from procedure_tools/data/esco/2120_bid_patch_3.json rename to procedure_tools/data/esco/2140_bid_patch_3.json diff --git a/procedure_tools/data/negotiation.quick/2010_tender_document_attach.json b/procedure_tools/data/negotiation.quick/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/negotiation.quick/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/negotiation.quick/2010_tender_document.txt b/procedure_tools/data/negotiation.quick/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/negotiation.quick/2010_tender_document.txt rename to procedure_tools/data/negotiation.quick/2010_tender_document_file.txt diff --git a/procedure_tools/data/negotiation/2010_tender_document_attach.json b/procedure_tools/data/negotiation/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/negotiation/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/negotiation/2010_tender_document.txt b/procedure_tools/data/negotiation/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/negotiation/2010_tender_document.txt rename to procedure_tools/data/negotiation/2010_tender_document_file.txt diff --git a/procedure_tools/data/reorder.py b/procedure_tools/data/reorder.py index e79f351..2eb2a76 100644 --- a/procedure_tools/data/reorder.py +++ b/procedure_tools/data/reorder.py @@ -16,14 +16,15 @@ "criteria_create": "2020", "tender_notice": "2030", "tender_patch": "2040", - "bid_document": "2100", - "bid_confidential_document": "2100", - "bid_eligibility_document": "2100", - "bid_financial_document": "2100", - "bid_qualification_document": "2100", "bid_create": "2100", - "bid_res_post": "2110", - "bid_patch": "2120", + "bid_document": "2110", + "bid_confidential_document": "2110", + "bid_eligibility_document": "2110", + "bid_financial_document": "2110", + "bid_qualification_document": "2110", + "bid_res_post": "2120", + "bid_proposal": "2130", + "bid_patch": "2140", "qualification_patch": "2200", "evaluation_report": "2210", "award_create": "2300", diff --git a/procedure_tools/data/reporting/2010_tender_document_attach.json b/procedure_tools/data/reporting/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/reporting/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/reporting/2010_tender_document.txt b/procedure_tools/data/reporting/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/reporting/2010_tender_document.txt rename to procedure_tools/data/reporting/2010_tender_document_file.txt diff --git a/procedure_tools/data/simple.defense/2010_tender_document_attach.json b/procedure_tools/data/simple.defense/2010_tender_document_attach.json new file mode 100644 index 0000000..c844b43 --- /dev/null +++ b/procedure_tools/data/simple.defense/2010_tender_document_attach.json @@ -0,0 +1,5 @@ +{ + "data": { + "title": "tender_document_file.txt" + } +} \ No newline at end of file diff --git a/procedure_tools/data/simple.defense/2010_tender_document.txt b/procedure_tools/data/simple.defense/2010_tender_document_file.txt similarity index 100% rename from procedure_tools/data/simple.defense/2010_tender_document.txt rename to procedure_tools/data/simple.defense/2010_tender_document_file.txt diff --git a/procedure_tools/data/simple.defense/2030_tender_notice_attach.json b/procedure_tools/data/simple.defense/2030_tender_notice_attach.json new file mode 100644 index 0000000..b095c86 --- /dev/null +++ b/procedure_tools/data/simple.defense/2030_tender_notice_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "tender_notice_file.p7s", + "documentType": "notice" + } +} \ No newline at end of file diff --git a/procedure_tools/data/simple.defense/2030_tender_notice_file.p7s b/procedure_tools/data/simple.defense/2030_tender_notice_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/simple.defense/2110_bid_confidential_document_file.txt b/procedure_tools/data/simple.defense/2110_bid_confidential_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/simple.defense/2110_bid_confidential_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/simple.defense/2110_bid_document_file.txt b/procedure_tools/data/simple.defense/2110_bid_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/simple.defense/2110_bid_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/simple.defense/2110_bid_eligibility_document_file.txt b/procedure_tools/data/simple.defense/2110_bid_eligibility_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/simple.defense/2110_bid_eligibility_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/simple.defense/2110_bid_financial_document_file.txt b/procedure_tools/data/simple.defense/2110_bid_financial_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/simple.defense/2110_bid_financial_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/simple.defense/2110_bid_qualification_document_file.txt b/procedure_tools/data/simple.defense/2110_bid_qualification_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/simple.defense/2110_bid_qualification_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/simple.defense/2130_bid_proposal_0_attach.json b/procedure_tools/data/simple.defense/2130_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/simple.defense/2130_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/simple.defense/2130_bid_proposal_1_attach.json b/procedure_tools/data/simple.defense/2130_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/simple.defense/2130_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/simple.defense/2130_bid_proposal_file.p7s b/procedure_tools/data/simple.defense/2130_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 diff --git a/procedure_tools/data/simple.defense/2120_bid_patch_0.json b/procedure_tools/data/simple.defense/2140_bid_patch_0.json similarity index 100% rename from procedure_tools/data/simple.defense/2120_bid_patch_0.json rename to procedure_tools/data/simple.defense/2140_bid_patch_0.json diff --git a/procedure_tools/data/simple.defense/2120_bid_patch_1.json b/procedure_tools/data/simple.defense/2140_bid_patch_1.json similarity index 100% rename from procedure_tools/data/simple.defense/2120_bid_patch_1.json rename to procedure_tools/data/simple.defense/2140_bid_patch_1.json diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py index 8999bd5..5cc4748 100644 --- a/procedure_tools/procedure.py +++ b/procedure_tools/procedure.py @@ -67,6 +67,7 @@ wait_edr_pre_qual, wait_edr_qual, wait_status, + upload_bids_proposal, ) try: @@ -416,6 +417,16 @@ def process_procedure( tender_criteria, prefix=prefix, ) + upload_bids_proposal( + client, + ds_client, + args, + context, + tender_id, + bids_ids, + bids_tokens, + prefix=prefix, + ) patch_bids( client, args, diff --git a/procedure_tools/utils/handlers.py b/procedure_tools/utils/handlers.py index 27a7e88..46f5347 100644 --- a/procedure_tools/utils/handlers.py +++ b/procedure_tools/utils/handlers.py @@ -247,3 +247,17 @@ def tender_post_complaint_success_handler(response): msg += " - status \t\t\t{}\n".format(fore_info(complaint["status"])) logging.info(msg) + + +def document_attach_success_handler(response): + data = response.json()["data"] + + msg = "Document attached:\n" + msg += " - id \t\t\t\t{}\n".format(fore_info(data["id"])) + msg += " - url \t\t\t\t{}\n".format(fore_info(data["url"])) + if "documentType" in data: + msg += " - documentType \t\t{}\n".format(fore_info(data["documentType"])) + if "confidentiality" in data: + msg += " - confidentiality \t\t{}\n".format(fore_info(data["confidentiality"])) + + logging.info(msg) diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py index 40a5a2f..3249bfc 100644 --- a/procedure_tools/utils/process.py +++ b/procedure_tools/utils/process.py @@ -39,6 +39,7 @@ tender_post_complaint_success_handler, tender_post_criteria_success_handler, tender_post_plan_success_handler, + document_attach_success_handler, ) EDR_FILENAME = "edr_identification.yaml" @@ -55,6 +56,23 @@ def get_bids(client, args, context, tender_id): return response +def upload_bids_proposal( + client, ds_client, args, context, tender_id, bids_ids, bids_tokens, prefix="" +): + for bid_index, bid_id in enumerate(bids_ids): + upload_bid_proposal( + client, + ds_client, + args, + context, + tender_id, + bid_id, + bids_tokens[bid_index], + "bid_proposal_{}".format(bid_index), + prefix=prefix, + ) + + def patch_bids(client, args, context, tender_id, bids_ids, bids_tokens, prefix=""): logging.info("Patching bids...\n") for bid_index, bid_id in enumerate(bids_ids): @@ -179,12 +197,7 @@ def patch_agreements( for agreement_index, agreement_id in enumerate(agreements_ids): for data_file in get_data_all_files(get_data_path(args.data)): if data_file.startswith(prefix + "agreement_document"): - ds_response = upload_document( - ds_client, - args, - context, - data_file, - ) + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: client.post_tender_agreement_document( tender_id, @@ -522,14 +535,14 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): for bid_data_file in bid_data_files: bid_documents = [] for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_document".format(prefix)): - ds_response = upload_document(ds_client, args, context, data_file) + if data_file.startswith("{}bid_document_file".format(prefix)): + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: document_data = ds_response.json()["data"] bid_documents.append(document_data) for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_confidential_document".format(prefix)): - ds_response = upload_document(ds_client, args, context, data_file) + if data_file.startswith("{}bid_confidential_document_file".format(prefix)): + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: document_data = ds_response.json()["data"] document_data["confidentiality"] = "buyerOnly" @@ -539,22 +552,22 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): bid_documents.append(document_data) bid_eligibility_documents = [] for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_eligibility_document".format(prefix)): - ds_response = upload_document(ds_client, args, context, data_file) + if data_file.startswith("{}bid_eligibility_document_file".format(prefix)): + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: document_data = ds_response.json()["data"] bid_eligibility_documents.append(document_data) bid_financial_documents = [] for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_financial_document".format(prefix)): - ds_response = upload_document(ds_client, args, context, data_file) + if data_file.startswith("{}bid_financial_document_file".format(prefix)): + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: document_data = ds_response.json()["data"] bid_financial_documents.append(document_data) bid_qualification_documents = [] for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_qualification_document".format(prefix)): - ds_response = upload_document(ds_client, args, context, data_file) + if data_file.startswith("{}bid_qualification_document_file".format(prefix)): + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: document_data = ds_response.json()["data"] bid_qualification_documents.append(document_data) @@ -577,7 +590,7 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): return responses -def upload_document(ds_client, args, context, filename): +def upload_document_ds(ds_client, args, context, filename): path = get_data_file_path(get_data_path(args.data), filename) with open_file(path, mode="rb") as f: mime = MimeTypes() @@ -672,61 +685,120 @@ def create_tender( return response -def upload_tender_documents( - client, ds_client, args, context, tender_id, tender_token, prefix="" +def upload_documents( + client, + ds_client, + args, + context, + data_name, + attach_callback, + prefix="", ): for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}tender_document".format(prefix)): - ds_response = upload_document( - ds_client, - args, - context, - data_file, - ) - if ds_response: - data = ds_response.json()["data"] - client.post_tender_document( - tender_id, - tender_token, - {"data": data}, - auth_token=args.token, - ) + if data_file.startswith("{}{}_attach".format(prefix, data_name)): + path = get_data_file_path(get_data_path(args.data), data_file) + with read_file(path, context=context, exit_filename=args.stop) as content: + tender_document_data = json.loads(content) + upload_file = tender_document_data["data"]["title"] + ds_response = upload_document_ds(ds_client, args, context, upload_file) + if ds_response: + data = ds_response.json()["data"] + # apply data from data_file on top to add additional fields like documentType + data.update(tender_document_data["data"]) + attach_callback( + json={"data": data}, + auth_token=args.token, + success_handler=document_attach_success_handler, + ) + + +def upload_tender_documents( + client, + ds_client, + args, + context, + tender_id, + tender_token, + prefix="", +): + upload_documents( + client, + ds_client, + args, + context, + data_name="tender_document", + attach_callback=partial( + client.post_tender_document, + tender_id, + tender_token, + ), + prefix=prefix, + ) def upload_tender_notice( - client, ds_client, args, context, tender_id, tender_token, prefix="" + client, + ds_client, + args, + context, + tender_id, + tender_token, + prefix="", ): - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}tender_notice".format(prefix)): - ds_response = upload_document( - ds_client, - args, - context, - data_file, - ) - if ds_response: - data = ds_response.json()["data"] - data["documentType"] = "notice" - response = client.post_tender_document( - tender_id, - tender_token, - {"data": data}, - auth_token=args.token, - ) - return response + upload_documents( + client, + ds_client, + args, + context, + data_name="tender_notice", + attach_callback=partial( + client.post_tender_document, + tender_id, + tender_token, + ), + prefix=prefix, + ) + + +def upload_bid_proposal( + client, + ds_client, + args, + context, + tender_id, + bid_id, + bid_token, + data_name, + prefix="", +): + upload_documents( + client, + ds_client, + args, + context, + data_name, + attach_callback=partial( + client.post_tender_bid_document, + tender_id, + bid_id, + bid_token, + ), + prefix=prefix, + ) def upload_evaluation_report( - client, ds_client, args, context, tender_id, tender_token, prefix="" + client, + ds_client, + args, + context, + tender_id, + tender_token, + prefix="", ): for data_file in get_data_all_files(get_data_path(args.data)): if data_file.startswith("{}evaluation_report".format(prefix)): - ds_response = upload_document( - ds_client, - args, - context, - data_file, - ) + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: data = ds_response.json()["data"] data["documentType"] = "evaluationReports" @@ -754,12 +826,7 @@ def re_upload_evaluation_report( ): for data_file in get_data_all_files(get_data_path(args.data)): if data_file.startswith("{}evaluation_report".format(prefix)): - ds_response = upload_document( - ds_client, - args, - context, - data_file, - ) + ds_response = upload_document_ds(ds_client, args, context, data_file) if ds_response: data = ds_response.json()["data"] data["documentType"] = "evaluationReports" From 77cdbd30cec95dabb4a2fe5e574b4afa50089e3e Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 16:47:58 +0300 Subject: [PATCH 04/13] Set github actions max-parallel to 5 --- .github/workflows/workflow-test-fast.yaml | 2 +- .github/workflows/workflow-test-full.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow-test-fast.yaml b/.github/workflows/workflow-test-fast.yaml index 5a49657..87cf5d5 100644 --- a/.github/workflows/workflow-test-fast.yaml +++ b/.github/workflows/workflow-test-fast.yaml @@ -43,7 +43,7 @@ jobs: pytest-fast: runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 5 matrix: case: - reporting diff --git a/.github/workflows/workflow-test-full.yaml b/.github/workflows/workflow-test-full.yaml index 67c9925..ca10ea4 100644 --- a/.github/workflows/workflow-test-full.yaml +++ b/.github/workflows/workflow-test-full.yaml @@ -6,7 +6,7 @@ jobs: pytest-full: runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 5 matrix: case: - reporting From 8a8490af6b562d29e9e6e1f93268fc9df070296c Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 18:16:12 +0300 Subject: [PATCH 05/13] Update tests list --- .github/workflows/workflow-test-fast.yaml | 24 ++--- .github/workflows/workflow-test-full.yaml | 24 ++--- procedure_tools/test.py | 110 ++++++++++------------ 3 files changed, 75 insertions(+), 83 deletions(-) diff --git a/.github/workflows/workflow-test-fast.yaml b/.github/workflows/workflow-test-fast.yaml index 87cf5d5..38fcea8 100644 --- a/.github/workflows/workflow-test-fast.yaml +++ b/.github/workflows/workflow-test-fast.yaml @@ -46,28 +46,28 @@ jobs: max-parallel: 5 matrix: case: - - reporting - - negotiation - - negotiation_quick - - below_threshold - - below_threshold_multilot + - above_threshold + - above_threshold_features + - above_threshold_lcc - above_threshold_eu - - above_threshold_eu_multilot - - above_threshold_eu_plan - - above_threshold_eu_tender + - above_threshold_eu_features + - above_threshold_eu_lcc - above_threshold_ua - - above_threshold_ua_multilot - above_threshold_ua_features - - above_threshold_ua_multilot_features - above_threshold_ua_lcc - - above_threshold_ua_multilot_lcc + - below_threshold + - below_threshold_central + - below_threshold_features - close_framework_agreement_ua - close_framework_agreement_ua_central - competitive_dialogue_eu - competitive_dialogue_ua + - competitive_dialogue_ua_features - esco - esco_features - - esco_multilot + - negotiation + - negotiation_quick + - reporting - simple_defense env: PYTHONUNBUFFERED: 1 diff --git a/.github/workflows/workflow-test-full.yaml b/.github/workflows/workflow-test-full.yaml index ca10ea4..da46299 100644 --- a/.github/workflows/workflow-test-full.yaml +++ b/.github/workflows/workflow-test-full.yaml @@ -9,28 +9,28 @@ jobs: max-parallel: 5 matrix: case: - - reporting - - negotiation - - negotiation_quick - - below_threshold - - below_threshold_multilot + - above_threshold + - above_threshold_features + - above_threshold_lcc - above_threshold_eu - - above_threshold_eu_multilot - - above_threshold_eu_plan - - above_threshold_eu_tender + - above_threshold_eu_features + - above_threshold_eu_lcc - above_threshold_ua - - above_threshold_ua_multilot - above_threshold_ua_features - - above_threshold_ua_multilot_features - above_threshold_ua_lcc - - above_threshold_ua_multilot_lcc + - below_threshold + - below_threshold_central + - below_threshold_features - close_framework_agreement_ua - close_framework_agreement_ua_central - competitive_dialogue_eu - competitive_dialogue_ua + - competitive_dialogue_ua_features - esco - esco_features - - esco_multilot + - negotiation + - negotiation_quick + - reporting - simple_defense env: PYTHONUNBUFFERED: 1 diff --git a/procedure_tools/test.py b/procedure_tools/test.py index b5c14ee..36d2644 100644 --- a/procedure_tools/test.py +++ b/procedure_tools/test.py @@ -57,66 +57,48 @@ def run_test(argv): @skipifenv -def test_reporting(): - argv = ["--data", "reporting"] - run_test(argv) - - -@skipifenv -def test_negotiation(): - argv = ["--data", "negotiation"] - run_test(argv) - - -@skipifenv -def test_negotiation_quick(): - argv = ["--data", "negotiation.quick"] - run_test(argv) - - -@skipifenv -def test_below_threshold(): - argv = ["--data", "belowThreshold"] +def test_above_threshold(): + argv = ["--data", "aboveThreshold"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "tender_patch.json"] + argv += ["--stop", "bid_patch_1.json"] run_test(argv) @skipifenv -def test_below_threshold_multilot(): - argv = ["--data", "belowThreshold.multilot"] +def test_above_threshold_features(): + argv = ["--data", "aboveThreshold.features"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "tender_patch.json"] + argv += ["--stop", "bid_patch_1.json"] run_test(argv) @skipifenv -def test_above_threshold_eu(): - argv = ["--data", "aboveThresholdEU"] +def test_above_threshold_lcc(): + argv = ["--data", "aboveThreshold.lcc"] if os.environ.get("FAST_RUN"): argv += ["--stop", "bid_patch_1.json"] run_test(argv) @skipifenv -def test_above_threshold_eu_multilot(): - argv = ["--data", "aboveThresholdEU.multilot"] +def test_above_threshold_eu(): + argv = ["--data", "aboveThresholdEU"] if os.environ.get("FAST_RUN"): argv += ["--stop", "bid_patch_1.json"] run_test(argv) @skipifenv -def test_above_threshold_eu_plan(): - argv = ["--data", "aboveThresholdEU.plan"] +def test_above_threshold_eu_features(): + argv = ["--data", "aboveThresholdEU.features"] if os.environ.get("FAST_RUN"): argv += ["--stop", "bid_patch_1.json"] run_test(argv) @skipifenv -def test_above_threshold_eu_tender(): - argv = ["--data", "aboveThresholdEU.tender"] +def test_above_threshold_eu_lcc(): + argv = ["--data", "aboveThresholdEU.lcc"] if os.environ.get("FAST_RUN"): argv += ["--stop", "bid_patch_1.json"] run_test(argv) @@ -130,14 +112,6 @@ def test_above_threshold_ua(): run_test(argv) -@skipifenv -def test_above_threshold_ua_multilot(): - argv = ["--data", "aboveThresholdUA.multilot"] - if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] - run_test(argv) - - @skipifenv def test_above_threshold_ua_features(): argv = ["--data", "aboveThresholdUA.features"] @@ -146,14 +120,6 @@ def test_above_threshold_ua_features(): run_test(argv) -@skipifenv -def test_above_threshold_ua_multilot_features(): - argv = ["--data", "aboveThresholdUA.multilot.features"] - if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] - run_test(argv) - - @skipifenv def test_above_threshold_ua_lcc(): argv = ["--data", "aboveThresholdUA.lcc"] @@ -163,26 +129,26 @@ def test_above_threshold_ua_lcc(): @skipifenv -def test_above_threshold_ua_multilot_lcc(): - argv = ["--data", "aboveThresholdUA.multilot.lcc"] +def test_below_threshold(): + argv = ["--data", "belowThreshold"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] + argv += ["--stop", "tender_patch.json"] run_test(argv) @skipifenv -def test_above_threshold_ua_defense(): - argv = ["--data", "aboveThresholdUA.defense"] +def test_below_threshold_central(): + argv = ["--data", "belowThreshold.central"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] + argv += ["--stop", "tender_patch.json"] run_test(argv) @skipifenv -def test_simple_defense(): - argv = ["--data", "simple.defense"] +def test_below_threshold_features(): + argv = ["--data", "belowThreshold.features"] if os.environ.get("FAST_RUN"): - argv += ["--stop", "bid_patch_1.json"] + argv += ["--stop", "tender_patch.json"] run_test(argv) @@ -218,6 +184,14 @@ def test_competitive_dialogue_ua(): run_test(argv) +@skipifenv +def test_competitive_dialogue_ua_features(): + argv = ["--data", "competitiveDialogueUA.features"] + if os.environ.get("FAST_RUN"): + argv += ["--stop", "bid_patch_1.json"] + run_test(argv) + + @skipifenv def test_esco(): argv = ["--data", "esco"] @@ -235,8 +209,26 @@ def test_esco_features(): @skipifenv -def test_esco_multilot(): - argv = ["--data", "esco.multilot"] +def test_negotiation(): + argv = ["--data", "negotiation"] + run_test(argv) + + +@skipifenv +def test_negotiation_quick(): + argv = ["--data", "negotiation.quick"] + run_test(argv) + + +@skipifenv +def test_reporting(): + argv = ["--data", "reporting"] + run_test(argv) + + +@skipifenv +def test_simple_defense(): + argv = ["--data", "simple.defense"] if os.environ.get("FAST_RUN"): argv += ["--stop", "bid_patch_1.json"] run_test(argv) From 2e97f473456ae4312276b884ebe8acd5171c61f7 Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 18:38:12 +0300 Subject: [PATCH 06/13] Fix proposal for cfaua --- .../2130_bid_proposal_3_attach.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_3_attach.json diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_3_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_3_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2130_bid_proposal_3_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file From b7cd70a99db616b4754983be94700862f4e8c71e Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 20:06:10 +0300 Subject: [PATCH 07/13] Add bid documents to cfa selection --- .../4110_selection_bid_confidential_document_file.txt | 1 + .../4110_selection_bid_document_file.txt | 1 + .../4110_selection_bid_eligibility_document_file.txt | 1 + .../4110_selection_bid_financial_document_file.txt | 1 + .../4110_selection_bid_qualification_document_file.txt | 1 + .../4130_selection_bid_proposal_0_attach.json | 6 ++++++ .../4130_selection_bid_proposal_1_attach.json | 6 ++++++ .../4130_selection_bid_proposal_file.p7s | 0 8 files changed, 17 insertions(+) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_confidential_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_eligibility_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_financial_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_qualification_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_file.p7s diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_confidential_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_confidential_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_confidential_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_eligibility_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_eligibility_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_eligibility_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_financial_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_financial_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_financial_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_qualification_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_qualification_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4110_selection_bid_qualification_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_0_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_1_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/4130_selection_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 From b784366241922938b336d57a7ff8f5beb9266fc2 Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 20:10:14 +0300 Subject: [PATCH 08/13] Disable workflow fast fail --- .github/workflows/workflow-test-fast.yaml | 1 + .github/workflows/workflow-test-full.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/workflow-test-fast.yaml b/.github/workflows/workflow-test-fast.yaml index 38fcea8..6e84fd4 100644 --- a/.github/workflows/workflow-test-fast.yaml +++ b/.github/workflows/workflow-test-fast.yaml @@ -44,6 +44,7 @@ jobs: runs-on: ubuntu-latest strategy: max-parallel: 5 + fail-fast: false matrix: case: - above_threshold diff --git a/.github/workflows/workflow-test-full.yaml b/.github/workflows/workflow-test-full.yaml index da46299..9f26aef 100644 --- a/.github/workflows/workflow-test-full.yaml +++ b/.github/workflows/workflow-test-full.yaml @@ -6,6 +6,7 @@ jobs: pytest-full: runs-on: ubuntu-latest strategy: + fail-fast: false max-parallel: 5 matrix: case: From baae939476a12457857036f1793b8343591ab73d Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 13 Aug 2024 20:45:36 +0300 Subject: [PATCH 09/13] Add bid documents to cfa selection central --- .../4110_selection_bid_confidential_document_file.txt | 1 + .../4110_selection_bid_document_file.txt | 1 + .../4110_selection_bid_eligibility_document_file.txt | 1 + .../4110_selection_bid_financial_document_file.txt | 1 + .../4110_selection_bid_qualification_document_file.txt | 1 + .../4130_selection_bid_proposal_0_attach.json | 6 ++++++ .../4130_selection_bid_proposal_1_attach.json | 6 ++++++ .../4130_selection_bid_proposal_file.p7s | 0 8 files changed, 17 insertions(+) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_confidential_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_eligibility_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_financial_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_qualification_document_file.txt create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_0_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_1_attach.json create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_file.p7s diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_confidential_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_confidential_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_confidential_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_eligibility_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_eligibility_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_eligibility_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_financial_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_financial_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_financial_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_qualification_document_file.txt b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_qualification_document_file.txt new file mode 100644 index 0000000..06c5157 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4110_selection_bid_qualification_document_file.txt @@ -0,0 +1 @@ +Bid document example diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_0_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_0_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_0_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_1_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_1_attach.json new file mode 100644 index 0000000..f4597b4 --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_1_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "bid_proposal_file.p7s", + "documentType": "proposal" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/4130_selection_bid_proposal_file.p7s new file mode 100644 index 0000000..e69de29 From 304e3df1be0c152fda7a036456871845332cdc05 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 14 Aug 2024 12:22:05 +0300 Subject: [PATCH 10/13] Refactor evaluation report --- .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_stage2_evaluation_report_attach.json | 6 ++ ...=> 2210_stage2_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ ...rt.p7s => 2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ .../2210_evaluation_report_file.p7s} | 0 .../2210_evaluation_report_attach.json | 6 ++ .../2210_evaluation_report_file.p7s} | 0 .../data/esco/2210_evaluation_report.p7s | 0 .../esco/2210_evaluation_report_attach.json | 6 ++ .../2210_evaluation_report_file.p7s} | 0 procedure_tools/procedure.py | 6 +- procedure_tools/utils/process.py | 74 ++++++++++--------- 25 files changed, 109 insertions(+), 37 deletions(-) create mode 100644 procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_attach.json rename procedure_tools/data/aboveThresholdEU.features/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_attach.json rename procedure_tools/data/aboveThresholdEU.lcc/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/aboveThresholdEU/2210_evaluation_report_attach.json rename procedure_tools/data/aboveThresholdEU/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_attach.json rename procedure_tools/data/closeFrameworkAgreementUA.central/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_attach.json rename procedure_tools/data/closeFrameworkAgreementUA/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_attach.json rename procedure_tools/data/competitiveDialogueEU/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json rename procedure_tools/data/competitiveDialogueEU/{4210_stage2_evaluation_report.p7s => 2210_stage2_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_attach.json rename procedure_tools/data/competitiveDialogueUA.features/{2210_evaluation_report.p7s => 2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_attach.json rename procedure_tools/data/{competitiveDialogueUA.features/4210_stage2_evaluation_report.p7s => competitiveDialogueUA/2210_evaluation_report_file.p7s} (100%) create mode 100644 procedure_tools/data/esco.features/2210_evaluation_report_attach.json rename procedure_tools/data/{competitiveDialogueUA/2210_evaluation_report.p7s => esco.features/2210_evaluation_report_file.p7s} (100%) delete mode 100644 procedure_tools/data/esco/2210_evaluation_report.p7s create mode 100644 procedure_tools/data/esco/2210_evaluation_report_attach.json rename procedure_tools/data/{esco.features/2210_evaluation_report.p7s => esco/2210_evaluation_report_file.p7s} (100%) diff --git a/procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_attach.json b/procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report.p7s b/procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report.p7s rename to procedure_tools/data/aboveThresholdEU.features/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report.p7s rename to procedure_tools/data/aboveThresholdEU.lcc/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/aboveThresholdEU/2210_evaluation_report_attach.json b/procedure_tools/data/aboveThresholdEU/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/aboveThresholdEU/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/aboveThresholdEU/2210_evaluation_report.p7s b/procedure_tools/data/aboveThresholdEU/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/aboveThresholdEU/2210_evaluation_report.p7s rename to procedure_tools/data/aboveThresholdEU/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report.p7s rename to procedure_tools/data/closeFrameworkAgreementUA.central/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report.p7s rename to procedure_tools/data/closeFrameworkAgreementUA/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_attach.json b/procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/2210_evaluation_report.p7s b/procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/2210_evaluation_report.p7s rename to procedure_tools/data/competitiveDialogueEU/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json b/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report.p7s b/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report.p7s rename to procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_file.p7s diff --git a/procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_attach.json b/procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report.p7s b/procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report.p7s rename to procedure_tools/data/competitiveDialogueUA.features/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_attach.json b/procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA.features/4210_stage2_evaluation_report.p7s b/procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueUA.features/4210_stage2_evaluation_report.p7s rename to procedure_tools/data/competitiveDialogueUA/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/esco.features/2210_evaluation_report_attach.json b/procedure_tools/data/esco.features/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/esco.features/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/competitiveDialogueUA/2210_evaluation_report.p7s b/procedure_tools/data/esco.features/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/competitiveDialogueUA/2210_evaluation_report.p7s rename to procedure_tools/data/esco.features/2210_evaluation_report_file.p7s diff --git a/procedure_tools/data/esco/2210_evaluation_report.p7s b/procedure_tools/data/esco/2210_evaluation_report.p7s deleted file mode 100644 index e69de29..0000000 diff --git a/procedure_tools/data/esco/2210_evaluation_report_attach.json b/procedure_tools/data/esco/2210_evaluation_report_attach.json new file mode 100644 index 0000000..8c88a6e --- /dev/null +++ b/procedure_tools/data/esco/2210_evaluation_report_attach.json @@ -0,0 +1,6 @@ +{ + "data": { + "title": "evaluation_report_file.p7s", + "documentType": "evaluationReports" + } +} \ No newline at end of file diff --git a/procedure_tools/data/esco.features/2210_evaluation_report.p7s b/procedure_tools/data/esco/2210_evaluation_report_file.p7s similarity index 100% rename from procedure_tools/data/esco.features/2210_evaluation_report.p7s rename to procedure_tools/data/esco/2210_evaluation_report_file.p7s diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py index 5cc4748..1660570 100644 --- a/procedure_tools/procedure.py +++ b/procedure_tools/procedure.py @@ -491,7 +491,7 @@ def process_procedure( prefix=prefix, ) - response = upload_evaluation_report( + responses = upload_evaluation_report( client, ds_client, args, @@ -500,8 +500,8 @@ def process_procedure( tender_token, prefix=prefix, ) - if response: - evaluation_report_document_id = get_id(response) + if responses and len(responses) >= 1: + evaluation_report_document_id = get_id(responses[-1]) patch_tender_pre( client, diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py index 3249bfc..3dd929e 100644 --- a/procedure_tools/utils/process.py +++ b/procedure_tools/utils/process.py @@ -692,8 +692,10 @@ def upload_documents( context, data_name, attach_callback, + ignore_error=False, prefix="", ): + responses = [] for data_file in get_data_all_files(get_data_path(args.data)): if data_file.startswith("{}{}_attach".format(prefix, data_name)): path = get_data_file_path(get_data_path(args.data), data_file) @@ -705,11 +707,14 @@ def upload_documents( data = ds_response.json()["data"] # apply data from data_file on top to add additional fields like documentType data.update(tender_document_data["data"]) - attach_callback( + response = attach_callback( json={"data": data}, auth_token=args.token, success_handler=document_attach_success_handler, ) + if not ignore_error or ignore_error and 200 <= response.status_code < 300: + responses.append(response) + return responses def upload_tender_documents( @@ -721,7 +726,7 @@ def upload_tender_documents( tender_token, prefix="", ): - upload_documents( + return upload_documents( client, ds_client, args, @@ -745,7 +750,7 @@ def upload_tender_notice( tender_token, prefix="", ): - upload_documents( + return upload_documents( client, ds_client, args, @@ -771,7 +776,7 @@ def upload_bid_proposal( data_name, prefix="", ): - upload_documents( + return upload_documents( client, ds_client, args, @@ -796,22 +801,21 @@ def upload_evaluation_report( tender_token, prefix="", ): - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}evaluation_report".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - data = ds_response.json()["data"] - data["documentType"] = "evaluationReports" - response = client.post_tender_document( - tender_id, - tender_token, - {"data": data}, - auth_token=args.token, - error_handler=allow_error_handler, # TODO: Remove after feature release - ) - if not response.status_code == 201: - return # TODO: Remove after feature release - return response + return upload_documents( + client, + ds_client, + args, + context, + "evaluation_report", + attach_callback=partial( + client.post_tender_document, + tender_id, + tender_token, + error_handler=allow_error_handler, # TODO: Remove after feature release + ), + ignore_error=True, # TODO: Remove after feature release + prefix=prefix, + ) def re_upload_evaluation_report( @@ -824,20 +828,22 @@ def re_upload_evaluation_report( tender_token, prefix="", ): - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}evaluation_report".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - data = ds_response.json()["data"] - data["documentType"] = "evaluationReports" - client.put_tender_document( - tender_id, - document_id, - tender_token, - {"data": data}, - auth_token=args.token, - error_handler=allow_error_handler, # TODO: Remove after feature release - ) + return upload_documents( + client, + ds_client, + args, + context, + "evaluation_report", + attach_callback=partial( + client.put_tender_document, + tender_id, + document_id, + tender_token, + error_handler=allow_error_handler, # TODO: Remove after feature release + ), + ignore_error=True, # TODO: Remove after feature release + prefix=prefix, + ) def wait(date_str, client_timedelta=timedelta(), date_info_str=None): From 5ba92bfcf7a65ae246720685e08abf9d4515ea74 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 14 Aug 2024 12:22:52 +0300 Subject: [PATCH 11/13] Update README --- README.md | 218 +++++++++++++++++++++++++++--------------------------- 1 file changed, 107 insertions(+), 111 deletions(-) diff --git a/README.md b/README.md index fb05f73..7c239dd 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ options: - esco.features - negotiation - negotiation.quick + - reorder.py - reporting - simple.defense @@ -134,103 +135,91 @@ procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://uplo procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://upload-docs-sandbox-2.prozorro.gov.ua broker_ds_username broker_ds_password --acceleration=1000000 --path=/api/0/ --data=closeFrameworkAgreementUA --stop=bid_create_4.json ``` ``` -[02:54:27] Using seed 165011 +[12:22:32] Using seed 661011 -[02:54:27] Initializing tenders client +[12:22:32] Initializing tenders client -[02:54:27] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore -[02:54:27] Starting new HTTPS connection (1): lb-api-sandbox-2.prozorro.gov.ua:443 -[02:54:28] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 887419 -[02:54:28] Response status code: 200 +[12:22:32] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore +[12:22:32] Starting new HTTPS connection (1): lb-api-sandbox-2.prozorro.gov.ua:443 +[12:22:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 887419 +[12:22:33] Response status code: 200 -[02:54:28] Client time delta with server: -842 milliseconds +[12:22:33] Client time delta with server: -1937 milliseconds -[02:54:28] Initializing contracts client +[12:22:33] Initializing ds client -[02:54:28] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore -[02:54:29] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 887419 -[02:54:30] Response status code: 200 +[12:22:33] Creating plan... -[02:54:30] Client time delta with server: -1631 milliseconds +[12:22:33] Processing data file: plan_create.json -[02:54:30] Initializing plans client +[12:22:33] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans +[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans HTTP/11" 201 4202 +[12:22:34] Response status code: 201 -[02:54:30] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore -[02:54:30] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 887419 -[02:54:31] Response status code: 200 - -[02:54:31] Client time delta with server: -1132 milliseconds - -[02:54:31] Initializing ds client - -[02:54:31] Using client time delta with server: -1631 milliseconds - -[02:54:31] Creating plan... - -[02:54:31] Processing data file: plan_create.json - -[02:54:31] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans -[02:54:31] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans HTTP/11" 201 4202 -[02:54:31] Response status code: 201 - -[02:54:31] Plan created: - - id 95abb1390c4e44e6947fd058d3a2f2e8 - - token a3704908075f4ff6a18fd2ae49c9bcaa - - transfer 25cdb892c9704139b6f661144ed88e89 +[12:22:34] Plan created: + - id b39bacb963b0446fb3fac49977fde22a + - token 9e119a752c184f4cbf5be74ad2518fca + - transfer 5e26ffb531cc4225973a748bd22f9230 - status draft -[02:54:31] Patching plan... +[12:22:34] Patching plan... -[02:54:31] Processing data file: plan_patch.json +[12:22:34] Processing data file: plan_patch.json -[02:54:31] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/95abb1390c4e44e6947fd058d3a2f2e8?acc_token=a3704908075f4ff6a18fd2ae49c9bcaa -[02:54:31] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/plans/95abb1390c4e44e6947fd058d3a2f2e8?acc_token=a3704908075f4ff6a18fd2ae49c9bcaa HTTP/11" 200 4101 -[02:54:31] Response status code: 200 +[12:22:34] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/b39bacb963b0446fb3fac49977fde22a?acc_token=9e119a752c184f4cbf5be74ad2518fca +[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/plans/b39bacb963b0446fb3fac49977fde22a?acc_token=9e119a752c184f4cbf5be74ad2518fca HTTP/11" 200 4101 +[12:22:34] Response status code: 200 -[02:54:31] Plan patched: - - id 95abb1390c4e44e6947fd058d3a2f2e8 +[12:22:34] Plan patched: + - id b39bacb963b0446fb3fac49977fde22a - status scheduled -[02:54:31] Creating tender... +[12:22:34] Creating tender... -[02:54:31] Processing data file: tender_create.json +[12:22:34] Processing data file: tender_create.json -[02:54:31] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/95abb1390c4e44e6947fd058d3a2f2e8/tenders -[02:54:31] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans/95abb1390c4e44e6947fd058d3a2f2e8/tenders HTTP/11" 201 7169 -[02:54:31] Response status code: 201 +[12:22:34] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/b39bacb963b0446fb3fac49977fde22a/tenders +[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans/b39bacb963b0446fb3fac49977fde22a/tenders HTTP/11" 201 7169 +[12:22:34] Response status code: 201 -[02:54:31] Tender created: - - id f433072d5e314f49ba17baf8f17e1185 - - token 57ef798e177f49b88694644492384414 - - transfer 701691cce52c4d569c56c93d49fd5e6e +[12:22:34] Tender created: + - id 11325b8b6d8e4a45ae179fef7fd63aa9 + - token f606cab74ded47d6aab5ef2cc11cf975 + - transfer 39e38047e71c43d8bccbf01654dbfda7 - status draft - - tenderID UA-2024-08-01-000005-a + - tenderID UA-2024-08-14-000011-a - procurementMethodType closeFrameworkAgreementUA -[02:54:31] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185 -[02:54:31] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/tenders/f433072d5e314f49ba17baf8f17e1185 HTTP/11" 200 7064 -[02:54:31] Response status code: 200 +[12:22:34] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9 +[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9 HTTP/11" 200 7064 +[12:22:34] Response status code: 200 + +[12:22:34] Processing data file: tender_document_attach.json + +[12:22:34] Processing data file: tender_document_file.txt -[02:54:31] Processing data file: tender_document.txt +[12:22:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:34] Starting new HTTPS connection (1): upload-docs-sandbox-2.prozorro.gov.ua:443 +[12:22:35] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 584 +[12:22:35] Response status code: 200 -[02:54:31] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:31] Starting new HTTPS connection (1): upload-docs-sandbox-2.prozorro.gov.ua:443 -[02:54:32] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 603 -[02:54:32] Response status code: 200 +[12:22:35] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 +[12:22:35] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 555 +[12:22:35] Response status code: 201 -[02:54:32] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185/documents?acc_token=57ef798e177f49b88694644492384414 -[02:54:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/f433072d5e314f49ba17baf8f17e1185/documents?acc_token=57ef798e177f49b88694644492384414 HTTP/11" 201 546 -[02:54:32] Response status code: 201 +[12:22:35] Document attached: + - id 471786dd8061493b8fb286d647c913f3 + - url https://public-docs-sandbox-2.prozorro.gov.ua/get/1cd151b64da54751a0de5a3ceef2adc6?Signature=AKAMrq629XC5V5z2ULAprUzIrC6%2FIjuy%2BJ0f5jrgRPlX5lIv8oHClQYKo%2Fs7jSHe6DYrgQ5Wz9xQFOwbTc%2B%2FBQ%3D%3D&KeyID=1331dc52 -[02:54:32] Create tender criteria... +[12:22:35] Create tender criteria... -[02:54:32] Processing data file: criteria_create.json +[12:22:35] Processing data file: criteria_create.json -[02:54:32] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185/criteria?acc_token=57ef798e177f49b88694644492384414 -[02:54:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/f433072d5e314f49ba17baf8f17e1185/criteria?acc_token=57ef798e177f49b88694644492384414 HTTP/11" 201 53697 -[02:54:32] Response status code: 201 +[12:22:35] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/criteria?acc_token=f606cab74ded47d6aab5ef2cc11cf975 +[12:22:35] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/criteria?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 53697 +[12:22:35] Response status code: 201 -[02:54:32] Tender criteria created: +[12:22:35] Tender criteria created: - classification.id CRITERION.EXCLUSION.CONVICTIONS.PARTICIPATION_IN_CRIMINAL_ORGANISATION - classification.id CRITERION.EXCLUSION.CONVICTIONS.FRAUD - classification.id CRITERION.EXCLUSION.CONVICTIONS.CORRUPTION @@ -242,71 +231,78 @@ procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://uplo - classification.id CRITERION.EXCLUSION.NATIONAL.OTHER - classification.id CRITERION.OTHER.BID.LANGUAGE -[02:54:32] Processing data file: tender_notice.p7s +[12:22:35] Processing data file: tender_notice_attach.json + +[12:22:35] Processing data file: tender_notice_file.p7s + +[12:22:35] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 590 +[12:22:36] Response status code: 200 -[02:54:32] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:32] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 579 -[02:54:32] Response status code: 200 +[12:22:36] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 +[12:22:36] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 575 +[12:22:36] Response status code: 201 -[02:54:32] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185/documents?acc_token=57ef798e177f49b88694644492384414 -[02:54:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/f433072d5e314f49ba17baf8f17e1185/documents?acc_token=57ef798e177f49b88694644492384414 HTTP/11" 201 564 -[02:54:32] Response status code: 201 +[12:22:36] Document attached: + - id 010530c74b054c339d79ef8ac6c9662e + - url https://public-docs-sandbox-2.prozorro.gov.ua/get/772632aab56047d2832924e891723ac3?Signature=SAmD69JXYid2eNbB7smQBZPBaeqjksJgvBkCf4kzt8qePfT%2FWV6BFx8A7k2Hmw4%2FlotCsZko1%2BcUNsXziotWCA%3D%3D&KeyID=1331dc52 + - documentType notice -[02:54:32] Patching tender... +[12:22:36] Patching tender... -[02:54:32] Processing data file: tender_patch.json +[12:22:36] Processing data file: tender_patch.json -[02:54:32] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185?acc_token=57ef798e177f49b88694644492384414 -[02:54:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/tenders/f433072d5e314f49ba17baf8f17e1185?acc_token=57ef798e177f49b88694644492384414 HTTP/11" 200 61933 -[02:54:33] Response status code: 200 +[12:22:36] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9?acc_token=f606cab74ded47d6aab5ef2cc11cf975 +[12:22:36] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 200 61943 +[12:22:36] Response status code: 200 -[02:54:33] Tender patched: - - id f433072d5e314f49ba17baf8f17e1185 +[12:22:36] Tender patched: + - id 11325b8b6d8e4a45ae179fef7fd63aa9 - status active.tendering -[02:54:33] Skipping complaints creating: bot and reviewer tokens are required +[12:22:36] Skipping complaints creating: bot and reviewer tokens are required -[02:54:33] Creating bids... +[12:22:36] Creating bids... -[02:54:33] Processing data file: bid_document.txt +[12:22:36] Processing data file: bid_document_file.txt -[02:54:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 582 -[02:54:33] Response status code: 200 +[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 579 +[12:22:36] Response status code: 200 -[02:54:33] Processing data file: bid_confidential_document.txt +[12:22:36] Processing data file: bid_confidential_document_file.txt -[02:54:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 591 -[02:54:33] Response status code: 200 +[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 594 +[12:22:36] Response status code: 200 -[02:54:33] Processing data file: bid_eligibility_document.txt +[12:22:36] Processing data file: bid_eligibility_document_file.txt -[02:54:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 592 -[02:54:33] Response status code: 200 +[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 589 +[12:22:37] Response status code: 200 -[02:54:33] Processing data file: bid_financial_document.txt +[12:22:37] Processing data file: bid_financial_document_file.txt -[02:54:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 588 -[02:54:33] Response status code: 200 +[12:22:37] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 591 +[12:22:37] Response status code: 200 -[02:54:33] Processing data file: bid_qualification_document.txt +[12:22:37] Processing data file: bid_qualification_document_file.txt -[02:54:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[02:54:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 608 -[02:54:33] Response status code: 200 +[12:22:37] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 595 +[12:22:37] Response status code: 200 -[02:54:33] Processing data file: bid_create_0.json +[12:22:37] Processing data file: bid_create_0.json -[02:54:33] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/f433072d5e314f49ba17baf8f17e1185/bids -[02:54:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/f433072d5e314f49ba17baf8f17e1185/bids HTTP/11" 403 141 -[02:54:33] Response status code: 403 +[12:22:37] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/bids +[12:22:37] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/bids HTTP/11" 403 217 +[12:22:37] Response status code: 403 -[02:54:33] Response text: +[12:22:37] Response text: -[02:54:33] {"status": "error", "errors": [{"location": "body", "name": "data", "description": "Can't add bid in current (unsuccessful) tender status"}]} +[12:22:37] {"status": "error", "errors": [{"location": "body", "name": "data", "description": "Bid can be added only during the tendering period: from (2024-08-14T12:22:32.731843+03:00) to (2024-08-14T12:22:35.323960+03:00)."}]} ``` From 1c0342f994f9d3d1d2b600bcc1f81eb3a4c45952 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 14 Aug 2024 14:06:13 +0300 Subject: [PATCH 12/13] Refactor bid documents --- .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../aboveThreshold.lcc/2100_bid_create_0.json | 25 +++++++ .../aboveThreshold.lcc/2100_bid_create_1.json | 25 +++++++ .../aboveThreshold.lcc/2100_bid_create_2.json | 25 +++++++ .../aboveThreshold/2100_bid_create_0.json | 25 +++++++ .../aboveThreshold/2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../aboveThresholdEU/2100_bid_create_0.json | 25 +++++++ .../aboveThresholdEU/2100_bid_create_1.json | 25 +++++++ .../aboveThresholdEU/2100_bid_create_2.json | 25 +++++++ .../aboveThresholdEU/2100_bid_create_3.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../aboveThresholdUA/2100_bid_create_0.json | 25 +++++++ .../aboveThresholdUA/2100_bid_create_1.json | 25 +++++++ .../aboveThresholdUA/2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../belowThreshold/2100_bid_create_0.json | 25 +++++++ .../belowThreshold/2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../4100_selection_bid_create_0.json | 25 +++++++ .../4100_selection_bid_create_1.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../4100_selection_bid_create_0.json | 25 +++++++ .../4100_selection_bid_create_1.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../2100_bid_create_4.json | 25 +++++++ .../4100_stage2_bid_create_0.json | 25 +++++++ .../4100_stage2_bid_create_1.json | 25 +++++++ .../4100_stage2_bid_create_2.json | 25 +++++++ .../4100_stage2_bid_create_3.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../2100_bid_create_4.json | 25 +++++++ .../4100_stage2_bid_create_0.json | 25 +++++++ .../4100_stage2_bid_create_1.json | 25 +++++++ .../4100_stage2_bid_create_2.json | 25 +++++++ .../4100_stage2_bid_create_3.json | 25 +++++++ .../2100_bid_create_0.json | 25 +++++++ .../2100_bid_create_1.json | 25 +++++++ .../2100_bid_create_2.json | 25 +++++++ .../2100_bid_create_3.json | 25 +++++++ .../2100_bid_create_4.json | 25 +++++++ .../4100_stage2_bid_create_0.json | 25 +++++++ .../4100_stage2_bid_create_1.json | 25 +++++++ .../4100_stage2_bid_create_2.json | 25 +++++++ .../4100_stage2_bid_create_3.json | 25 +++++++ .../data/esco.features/2100_bid_create_0.json | 25 +++++++ .../data/esco.features/2100_bid_create_1.json | 25 +++++++ .../data/esco.features/2100_bid_create_2.json | 25 +++++++ .../data/esco.features/2100_bid_create_3.json | 25 +++++++ .../data/esco/2100_bid_create_0.json | 25 +++++++ .../data/esco/2100_bid_create_1.json | 25 +++++++ .../data/esco/2100_bid_create_2.json | 25 +++++++ .../data/esco/2100_bid_create_3.json | 25 +++++++ .../simple.defense/2100_bid_create_0.json | 25 +++++++ .../simple.defense/2100_bid_create_1.json | 25 +++++++ procedure_tools/procedure.py | 2 +- procedure_tools/utils/handlers.py | 13 +++- procedure_tools/utils/process.py | 74 ++++++------------- 88 files changed, 2161 insertions(+), 53 deletions(-) diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_create_0.json b/procedure_tools/data/aboveThreshold.features/2100_bid_create_0.json index 3938d73..2997397 100644 --- a/procedure_tools/data/aboveThreshold.features/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThreshold.features/2100_bid_create_0.json @@ -51,6 +51,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_create_1.json b/procedure_tools/data/aboveThreshold.features/2100_bid_create_1.json index 92523ee..063f2cc 100644 --- a/procedure_tools/data/aboveThreshold.features/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThreshold.features/2100_bid_create_1.json @@ -51,6 +51,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold.features/2100_bid_create_2.json b/procedure_tools/data/aboveThreshold.features/2100_bid_create_2.json index 9f2efe6..70c0b16 100644 --- a/procedure_tools/data/aboveThreshold.features/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThreshold.features/2100_bid_create_2.json @@ -50,6 +50,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_0.json b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_0.json index c2b6c21..a21507f 100644 --- a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_0.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_1.json b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_1.json index 7323eb9..6d1d217 100644 --- a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_1.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_2.json b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_2.json index 7323eb9..6d1d217 100644 --- a/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThreshold.lcc/2100_bid_create_2.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold/2100_bid_create_0.json b/procedure_tools/data/aboveThreshold/2100_bid_create_0.json index c2b6c21..a21507f 100644 --- a/procedure_tools/data/aboveThreshold/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThreshold/2100_bid_create_0.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThreshold/2100_bid_create_1.json b/procedure_tools/data/aboveThreshold/2100_bid_create_1.json index 7323eb9..6d1d217 100644 --- a/procedure_tools/data/aboveThreshold/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThreshold/2100_bid_create_1.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_0.json index 2f5f7da..4d9e973 100644 --- a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_0.json @@ -57,6 +57,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_1.json index e8d4017..88f08b3 100644 --- a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_1.json @@ -50,6 +50,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_2.json index 9f2efe6..70c0b16 100644 --- a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_2.json @@ -50,6 +50,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_3.json b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_3.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_3.json +++ b/procedure_tools/data/aboveThresholdEU.features/2100_bid_create_3.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_0.json index f4f6aff..2f6ec33 100644 --- a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_0.json @@ -47,6 +47,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_1.json index b1728f9..43f907f 100644 --- a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_1.json @@ -40,6 +40,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_2.json index 43a5f82..4064413 100644 --- a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_2.json @@ -40,6 +40,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_3.json b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_3.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_3.json +++ b/procedure_tools/data/aboveThresholdEU.lcc/2100_bid_create_3.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdEU/2100_bid_create_0.json index f4f6aff..2f6ec33 100644 --- a/procedure_tools/data/aboveThresholdEU/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdEU/2100_bid_create_0.json @@ -47,6 +47,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdEU/2100_bid_create_1.json index b1728f9..43f907f 100644 --- a/procedure_tools/data/aboveThresholdEU/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdEU/2100_bid_create_1.json @@ -40,6 +40,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdEU/2100_bid_create_2.json index 43a5f82..4064413 100644 --- a/procedure_tools/data/aboveThresholdEU/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdEU/2100_bid_create_2.json @@ -40,6 +40,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdEU/2100_bid_create_3.json b/procedure_tools/data/aboveThresholdEU/2100_bid_create_3.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdEU/2100_bid_create_3.json +++ b/procedure_tools/data/aboveThresholdEU/2100_bid_create_3.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_0.json index 17b5347..cb94827 100644 --- a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_0.json @@ -58,6 +58,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_1.json index 92523ee..063f2cc 100644 --- a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_1.json @@ -51,6 +51,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_2.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdUA.features/2100_bid_create_2.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_0.json index b2e93ec..852acb2 100644 --- a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_0.json @@ -48,6 +48,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_1.json index c46ea6e..4ff0acc 100644 --- a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_1.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_2.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdUA.lcc/2100_bid_create_2.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_create_0.json b/procedure_tools/data/aboveThresholdUA/2100_bid_create_0.json index 8a4c77f..692769b 100644 --- a/procedure_tools/data/aboveThresholdUA/2100_bid_create_0.json +++ b/procedure_tools/data/aboveThresholdUA/2100_bid_create_0.json @@ -48,6 +48,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_create_1.json b/procedure_tools/data/aboveThresholdUA/2100_bid_create_1.json index 7323eb9..6d1d217 100644 --- a/procedure_tools/data/aboveThresholdUA/2100_bid_create_1.json +++ b/procedure_tools/data/aboveThresholdUA/2100_bid_create_1.json @@ -41,6 +41,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/aboveThresholdUA/2100_bid_create_2.json b/procedure_tools/data/aboveThresholdUA/2100_bid_create_2.json index 1dcc059..7a90f7b 100644 --- a/procedure_tools/data/aboveThresholdUA/2100_bid_create_2.json +++ b/procedure_tools/data/aboveThresholdUA/2100_bid_create_2.json @@ -33,6 +33,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_create_0.json b/procedure_tools/data/belowThreshold.central/2100_bid_create_0.json index d027a1b..c36333e 100644 --- a/procedure_tools/data/belowThreshold.central/2100_bid_create_0.json +++ b/procedure_tools/data/belowThreshold.central/2100_bid_create_0.json @@ -37,6 +37,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold.central/2100_bid_create_1.json b/procedure_tools/data/belowThreshold.central/2100_bid_create_1.json index 599b5b2..84bffaf 100644 --- a/procedure_tools/data/belowThreshold.central/2100_bid_create_1.json +++ b/procedure_tools/data/belowThreshold.central/2100_bid_create_1.json @@ -37,6 +37,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_create_0.json b/procedure_tools/data/belowThreshold.features/2100_bid_create_0.json index 16cd2ac..f7563e2 100644 --- a/procedure_tools/data/belowThreshold.features/2100_bid_create_0.json +++ b/procedure_tools/data/belowThreshold.features/2100_bid_create_0.json @@ -47,6 +47,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_create_1.json b/procedure_tools/data/belowThreshold.features/2100_bid_create_1.json index 7caaf57..eab0085 100644 --- a/procedure_tools/data/belowThreshold.features/2100_bid_create_1.json +++ b/procedure_tools/data/belowThreshold.features/2100_bid_create_1.json @@ -47,6 +47,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold.features/2100_bid_create_2.json b/procedure_tools/data/belowThreshold.features/2100_bid_create_2.json index 725024a..d72b3eb 100644 --- a/procedure_tools/data/belowThreshold.features/2100_bid_create_2.json +++ b/procedure_tools/data/belowThreshold.features/2100_bid_create_2.json @@ -47,6 +47,31 @@ "name": "ДКП «Орфей»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold/2100_bid_create_0.json b/procedure_tools/data/belowThreshold/2100_bid_create_0.json index d027a1b..c36333e 100644 --- a/procedure_tools/data/belowThreshold/2100_bid_create_0.json +++ b/procedure_tools/data/belowThreshold/2100_bid_create_0.json @@ -37,6 +37,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/belowThreshold/2100_bid_create_1.json b/procedure_tools/data/belowThreshold/2100_bid_create_1.json index 599b5b2..84bffaf 100644 --- a/procedure_tools/data/belowThreshold/2100_bid_create_1.json +++ b/procedure_tools/data/belowThreshold/2100_bid_create_1.json @@ -37,6 +37,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_0.json index b9aed37..8580212 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_0.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_0.json @@ -39,6 +39,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_1.json index c097ebf..882ad7b 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_1.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_1.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_2.json index b26860e..3c142fd 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_2.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_2.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_3.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_3.json index 51e745c..e5bcacf 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_3.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2100_bid_create_3.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_0.json index ba3e809..7ca018d 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_0.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_0.json @@ -37,6 +37,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_1.json index a59d7e8..1ec88fb 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_1.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4100_selection_bid_create_1.json @@ -37,6 +37,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_0.json index b9aed37..8580212 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_0.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_0.json @@ -39,6 +39,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_1.json b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_1.json index c097ebf..882ad7b 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_1.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_1.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_2.json index b26860e..3c142fd 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_2.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_2.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_3.json b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_3.json index 51e745c..e5bcacf 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_3.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/2100_bid_create_3.json @@ -38,6 +38,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_0.json b/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_0.json index ba3e809..7ca018d 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_0.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_0.json @@ -37,6 +37,31 @@ "name": "Тестове державне комунальне підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_1.json b/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_1.json index a59d7e8..1ec88fb 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_1.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/4100_selection_bid_create_1.json @@ -37,6 +37,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_0.json b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_0.json index 5c87270..1a640a9 100644 --- a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_0.json @@ -39,6 +39,31 @@ "relatedLot": "60441ce87301487c9bf194fbd3a4f7c7", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_1.json b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_1.json index fb87dfa..450814b 100644 --- a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_1.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_2.json b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_2.json index 199bbc0..ca10ed1 100644 --- a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_2.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_3.json b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_3.json index b84a7d6..081010b 100644 --- a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_3.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_4.json b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_4.json index c3dcca7..f81b938 100644 --- a/procedure_tools/data/competitiveDialogueEU/2100_bid_create_4.json +++ b/procedure_tools/data/competitiveDialogueEU/2100_bid_create_4.json @@ -30,6 +30,31 @@ "relatedLot": "5f58e4e21baf4696bb1cfd67c4f86f73", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_0.json b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_0.json index 5b856b7..e7c43da 100644 --- a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_0.json @@ -41,6 +41,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_1.json b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_1.json index 2032074..8c7d56b 100644 --- a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_1.json @@ -40,6 +40,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_2.json b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_2.json index 4e19786..f249b47 100644 --- a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_2.json @@ -40,6 +40,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_3.json b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_3.json index 3715815..265ab01 100644 --- a/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueEU/4100_stage2_bid_create_3.json @@ -33,6 +33,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_0.json b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_0.json index 5c87270..1a640a9 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_0.json @@ -39,6 +39,31 @@ "relatedLot": "60441ce87301487c9bf194fbd3a4f7c7", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_1.json b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_1.json index fb87dfa..450814b 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_1.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_2.json b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_2.json index 199bbc0..ca10ed1 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_2.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_3.json b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_3.json index b84a7d6..081010b 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_3.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_4.json b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_4.json index c3dcca7..f81b938 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_4.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2100_bid_create_4.json @@ -30,6 +30,31 @@ "relatedLot": "5f58e4e21baf4696bb1cfd67c4f86f73", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_0.json b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_0.json index 3fa6e5f..6b635ff 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_0.json @@ -51,6 +51,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_1.json b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_1.json index fa198bd..3698f6f 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_1.json @@ -50,6 +50,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_2.json b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_2.json index 34448b5..ebf0f23 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_2.json @@ -50,6 +50,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_3.json b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_3.json index b148461..007911a 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueUA.features/4100_stage2_bid_create_3.json @@ -43,6 +43,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_0.json b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_0.json index 5c87270..1a640a9 100644 --- a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_0.json @@ -39,6 +39,31 @@ "relatedLot": "60441ce87301487c9bf194fbd3a4f7c7", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_1.json b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_1.json index fb87dfa..450814b 100644 --- a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_1.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_2.json b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_2.json index 199bbc0..ca10ed1 100644 --- a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_2.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_3.json b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_3.json index b84a7d6..081010b 100644 --- a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_3.json @@ -34,6 +34,31 @@ "relatedLot": "9d4fc4783ebb4a99b10cc9a2f7d7552f", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_4.json b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_4.json index c3dcca7..f81b938 100644 --- a/procedure_tools/data/competitiveDialogueUA/2100_bid_create_4.json +++ b/procedure_tools/data/competitiveDialogueUA/2100_bid_create_4.json @@ -30,6 +30,31 @@ "relatedLot": "5f58e4e21baf4696bb1cfd67c4f86f73", "subcontractingDetails": "Тестове підприємство, Україна" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_0.json b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_0.json index 5b856b7..e7c43da 100644 --- a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_0.json +++ b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_0.json @@ -41,6 +41,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_1.json b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_1.json index 2032074..8c7d56b 100644 --- a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_1.json +++ b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_1.json @@ -40,6 +40,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_2.json b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_2.json index 4e19786..f249b47 100644 --- a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_2.json +++ b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_2.json @@ -40,6 +40,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_3.json b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_3.json index 3715815..265ab01 100644 --- a/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_3.json +++ b/procedure_tools/data/competitiveDialogueUA/4100_stage2_bid_create_3.json @@ -33,6 +33,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco.features/2100_bid_create_0.json b/procedure_tools/data/esco.features/2100_bid_create_0.json index 50df6e8..e4887e6 100644 --- a/procedure_tools/data/esco.features/2100_bid_create_0.json +++ b/procedure_tools/data/esco.features/2100_bid_create_0.json @@ -135,6 +135,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco.features/2100_bid_create_1.json b/procedure_tools/data/esco.features/2100_bid_create_1.json index ebb5c64..3fb29ae 100644 --- a/procedure_tools/data/esco.features/2100_bid_create_1.json +++ b/procedure_tools/data/esco.features/2100_bid_create_1.json @@ -101,6 +101,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco.features/2100_bid_create_2.json b/procedure_tools/data/esco.features/2100_bid_create_2.json index ebb5c64..3fb29ae 100644 --- a/procedure_tools/data/esco.features/2100_bid_create_2.json +++ b/procedure_tools/data/esco.features/2100_bid_create_2.json @@ -101,6 +101,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco.features/2100_bid_create_3.json b/procedure_tools/data/esco.features/2100_bid_create_3.json index a0bcb74..b233875 100644 --- a/procedure_tools/data/esco.features/2100_bid_create_3.json +++ b/procedure_tools/data/esco.features/2100_bid_create_3.json @@ -58,6 +58,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco/2100_bid_create_0.json b/procedure_tools/data/esco/2100_bid_create_0.json index 003df3b..41c18df 100644 --- a/procedure_tools/data/esco/2100_bid_create_0.json +++ b/procedure_tools/data/esco/2100_bid_create_0.json @@ -125,6 +125,31 @@ "name": "Тестове підприємство", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco/2100_bid_create_1.json b/procedure_tools/data/esco/2100_bid_create_1.json index 01e4fdf..876233a 100644 --- a/procedure_tools/data/esco/2100_bid_create_1.json +++ b/procedure_tools/data/esco/2100_bid_create_1.json @@ -91,6 +91,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco/2100_bid_create_2.json b/procedure_tools/data/esco/2100_bid_create_2.json index 01e4fdf..876233a 100644 --- a/procedure_tools/data/esco/2100_bid_create_2.json +++ b/procedure_tools/data/esco/2100_bid_create_2.json @@ -91,6 +91,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/esco/2100_bid_create_3.json b/procedure_tools/data/esco/2100_bid_create_3.json index a0bcb74..b233875 100644 --- a/procedure_tools/data/esco/2100_bid_create_3.json +++ b/procedure_tools/data/esco/2100_bid_create_3.json @@ -58,6 +58,31 @@ "name": "«Снігур»", "scale": "micro" } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/simple.defense/2100_bid_create_0.json b/procedure_tools/data/simple.defense/2100_bid_create_0.json index 268b480..615a8a9 100644 --- a/procedure_tools/data/simple.defense/2100_bid_create_0.json +++ b/procedure_tools/data/simple.defense/2100_bid_create_0.json @@ -42,6 +42,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/data/simple.defense/2100_bid_create_1.json b/procedure_tools/data/simple.defense/2100_bid_create_1.json index ad34ef4..3d5bbc4 100644 --- a/procedure_tools/data/simple.defense/2100_bid_create_1.json +++ b/procedure_tools/data/simple.defense/2100_bid_create_1.json @@ -41,6 +41,31 @@ "amount": 500 } } + ], + "documents": [ + { + "title": "bid_document_file.txt" + }, + { + "title": "bid_confidential_document_file.txt", + "confidentiality": "buyerOnly", + "confidentialityRationale": "Доступ до цього документу має бути обмежений лише для замовника" + } + ], + "eligibilityDocuments": [ + { + "title": "bid_eligibility_document_file.txt" + } + ], + "financialDocuments": [ + { + "title": "bid_financial_document_file.txt" + } + ], + "qualificationDocuments": [ + { + "title": "bid_qualification_document_file.txt" + } ] } } diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py index 1660570..7c74fa9 100644 --- a/procedure_tools/procedure.py +++ b/procedure_tools/procedure.py @@ -405,7 +405,7 @@ def process_procedure( bids_ids = [bid_json["data"]["id"] for bid_json in bids_jsons] bids_tokens = [bid_json["access"]["token"] for bid_json in bids_jsons] if tender_criteria: - bids_documents = [bid_json["data"]["documents"] for bid_json in bids_jsons] + bids_documents = [bid_json["data"].get("documents", []) for bid_json in bids_jsons] post_bid_res( client, args, diff --git a/procedure_tools/utils/handlers.py b/procedure_tools/utils/handlers.py index 46f5347..6d673c5 100644 --- a/procedure_tools/utils/handlers.py +++ b/procedure_tools/utils/handlers.py @@ -117,6 +117,16 @@ def bid_create_success_handler(response): msg += " - token \t\t\t{}\n".format(fore_info(access["token"])) msg += " - status \t\t\t{}\n".format(fore_info(data["status"])) + for bid_document_container in ( + "documents", + "eligibilityDocuments", + "financialDocuments", + "qualificationDocuments", + ): + for document in data.get(bid_document_container, []): + response = type('Response', (object,), {'json': lambda self: {"data": document}})() + document_attach_success_handler(response) + logging.info(msg) @@ -254,7 +264,8 @@ def document_attach_success_handler(response): msg = "Document attached:\n" msg += " - id \t\t\t\t{}\n".format(fore_info(data["id"])) - msg += " - url \t\t\t\t{}\n".format(fore_info(data["url"])) + if "url" in data: + msg += " - url \t\t\t\t{}\n".format(fore_info(data["url"])) if "documentType" in data: msg += " - documentType \t\t{}\n".format(fore_info(data["documentType"])) if "confidentiality" in data: diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py index 3dd929e..e7662e9 100644 --- a/procedure_tools/utils/process.py +++ b/procedure_tools/utils/process.py @@ -111,10 +111,11 @@ def post_bid_res( if "evidences" in bid_res: for evidence in bid_res["evidences"]: if evidence["type"] == "document": - bid_document = bids_documents[bid_index][0] - related_document = evidence["relatedDocument"] - related_document["id"] = bid_document["id"] - related_document["title"] = bid_document["title"] + if bids_documents[bid_index]: + bid_document = bids_documents[bid_index][0] + related_document = evidence["relatedDocument"] + related_document["id"] = bid_document["id"] + related_document["title"] = bid_document["title"] for tender_criteria_item in tender_criteria: for group in tender_criteria_item["requirementGroups"]: for req in group["requirements"]: @@ -533,53 +534,24 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): bid_data_files.append(data_file) responses = [] for bid_data_file in bid_data_files: - bid_documents = [] - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_document_file".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - document_data = ds_response.json()["data"] - bid_documents.append(document_data) - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_confidential_document_file".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - document_data = ds_response.json()["data"] - document_data["confidentiality"] = "buyerOnly" - document_data["confidentialityRationale"] = ( - f"Some {'long ' * 10}rationale" - ) - bid_documents.append(document_data) - bid_eligibility_documents = [] - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_eligibility_document_file".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - document_data = ds_response.json()["data"] - bid_eligibility_documents.append(document_data) - bid_financial_documents = [] - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_financial_document_file".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - document_data = ds_response.json()["data"] - bid_financial_documents.append(document_data) - bid_qualification_documents = [] - for data_file in get_data_all_files(get_data_path(args.data)): - if data_file.startswith("{}bid_qualification_document_file".format(prefix)): - ds_response = upload_document_ds(ds_client, args, context, data_file) - if ds_response: - document_data = ds_response.json()["data"] - bid_qualification_documents.append(document_data) path = get_data_file_path(get_data_path(args.data), bid_data_file) with read_file(path, context=context, exit_filename=args.stop) as content: bid_create_data = json.loads(content) - bid_create_data["data"]["documents"] = bid_documents - bid_create_data["data"]["eligibilityDocuments"] = bid_eligibility_documents - bid_create_data["data"]["financialDocuments"] = bid_financial_documents - bid_create_data["data"][ - "qualificationDocuments" - ] = bid_qualification_documents + for bid_document_container in ( + "documents", + "eligibilityDocuments", + "financialDocuments", + "qualificationDocuments", + ): + bid_documents = [] + for bid_document_data in bid_create_data["data"].get(bid_document_container, []): + upload_file = bid_document_data["title"] + ds_response = upload_document_ds(ds_client, args, context, upload_file) + if ds_response: + document_data = ds_response.json()["data"] + document_data.update(bid_document_data) + bid_documents.append(document_data) + bid_create_data["data"][bid_document_container] = bid_documents response = client.post_tender_bid( tender_id, bid_create_data, @@ -704,11 +676,11 @@ def upload_documents( upload_file = tender_document_data["data"]["title"] ds_response = upload_document_ds(ds_client, args, context, upload_file) if ds_response: - data = ds_response.json()["data"] + document_data = ds_response.json()["data"] # apply data from data_file on top to add additional fields like documentType - data.update(tender_document_data["data"]) + document_data.update(tender_document_data["data"]) response = attach_callback( - json={"data": data}, + json={"data": document_data}, auth_token=args.token, success_handler=document_attach_success_handler, ) From ff0b11f03669a36520a2de5d62999f3d72b21185 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 14 Aug 2024 14:55:14 +0300 Subject: [PATCH 13/13] Fix code style --- procedure_tools/procedure.py | 4 +++- procedure_tools/utils/handlers.py | 4 +++- procedure_tools/utils/process.py | 14 +++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py index 7c74fa9..fad7174 100644 --- a/procedure_tools/procedure.py +++ b/procedure_tools/procedure.py @@ -405,7 +405,9 @@ def process_procedure( bids_ids = [bid_json["data"]["id"] for bid_json in bids_jsons] bids_tokens = [bid_json["access"]["token"] for bid_json in bids_jsons] if tender_criteria: - bids_documents = [bid_json["data"].get("documents", []) for bid_json in bids_jsons] + bids_documents = [ + bid_json["data"].get("documents", []) for bid_json in bids_jsons + ] post_bid_res( client, args, diff --git a/procedure_tools/utils/handlers.py b/procedure_tools/utils/handlers.py index 6d673c5..83b0f8b 100644 --- a/procedure_tools/utils/handlers.py +++ b/procedure_tools/utils/handlers.py @@ -124,7 +124,9 @@ def bid_create_success_handler(response): "qualificationDocuments", ): for document in data.get(bid_document_container, []): - response = type('Response', (object,), {'json': lambda self: {"data": document}})() + response = type( + "Response", (object,), {"json": lambda self: {"data": document}} + )() document_attach_success_handler(response) logging.info(msg) diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py index e7662e9..08c7176 100644 --- a/procedure_tools/utils/process.py +++ b/procedure_tools/utils/process.py @@ -544,9 +544,13 @@ def create_bids(client, ds_client, args, context, tender_id, prefix=""): "qualificationDocuments", ): bid_documents = [] - for bid_document_data in bid_create_data["data"].get(bid_document_container, []): + for bid_document_data in bid_create_data["data"].get( + bid_document_container, [] + ): upload_file = bid_document_data["title"] - ds_response = upload_document_ds(ds_client, args, context, upload_file) + ds_response = upload_document_ds( + ds_client, args, context, upload_file + ) if ds_response: document_data = ds_response.json()["data"] document_data.update(bid_document_data) @@ -684,7 +688,11 @@ def upload_documents( auth_token=args.token, success_handler=document_attach_success_handler, ) - if not ignore_error or ignore_error and 200 <= response.status_code < 300: + if ( + not ignore_error + or ignore_error + and 200 <= response.status_code < 300 + ): responses.append(response) return responses