diff --git a/service_app_test/test_application/evyos/decision_book_items.py b/service_app_test/test_application/evyos/decision_book_items.py index d93b1c9..72d3d4c 100644 --- a/service_app_test/test_application/evyos/decision_book_items.py +++ b/service_app_test/test_application/evyos/decision_book_items.py @@ -77,9 +77,10 @@ def collect_invitation_to_building_residents( def create_decision_book_items_with_occupant_user( requester, writers_token: str, - unit_price: float, - is_fixed: bool, + item_comment: str, info_type_uu_id: str, + is_fixed: bool = False, + unit_price: float = None, start_date: str = None, end_date: str = None, ): @@ -87,7 +88,7 @@ def create_decision_book_items_with_occupant_user( list_of_items = [ decision_book_items_dict( token=writers_token, - item_comment="This is an item debit for test purposes", + item_comment=item_comment, info_type_uu_id=info_type_uu_id, unit_price=unit_price, is_fixed=is_fixed, @@ -103,10 +104,11 @@ def create_decision_book_items_with_occupant_user( def run_decision_book_items( writers_token, - unit_price, info_type_uu_id, - is_fixed, + item_comment, requester, + is_fixed=None, + unit_price=None, start_date=None, end_date=None, ): diff --git a/service_app_test/test_application/migrate_old_data/runner.py b/service_app_test/test_application/migrate_old_data/runner.py index 206ccdc..1b0c3e4 100644 --- a/service_app_test/test_application/migrate_old_data/runner.py +++ b/service_app_test/test_application/migrate_old_data/runner.py @@ -22,7 +22,7 @@ from service_app_test.test_application.migrate_old_data.accounts import ( ) -password_token = "" +password_token = "xo4z9Ywy525XgEGSJvsXl50i0nlCVLSfuJJ3G7eJwcVF2I6WBtJ3duZn4pklZi6Tyylr8yKGjk0PIFPuXMeUUk1QQeqDcy7NWB9QBZKkJGM-jKTB59RVA9VaX7SdyFwjVydr3dkeUN8cO4gzzF6KBjk0FgTudg1UmhNt5fYul4GsEqc--vCiThmw1YBwPqX-" login_data = { "domain": "evyos.com.tr", "access_key": "karatay.berkay.sup@evyos.com.tr", @@ -43,7 +43,7 @@ login_creds_occupant = { "access_key": access_key_president, "password": "string", "remember_me": False, - "password_token": "" + "password_token": "dqc-VsM23qVC8MmeA-gOHIm8qqABI3s4wzk281J0pGoDSnhfhSlv1qMXAm6hQIyHfqnAEBWxDgAs6gtp86YZ0WQXtXMmvVTGXFYoYejcbZXIWmCxjbLUQWy0O-VoNovm1wO7NtQ5FVxyNVp9aHs6kbJFlJCeEcrUVXRoKDOvM1YCw7xWE9-2VwPq820ElXNZ" } wrt_creds_occupant = { "domain": "evyos.com.tr", @@ -67,27 +67,38 @@ both_apis = BothAPIS() # both_apis.wag_api = wag_api both_apis.local_api = local_api -assign_people_to_create_item = -1 +assign_people_to_create_item = 2 # selection_list = None selection_list = [ - + "14d0be55-76a1-4ba8-ab5e-894b86ef2d6f", + "be2d1b8c-fb85-4697-9af0-9dc2bf35e3e7", ] # selection_list = None -manager_token = "" +manager_token = "ikWge__rW4kgK0n6dZFcZGnG8B-CQnQdsDdW-pZVybjog5sqn_dyRg" writers_token = manager_token people_uu_id_list = [ - # "af411e80-29ad-4540-9e74-3c805700f461", - # "af411e80-29ad-4540-9e74-3c805700f461", - # "af411e80-29ad-4540-9e74-3c805700f461", + "ea267856-1c29-4a39-8d27-a519a4a17d0d", + "ea267856-1c29-4a39-8d27-a519a4a17d0d", + "ea267856-1c29-4a39-8d27-a519a4a17d0d", ] list_of_attendees = [ - + "w2Gv9W4nnL8SbOZWH-c5e1bTC9muiqC5d9GBp5JeBfuAyq17m8nZDw", + "XTXnM2qYgtK03rP6utHbwBJAokwKHD198lk8_0J_dfblzIhrMls9Gg", + "Zy3Hdd4g6h3VG530xgmwtT1AJhRiFZiKoNecLzCfpGsYPPbZ7mwYJw", + "wGsq1mTc4a5J_Xiw1c6wY0xmvjXjuM6HKs_S7vEMBBAC7QCzRDbJCA", + "JPJ8k28nlPyqXWhrf4e8s4tXV4TkJWnd4dJqrGojKl7lig-eW0RCWA", + "UYOAuXvbxumKWBnn_LcDgQMW_CbLANfYWVPNSvIdqlJLKku0oxnb6w", + "K2-389YbEpQakkh28q2SMLNNA1Mlxqn0gkkH8e6DmrXisRJF-WmkDA", + "u4epuCfDcgnJ4I6e2vFIDUQkvJAfVTDPl5M_VU5bs3PnJcz_rfKdYA", + "jjbtUv90l7y61RCqdOdaos_TvBRpdEXGlv0JFKUI_kzCNAACWuZblQ", + "ajTCCS5TAKx60wdsgkjmx8yu0rZK9tjFIdSivTGvXFp9lHJHxPGcOQ", + "bDA8OjauKUKrCCtlUKw_ozGMJPm7w4Qov-0SJg-8fkQB4Iksue7stQ", ] living_space_data = dict( - build_parts_uu_id="", - person_uu_id="", - occupant_type_uu_id="", + build_parts_uu_id="14d0be55-76a1-4ba8-ab5e-894b86ef2d6f", + person_uu_id="683198ba-312f-4003-a98b-f1d12153016b", + occupant_type_uu_id="be2d1b8c-fb85-4697-9af0-9dc2bf35e3e7", expiry_starts=arrow.now().date().__str__(), ) @@ -171,81 +182,115 @@ elif assign_people_to_create_item == 3: selection_list=selection_list, ) - """ - - """ - debit_type_uu_id = "" - selected_decision_book_uu_id = list_decision_books(requester=both_apis.local_api)["data"][0]["uu_id"] print("select_company_uu_id", local_api.selected_object) is_fixed_price = False - info_type_d_uu_id = get_type_codes_key_and_class( + start_date, end_date = "2024-11-01", "2024-12-01" + + info_type_reno_uu_id = get_type_codes_key_and_class( + class_name="BuildDuesTypes", key_name="BDT-R", requester=both_apis.local_api + )["data"]["uu_id"] + info_type_deb_uu_id = get_type_codes_key_and_class( class_name="BuildDuesTypes", key_name="BDT-D", requester=both_apis.local_api )["data"]["uu_id"] - unit_price = 15.90 + info_type_inf_uu_id = get_type_codes_key_and_class( + class_name="BuildDuesTypes", key_name="BDT-I", requester=both_apis.local_api + )["data"]["uu_id"] + run_decision_book_items( writers_token=writers_token, - unit_price=unit_price, - is_fixed=is_fixed_price, - info_type_uu_id=info_type_d_uu_id, + info_type_uu_id=info_type_reno_uu_id, + item_comment="En son toplantıda bahsedilen 2 nolu daireyi etkiliyen çözüm için kanalizasyon ve " + "tamirleri için fiyat alınarak arka alan yağmur suyu direnajının yaplımasının projelendirilmesi.", + start_date=start_date, + end_date=end_date, + is_fixed=False, requester=both_apis.local_api ) - is_fixed_price = True - info_type_a_uu_id = get_type_codes_key_and_class( - class_name="BuildDuesTypes", key_name="BDT-A", requester=both_apis.local_api - )["data"]["uu_id"] - start_date, end_date = "2024-11-01", "2025-02-01" - unit_price = 850 + unit_price = 17.04 run_decision_book_items( writers_token=writers_token, + info_type_uu_id=info_type_deb_uu_id, + item_comment="Aidat gündemi için 1,2,3 nolu daireler için 1400 TL, diğer daireler için 1500 TL " + "olmasına karar verildi.", unit_price=unit_price, - is_fixed=is_fixed_price, - info_type_uu_id=info_type_a_uu_id, + requester=both_apis.local_api + ) + + run_decision_book_items( + writers_token=writers_token, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Hali hazırda yöneticilik görevini ifa eden 4 nolu daire sahibi Mehmet Karatayın bu " + "görevinin devam etmesine ve apartmanın bank hesaplarının kullanımı ile ilgili yetkisinin devam etmesine.", start_date=start_date, end_date=end_date, requester=both_apis.local_api ) - info_type_a_uu_id = get_type_codes_key_and_class( - class_name="BuildDuesTypes", key_name="BDT-R", requester=both_apis.local_api - )["data"]["uu_id"] - unit_price = 5000 run_decision_book_items( writers_token=writers_token, - unit_price=unit_price, - is_fixed=is_fixed_price, - info_type_uu_id=info_type_a_uu_id, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Kiriş içinden geçen borunun çıkarılmadan kesilmesine, gerekli tadilatın yapılıp problemin " + "çözülmesine ayrıca bu aşamada yaplımasına onay verilirse her daire kendi radyatölerinin temizliği ve tadilatın yapılmasına.", start_date=start_date, end_date=end_date, requester=both_apis.local_api ) - info_type_a_uu_id = get_type_codes_key_and_class( - class_name="BuildDuesTypes", key_name="BDT-R", requester=both_apis.local_api - )["data"]["uu_id"] - unit_price = 2000 run_decision_book_items( writers_token=writers_token, - unit_price=unit_price, - is_fixed=is_fixed_price, - info_type_uu_id=info_type_a_uu_id, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Dogalgazdan tadilatında çıkan eski boruların satışının yapılmasına.", start_date=start_date, end_date=end_date, requester=both_apis.local_api ) - info_type_a_uu_id = get_type_codes_key_and_class( - class_name="BuildDuesTypes", key_name="BDT-L", requester=both_apis.local_api - )["data"]["uu_id"] - unit_price = 750 run_decision_book_items( writers_token=writers_token, - unit_price=unit_price, - is_fixed=is_fixed_price, - info_type_uu_id=info_type_a_uu_id, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Apartman içinin tadilat yapılması, ışık ve elektrik sisteminin elden geçirilmesine ve elektrik " + "sayaç il panoların kutuya konulmasına, doğalgaz borularının astar boya ile " + "boyanmasına teklif alınarak projec açılması.", start_date=start_date, end_date=end_date, requester=both_apis.local_api ) + + run_decision_book_items( + writers_token=writers_token, + info_type_uu_id=info_type_reno_uu_id, + item_comment="İç kapı teklif alınarak gerektiğinde tadilatın geliştirilmesi, tek kapı yapılması " + "yada iki kapının alternatifi ile değerlendirilerek fiyat alınması.", + start_date=start_date, + end_date=end_date, + requester=both_apis.local_api + ) + + run_decision_book_items( + writers_token=writers_token, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Bina su deposunun temizletilmesi.", + start_date=start_date, + end_date=end_date, + requester=both_apis.local_api + ) + + run_decision_book_items( + writers_token=writers_token, + info_type_uu_id=info_type_reno_uu_id, + item_comment="Çatının havalandırma camlarının değiştirilmesi ve onarılması.", + start_date=start_date, + end_date=end_date, + requester=both_apis.local_api + ) + + run_decision_book_items( + writers_token=writers_token, + info_type_uu_id=info_type_inf_uu_id, + item_comment="Arka zemin daire sahibinin yoğun yağmurlarda evin su basmaması için " + "arka bölüme saçak yapabilmesine onay verildi.", + requester=both_apis.local_api + )