diff --git a/a_project_files/drafts_and_notes/wassap.txt b/a_project_files/drafts_and_notes/wassap.txt new file mode 100644 index 0000000..b6b508f --- /dev/null +++ b/a_project_files/drafts_and_notes/wassap.txt @@ -0,0 +1,14 @@ +1 ₺4.120,00 +1 - Bina boru satışı -₺1.580,00 +3 - Bina su depo temizliği projesi ₺3.000,00 +4 - Çatı Camlarının değişim projesi ₺1.000,00 +8 - Bina Uydu Bakım Projesi ₺1.700,00 +2 ₺63.600,00 +2 - Bina iç tadilat, elektrik ve boya işleri projesi ₺42.200,00 +5 - Dış kapının değişim projesi ₺24.000,00 +9- Hurda Aliminyum Satışı -₺2.600,00 +4 ₺22.500,00 +6 - Kazan borlularının ana kolondan sökülmesi projesi ₺22.500,00 +3 ₺0,00 +7 - Yol tarafı ile bahçe tarafı logar tadilat projesi ₺0,00 +Genel Toplam ₺90.220,00 diff --git a/api_events/events/__init__.py b/api_events/events/__init__.py index c55507f..3ed8253 100644 --- a/api_events/events/__init__.py +++ b/api_events/events/__init__.py @@ -123,6 +123,16 @@ from api_events.events.decision_book.decision_book_decision_book_items import ( DecisionBookDecisionBookItemsUpdateEventMethod, DecisionBookDecisionBookItemsPatchEventMethod, ) +from api_events.events.decision_book.project_decision_book import ( + ProjectDecisionBookCreateEvents, + ProjectDecisionBookUpdateEvents, + ProjectDecisionBookPatchEvents, +) +from api_events.events.decision_book.project_decision_book_person import ( + ProjectDecisionBookPersonCreateEvents, + ProjectDecisionBookPersonUpdateEvents, + ProjectDecisionBookPersonPatchEvents, +) from api_events.events.events.events_bind_events import ( EventBindOccupantEventMethod, EventBindEmployeeEventMethod, @@ -208,6 +218,12 @@ __all__ = [ "DecisionBookDecisionBookItemsCreateEventMethod", "DecisionBookDecisionBookItemsUpdateEventMethod", "DecisionBookDecisionBookItemsPatchEventMethod", + "ProjectDecisionBookCreateEvents", + "ProjectDecisionBookUpdateEvents", + "ProjectDecisionBookPatchEvents", + "ProjectDecisionBookPersonCreateEvents", + "ProjectDecisionBookPersonUpdateEvents", + "ProjectDecisionBookPersonPatchEvents", "CompanyPatchEventMethod", "CompanyCreateEventMethod", "CompanyUpdateEventMethod", diff --git a/api_events/events/decision_book/project_decision_book.py b/api_events/events/decision_book/project_decision_book.py new file mode 100644 index 0000000..f374dd6 --- /dev/null +++ b/api_events/events/decision_book/project_decision_book.py @@ -0,0 +1,42 @@ +from api_events.events.abstract_class import MethodToEvent, ActionsSchema +from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject +from api_validations.core_response import AlchemyJsonResponse + + +class ProjectDecisionBookCreateEvents(MethodToEvent): + + event_type = "CREATE" + + __event_keys__ = { + "b8e44bb2-f157-4dd5-8a24-0e02db4877c9": "project_decision_book_create", + } + + @classmethod + def project_decision_book_create(cls, request, *args, **kwargs): + pass + + +class ProjectDecisionBookUpdateEvents(MethodToEvent): + + event_type = "UPDATE" + + __event_keys__ = { + "bfe3ef13-030f-495f-b692-94bcb746d700": "project_decision_book_update", + } + + @classmethod + def project_decision_book_update(cls, request, *args, **kwargs): + pass + + +class ProjectDecisionBookPatchEvents(MethodToEvent): + + event_type = "PATCH" + + __event_keys__ = { + "444d67a0-b3a8-4ca2-9d8d-f1acc75011e0": "project_decision_book_patch", + } + + @classmethod + def project_decision_book_patch(cls, request, *args, **kwargs): + pass diff --git a/api_events/events/decision_book/project_decision_book_person.py b/api_events/events/decision_book/project_decision_book_person.py new file mode 100644 index 0000000..24442bb --- /dev/null +++ b/api_events/events/decision_book/project_decision_book_person.py @@ -0,0 +1,42 @@ +from api_events.events.abstract_class import MethodToEvent, ActionsSchema +from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject +from api_validations.core_response import AlchemyJsonResponse + + +class ProjectDecisionBookPersonCreateEvents(MethodToEvent): + + event_type = "CREATE" + + __event_keys__ = { + "9c88e314-84e8-435e-8c1e-6a5aae80b2e6": "project_decision_book_person_create", + } + + @classmethod + def project_decision_book_create(cls, request, *args, **kwargs): + return + + +class ProjectDecisionBookPersonUpdateEvents(MethodToEvent): + + event_type = "UPDATE" + + __event_keys__ = { + "7fbd18a0-c099-4494-ada1-bb23e39bb141": "project_decision_book_update_person", + } + + @classmethod + def project_decision_book_update(cls, request, *args, **kwargs): + return + + +class ProjectDecisionBookPersonPatchEvents(MethodToEvent): + + event_type = "PATCH" + + __event_keys__ = { + "a122e84a-5556-4bf7-b680-1f47c438d4f7": "project_decision_book_person_patch", + } + + @classmethod + def project_decision_book_patch(cls, request, *args, **kwargs): + return diff --git a/api_events/events/decision_book/project_decision_book_project_decision_book.py b/api_events/events/decision_book/project_decision_book_project_decision_book.py deleted file mode 100644 index 0ae00b1..0000000 --- a/api_events/events/decision_book/project_decision_book_project_decision_book.py +++ /dev/null @@ -1,6 +0,0 @@ -from api_events.events.abstract_class import MethodToEvent, ActionsSchema -from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject -from api_validations.core_response import AlchemyJsonResponse - - -class ProjectDecisionBookProjectDecisionBookEvents(MethodToEvent): ... diff --git a/api_events/events/decision_book/project_decision_book_project_decision_book_person.py b/api_events/events/decision_book/project_decision_book_project_decision_book_person.py deleted file mode 100644 index 55b1682..0000000 --- a/api_events/events/decision_book/project_decision_book_project_decision_book_person.py +++ /dev/null @@ -1,6 +0,0 @@ -from api_events.events.abstract_class import MethodToEvent, ActionsSchema -from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject -from api_validations.core_response import AlchemyJsonResponse - - -class ProjectDecisionBookProjectDecisionBookPersonEvents(MethodToEvent): ... diff --git a/api_events/tasks2events/occupant_tasks/project_employee.py b/api_events/tasks2events/occupant_tasks/project_employee.py new file mode 100644 index 0000000..5be9a28 --- /dev/null +++ b/api_events/tasks2events/occupant_tasks/project_employee.py @@ -0,0 +1,12 @@ +from api_events.tasks2events.default_abstract import AddEventFunctionality + + +class ProjectEmployee(AddEventFunctionality): + service_code = "SRO-PRJ-EMP" + related_code = "PRJ-EMP" + events = [ + {"function_code": ""}, + ] + + def __new__(cls, *args, **kwargs): + return super().retrieve_events(cls.events) diff --git a/api_events/tasks2events/occupant_tasks/project_finance.py b/api_events/tasks2events/occupant_tasks/project_finance.py new file mode 100644 index 0000000..08e45d9 --- /dev/null +++ b/api_events/tasks2events/occupant_tasks/project_finance.py @@ -0,0 +1,12 @@ +from api_events.tasks2events.default_abstract import AddEventFunctionality + + +class ProjectFinanceResponsible(AddEventFunctionality): + service_code = "SRO-PRJ-FIN" + related_code = "PRJ-FIN" + events = [ + {"function_code": ""}, + ] + + def __new__(cls, *args, **kwargs): + return super().retrieve_events(cls.events) diff --git a/api_events/tasks2events/occupant_tasks/project_leader.py b/api_events/tasks2events/occupant_tasks/project_leader.py new file mode 100644 index 0000000..1494ddd --- /dev/null +++ b/api_events/tasks2events/occupant_tasks/project_leader.py @@ -0,0 +1,14 @@ +from api_events.tasks2events.default_abstract import AddEventFunctionality + + +class ProjectLeader(AddEventFunctionality): + + service_code = "SRO-PRJ-LDR" + related_code = "PRJ-LDR" + + events = [ + {"function_code": ""}, + ] + + def __new__(cls, *args, **kwargs): + return super().retrieve_events(cls.events) diff --git a/api_events/tasks2events/occupant_tasks/project_responsiable.py b/api_events/tasks2events/occupant_tasks/project_responsiable.py new file mode 100644 index 0000000..db68b9e --- /dev/null +++ b/api_events/tasks2events/occupant_tasks/project_responsiable.py @@ -0,0 +1,12 @@ +from api_events.tasks2events.default_abstract import AddEventFunctionality + + +class ProjectResponsible(AddEventFunctionality): + service_code = "SRO-PRJ-RES" + related_code = "PRJ-RES" + events = [ + {"function_code": ""}, + ] + + def __new__(cls, *args, **kwargs): + return super().retrieve_events(cls.events) diff --git a/api_events/tasks2events/occupant_tasks/project_technical.py b/api_events/tasks2events/occupant_tasks/project_technical.py new file mode 100644 index 0000000..b9b611f --- /dev/null +++ b/api_events/tasks2events/occupant_tasks/project_technical.py @@ -0,0 +1,12 @@ +from api_events.tasks2events.default_abstract import AddEventFunctionality + + +class ProjectTechnical(AddEventFunctionality): + service_code = "SRO-PRJ-TEC" + related_code = "PRJ-TEC" + events = [ + {"function_code": ""}, + ] + + def __new__(cls, *args, **kwargs): + return super().retrieve_events(cls.events) diff --git a/service_app_init/initialize_app/initialize_default_department.py b/service_app_init/initialize_app/initialize_default_department.py index 3a5343f..50e5a60 100644 --- a/service_app_init/initialize_app/initialize_default_department.py +++ b/service_app_init/initialize_app/initialize_default_department.py @@ -137,11 +137,53 @@ def create_occupant_types_defaults(): "occupant_category_type": "BU", "occupant_is_unique": False, }, + { + "occupant_type": "Proje Lideri", + "occupant_description": "Proje Lideri", + "occupant_code": "PRJ-LDR", + "occupant_category": "Proje", + "occupant_category_type": "PRJ", + "occupant_is_unique": False, + }, + { + "occupant_type": "Proje Sorumlusu", + "occupant_description": "Proje Sorumlusu", + "occupant_code": "PRJ-RES", + "occupant_category": "Proje", + "occupant_category_type": "PRJ", + "occupant_is_unique": False, + }, + { + "occupant_type": "Proje Ekibi", + "occupant_description": "Proje Ekibi", + "occupant_code": "PRJ-EMP", + "occupant_category": "Proje", + "occupant_category_type": "PRJ", + "occupant_is_unique": False, + }, + { + "occupant_type": "Proje Finans Sorumlusu", + "occupant_description": "Proje Finans Sorumlusu", + "occupant_code": "PRJ-FIN", + "occupant_category": "Proje", + "occupant_category_type": "PRJ", + "occupant_is_unique": False, + }, + { + "occupant_type": "Proje Teknik Sorumlusu", + "occupant_description": "Proje Teknik Sorumlusu", + "occupant_code": "PRJ-TEC", + "occupant_category": "Proje", + "occupant_category_type": "PRJ", + "occupant_is_unique": False, + }, ] - for list_occupant_type in list_occupant_types: - created_type = OccupantTypes.find_or_create(**list_occupant_type) - created_type.save_and_confirm() + try: + created_type = OccupantTypes.find_or_create(**list_occupant_type) + created_type.save_and_confirm() + except Exception as e: + print(f"Error: {e}") def create_application_defaults(): diff --git a/service_app_init/initialize_app/initiator.py b/service_app_init/initialize_app/initiator.py index 5bc0a33..c5b37c1 100644 --- a/service_app_init/initialize_app/initiator.py +++ b/service_app_init/initialize_app/initiator.py @@ -217,26 +217,6 @@ def init_api_enums_build_types(): "type_code": "DT-Z", "type_name": "Zero Balance", }, - { - "enum_class": "ProjectTeamTypes", - "type_code": "PTT-LDR", - "type_name": "Project Leader", - }, - { - "enum_class": "ProjectTeamTypes", - "type_code": "PTT-RSP", - "type_name": "Project Responsible", - }, - { - "enum_class": "ProjectTeamTypes", - "type_code": "PTT-EMP", - "type_name": "Project Employee", - }, - { - "enum_class": "ProjectTeamTypes", - "type_code": "PTT-FIN", - "type_name": "Project Finance Responsible", - }, ] for insert_enum in insert_enums: created_api_enum = ApiEnumDropdown.find_or_create( 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 d54b125..ca01913 100644 --- a/service_app_test/test_application/migrate_old_data/runner.py +++ b/service_app_test/test_application/migrate_old_data/runner.py @@ -206,7 +206,6 @@ elif assign_people_to_create_item == 3: "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 ) @@ -295,3 +294,6 @@ elif assign_people_to_create_item == 3: "arka bölüme saçak yapabilmesine onay verildi.", requester=both_apis.local_api ) + +elif assign_people_to_create_item == 4: + pass