From c248db29febc5463142a692c7f9b4e9adf434b6f Mon Sep 17 00:00:00 2001 From: berkay Date: Thu, 19 Dec 2024 11:37:25 +0300 Subject: [PATCH] bank records updated --- .../validations_request/building.py | 2 ++ docker-compose.yml | 28 +++++++++---------- service_app_banks/isbank/isbank_sender.py | 5 +++- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/api_validations/validations_request/building.py b/api_validations/validations_request/building.py index 06d4a74..50b5d63 100644 --- a/api_validations/validations_request/building.py +++ b/api_validations/validations_request/building.py @@ -14,6 +14,7 @@ class BuildValidation: "gov_address_code": "Devlet Adres Kodu", "build_name": "Bina Adı", "build_types_uu_id": "Bina Tipi", + "build_no": "Bina No", "max_floor": "Kat Sayısı", "underground_floor": "Bodrum Kat Sayısı", "address_uu_id": "Adres", @@ -33,6 +34,7 @@ class BuildValidation: "gov_address_code": "Government Address Code", "build_name": "Building Name", "build_types_uu_id": "Building Type", + "build_no": "Building No", "max_floor": "Number of Floors", "underground_floor": "Number of Basement Floors", "address_uu_id": "Address", diff --git a/docker-compose.yml b/docker-compose.yml index c816600..abfa591 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,20 +102,20 @@ services: # environment: # - DATABASE_URL=postgresql+psycopg2://berkay_wag_user:berkay_wag_user_password@postgres_commercial:5432/wag_database # - PYTHONPATH=/service_app_banks -# - wag_account_services: - container_name: wag_account_services - restart: on-failure - build: - context: . - dockerfile: service_account_records/account.Dockerfile - networks: - - network_store_services - depends_on: - - postgres_commercial - environment: - - DATABASE_URL=postgresql+psycopg2://berkay_wag_user:berkay_wag_user_password@postgres_commercial:5432/wag_database - - PYTHONPATH=/ +## +# wag_account_services: +# container_name: wag_account_services +# restart: on-failure +# build: +# context: . +# dockerfile: service_account_records/account.Dockerfile +# networks: +# - network_store_services +# depends_on: +# - postgres_commercial +# environment: +# - DATABASE_URL=postgresql+psycopg2://berkay_wag_user:berkay_wag_user_password@postgres_commercial:5432/wag_database +# - PYTHONPATH=/ # # prometheus: # image: prom/prometheus diff --git a/service_app_banks/isbank/isbank_sender.py b/service_app_banks/isbank/isbank_sender.py index 0be21c1..6438a04 100644 --- a/service_app_banks/isbank/isbank_sender.py +++ b/service_app_banks/isbank/isbank_sender.py @@ -1,5 +1,7 @@ import sys +from databases.sql_models.account.iban import BuildIbans + if "/service_app_banks" not in list(sys.path): sys.path.append("/service_app_banks") @@ -81,7 +83,7 @@ def is_bank_retrieve_account_records(bank_data): data_dict["bank_date_d"] = bank_date.day data_dict["bank_date_y"] = bank_date.year data_dict["bank_date"] = str(bank_date) - + build_iban = BuildIbans.filter_by_one(iban=data_dict["iban"], system=True) if found_record := AccountRecords.filter_one( AccountRecords.bank_date == data_dict["bank_date"], AccountRecords.iban == data_dict["iban"], @@ -91,6 +93,7 @@ def is_bank_retrieve_account_records(bank_data): ).data: print("already @database record", found_record.id) else: + data_dict = {"build_id": build_iban.build_id, "build_uu_id": build_iban.build_uu_id} new_account_record = AccountRecords.find_or_create(**data_dict) new_account_record.save_and_confirm() new_record_list.append(new_account_record.get_dict())