evyos-center-server
/
wag-managment-api-service-version-2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decision book decision book items updated

This commit is contained in:
berkay 2024-11-18 12:41:10 +03:00
parent ac20226aa1
commit b4dc24cf50
4 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api_events/events/decision_book/decision_book_decision_book_items.py
View File

@ -228,10 +228,12 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
BuildDecisionBookProjects.build_decision_book_id == decision_book.id, BuildDecisionBookProjects.build_decision_book_id == decision_book.id,
BuildDecisionBookProjects.project_type BuildDecisionBookProjects.project_type
== f"{decision_book.decision_type}_{data_info_type.key}", == f"{decision_book.decision_type}_{data_info_type.key}",
system=True
) )
management_room = BuildParts.filter_one( management_room = BuildParts.filter_one(
BuildParts.build_id == build_id, BuildParts.build_id == build_id,
BuildParts.part_no == 0, BuildParts.part_no == 0,
system=True
).data ).data
occupant_man = OccupantTypes.filter_by_one( occupant_man = OccupantTypes.filter_by_one(
system=True, occupant_code="MT-VPR", occupant_category_type="MT" system=True, occupant_code="MT-VPR", occupant_category_type="MT"
@ -288,6 +290,8 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail="BDT-S is not implemented yet. Check info type and try again", detail="BDT-S is not implemented yet. Check info type and try again",
) )
elif data_info_type.key == "BDT-I":
return
else: else:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
@ -356,7 +360,7 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
row_is_debit = str(data_info_type.key).upper() in ["BDT-A", "BDT-D"] row_is_debit = str(data_info_type.key).upper() in ["BDT-A", "BDT-D"]
row_is_project = str(data_info_type.key).upper() in ["BDT-R", "BDT-L", "BDT-S"] row_is_project = str(data_info_type.key).upper() in ["BDT-R", "BDT-L", "BDT-S"]
debit_dates_required = not data_dict["debit_start_date"] or not data_dict["debit_end_date"] debit_dates_required = not data_dict["debit_start_date"] or not data_dict["debit_end_date"]
if any([row_is_debit, row_is_project]) and debit_dates_required: if row_is_project and debit_dates_required:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail="Debit Start Date and Debit End Date is required for this payment type. " detail="Debit Start Date and Debit End Date is required for this payment type. "

2
databases/sql_models/building/decision_book.py
View File

@ -787,8 +787,6 @@ class BuildDecisionBookItems(CrudCollection):
return people_book_attend_count return people_book_attend_count
class BuildDecisionBookItemsUnapproved(CrudCollection): class BuildDecisionBookItemsUnapproved(CrudCollection):
""" """
Builds class based on declarative_base and BaseMixin via session unapproved personnel Builds class based on declarative_base and BaseMixin via session unapproved personnel

2
service_app_test/test_application/evyos/decision_book_items.py
View File

@ -114,6 +114,7 @@ def run_decision_book_items(
): ):
if start_date and end_date: if start_date and end_date:
create_decision_book_items_with_occupant_user( create_decision_book_items_with_occupant_user(
item_comment=item_comment,
writers_token=writers_token, writers_token=writers_token,
unit_price=unit_price, unit_price=unit_price,
is_fixed=is_fixed, is_fixed=is_fixed,
@ -125,6 +126,7 @@ def run_decision_book_items(
else: else:
create_decision_book_items_with_occupant_user( create_decision_book_items_with_occupant_user(
writers_token=writers_token, writers_token=writers_token,
item_comment=item_comment,
unit_price=unit_price, unit_price=unit_price,
is_fixed=is_fixed, is_fixed=is_fixed,
info_type_uu_id=info_type_uu_id, info_type_uu_id=info_type_uu_id,

47
service_app_test/test_application/migrate_old_data/runner.py
View File

@ -22,7 +22,7 @@ from service_app_test.test_application.migrate_old_data.accounts import (
) )
password_token = "xo4z9Ywy525XgEGSJvsXl50i0nlCVLSfuJJ3G7eJwcVF2I6WBtJ3duZn4pklZi6Tyylr8yKGjk0PIFPuXMeUUk1QQeqDcy7NWB9QBZKkJGM-jKTB59RVA9VaX7SdyFwjVydr3dkeUN8cO4gzzF6KBjk0FgTudg1UmhNt5fYul4GsEqc--vCiThmw1YBwPqX-" password_token = "LmHm9SmX9GiHRkb6Z0GqI4cEzEnxmesMDSWPZEyNqF-9endOcN_qgLKa5kXP8P_oMloNy5EURn4Lq8dZljil2m0_OTAgZRjTqInYb84rsWqqRf8JMqaI7m6UKle_drToNZlnfjpOSgNbbisX3xQv7SvkWBGrWSm4QSI_poRZrgztV2wJZipge7atLopQOFW5"
login_data = { login_data = {
"domain": "evyos.com.tr", "domain": "evyos.com.tr",
"access_key": "karatay.berkay.sup@evyos.com.tr", "access_key": "karatay.berkay.sup@evyos.com.tr",
@ -43,7 +43,7 @@ login_creds_occupant = {
"access_key": access_key_president, "access_key": access_key_president,
"password": "string", "password": "string",
"remember_me": False, "remember_me": False,
"password_token": "dqc-VsM23qVC8MmeA-gOHIm8qqABI3s4wzk281J0pGoDSnhfhSlv1qMXAm6hQIyHfqnAEBWxDgAs6gtp86YZ0WQXtXMmvVTGXFYoYejcbZXIWmCxjbLUQWy0O-VoNovm1wO7NtQ5FVxyNVp9aHs6kbJFlJCeEcrUVXRoKDOvM1YCw7xWE9-2VwPq820ElXNZ" "password_token": "wU1OkD5HEicfNEs_Azm-PjEOaQT4uO9vmnKgtMrME0rNCS4rbMwj6mTXteu5i0DS8EoQOB0XXdN-BWsU0FvRRMND5wzTHHc4k5eb62blrXnM8IHRlFpxObUflGwjOF4tNoTeU53z5zqqHgaHMFAD6GUtZSeXwoSpQcLcag-OqdVmOL82GBmEXXU8bodKL5_y"
} }
wrt_creds_occupant = { wrt_creds_occupant = {
"domain": "evyos.com.tr", "domain": "evyos.com.tr",
@ -67,38 +67,39 @@ both_apis = BothAPIS()
# both_apis.wag_api = wag_api # both_apis.wag_api = wag_api
both_apis.local_api = local_api both_apis.local_api = local_api
assign_people_to_create_item = 2 assign_people_to_create_item = 3
# selection_list = None # selection_list = None
selection_list = [ selection_list = [
"14d0be55-76a1-4ba8-ab5e-894b86ef2d6f", "a44fb2c0-42a4-4193-b964-73dcbf605110",
"be2d1b8c-fb85-4697-9af0-9dc2bf35e3e7", "463ae98b-07e7-4e76-8de1-d5984fed91fa",
] ]
# selection_list = None # selection_list = None
manager_token = "ikWge__rW4kgK0n6dZFcZGnG8B-CQnQdsDdW-pZVybjog5sqn_dyRg" manager_token = "WmtHuV0DeWlYAs68PTiM5q100UTzGweh8B2rZAuwrwFqm1r4FhQqcg"
writers_token = manager_token writers_token = manager_token
people_uu_id_list = [ people_uu_id_list = [
"ea267856-1c29-4a39-8d27-a519a4a17d0d", "2f1d6e3e-aca2-4bfa-a3e7-ce32eb7e02b2",
"ea267856-1c29-4a39-8d27-a519a4a17d0d", "2f1d6e3e-aca2-4bfa-a3e7-ce32eb7e02b2",
"ea267856-1c29-4a39-8d27-a519a4a17d0d", "2f1d6e3e-aca2-4bfa-a3e7-ce32eb7e02b2",
] ]
list_of_attendees = [ list_of_attendees = [
"w2Gv9W4nnL8SbOZWH-c5e1bTC9muiqC5d9GBp5JeBfuAyq17m8nZDw", "mkQtBLD-zMP94KMz21VFXN2bORlWEqlqM7zQT8GGkvwS0uLGEk3y6Q",
"XTXnM2qYgtK03rP6utHbwBJAokwKHD198lk8_0J_dfblzIhrMls9Gg", "clp8xw-etegFaVsqVflsz6oIO-SchIvARZO2_t8qaSOOrIlA93Xmeg",
"Zy3Hdd4g6h3VG530xgmwtT1AJhRiFZiKoNecLzCfpGsYPPbZ7mwYJw", "-FsZrl9bhcKONRGFKJIX1wHPjYQU-GEwydiuXhtNLWB5WxPTusSNhQ",
"wGsq1mTc4a5J_Xiw1c6wY0xmvjXjuM6HKs_S7vEMBBAC7QCzRDbJCA", "HhozHBzoilMYrNI6Li4tYz27LSz2PC2vPxrM0Y7FvbsTXMeDR9EX8Q",
"JPJ8k28nlPyqXWhrf4e8s4tXV4TkJWnd4dJqrGojKl7lig-eW0RCWA", "0s6lOAOQJqARSNx7uTlRjMoIqmC7pEcs6Zo-Q3XmGZPWnv_qLTVXbg",
"UYOAuXvbxumKWBnn_LcDgQMW_CbLANfYWVPNSvIdqlJLKku0oxnb6w", "EulS8ex9ywa22jp55P6L-Bfnolvb8bIZTirlZn2cSk8_g3sPyYv8gg",
"K2-389YbEpQakkh28q2SMLNNA1Mlxqn0gkkH8e6DmrXisRJF-WmkDA", "v9zti5nMhronCi4e-Ud_9MKYwjwg36So6s3kM-v05WnFqeedhgpDbQ",
"u4epuCfDcgnJ4I6e2vFIDUQkvJAfVTDPl5M_VU5bs3PnJcz_rfKdYA", "uqNBMsqguoyrcEPAmYv5_FNDo_xKtprft4eBx350PKImm4Hq2UdeMw",
"jjbtUv90l7y61RCqdOdaos_TvBRpdEXGlv0JFKUI_kzCNAACWuZblQ", "WkREg0XBpW8f-XEKePoOmMiLKReyqo7_4RRUdne4O1nvqt5EtAOJXA",
"ajTCCS5TAKx60wdsgkjmx8yu0rZK9tjFIdSivTGvXFp9lHJHxPGcOQ", "Z7zCBEdFTaX-jSo_e29KGXSGc1MKTaGL93KrqKJfV1fqhaepl6iv7g",
"bDA8OjauKUKrCCtlUKw_ozGMJPm7w4Qov-0SJg-8fkQB4Iksue7stQ", "okfCZ1JQuphfZ4GT47tGwmKXCidyxpf1f6wcjsLRVnS6-AU5_EbLJg",
] ]
living_space_data = dict( living_space_data = dict(
build_parts_uu_id="14d0be55-76a1-4ba8-ab5e-894b86ef2d6f", build_parts_uu_id="a44fb2c0-42a4-4193-b964-73dcbf605110",
person_uu_id="683198ba-312f-4003-a98b-f1d12153016b", person_uu_id="269d1bdc-1495-4e5f-afef-20dd5c3e22be",
occupant_type_uu_id="be2d1b8c-fb85-4697-9af0-9dc2bf35e3e7", occupant_type_uu_id="6c98e522-6b4c-4951-8e1e-e33c14b4d779",
expiry_starts=arrow.now().date().__str__(), expiry_starts=arrow.now().date().__str__(),
) )