api_configs/__init__.py

@@ -24,4 +24,4 @@ __all__ = [
     "TestMongo",
     "RelationAccess",
     "EmailConfig",
-]
+]

api_configs/configs.py

@@ -148,7 +148,7 @@ class EmailConfig:
     EMAIL_USERNAME: str = "karatay@mehmetkaratay.com.tr"
     EMAIL_PASSWORD: str = "system"
 
-
 class RelationAccess:
     # 77 Evyos superuser of Superuser  - 78 all company superuser  - 98 Manager of 77 & 78
     SuperAccessList = ["77", "78", "98"]
+

api_events/events/abstract_class.py

@@ -50,9 +50,9 @@ class MethodToEvent(ABC, ActionsSchemaFactory):
 
     @classmethod
     def ban_token_objects(
-        cls,
+            cls,
-        token: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+            token: typing.Union[EmployeeTokenObject, OccupantTokenObject],
-        ban_list: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+            ban_list: typing.Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         from fastapi import status
         from fastapi.exceptions import HTTPException

api_events/events/account/account.py

@@ -1,5 +1,4 @@
 from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
 
-
 class ApiEvents(MethodToEvent): ...

api_events/events/address/address.py

@@ -13,9 +13,9 @@ from api_validations.validations_request import (
     ListOptions,
     InsertAddress,
     InsertPostCode,
-    SearchAddress,
+    SearchAddress
 )
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
 
@@ -55,10 +55,8 @@ class AddressListEventMethods(MethodToEvent):
         records = Addresses.filter_active(
             *Addresses.get_smart_query(list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="List Address records",
-            result=records,
         )
 
     @classmethod
@@ -68,12 +66,11 @@ class AddressListEventMethods(MethodToEvent):
             token_dict=token_dict,
             filter_expr=Addresses.get_smart_query(list_options.query),
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="List Address records",
-            result=records,
         )
 
+
 class AddressCreateEventMethods(MethodToEvent):
 
     event_type = "CREATE"
@@ -227,7 +224,7 @@ class AddressPatchEventMethods(MethodToEvent):
     def patch_address(cls, address_uu_id: str, data: InsertAddress, token_dict):
         address = Addresses.find_one_or_abort(uu_id=address_uu_id)
         post_code = RelationshipEmployee2PostCode.filter_one(
-            RelationshipEmployee2PostCode.member_id == address.post_code_id
+            RelationshipEmployee2PostCode.member_id==address.post_code_id
         )
         if not post_code:
             raise HTTPException(
@@ -348,10 +345,8 @@ class AddressPostCodeListEventMethods(MethodToEvent):
         records = AddressPostcode.filter_active(
             *Addresses.get_smart_query(list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="List Address records",
-            result=records,
         )
 
 

api_events/events/authentication.py

@@ -48,7 +48,7 @@ from api_configs import ApiStatic, Auth
 from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
 from api_library.date_time_actions.date_functions import system_arrow, client_arrow
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class AuthenticationLoginEventMethods(MethodToEvent):
@@ -263,6 +263,7 @@ class AuthenticationRefreshEventMethods(MethodToEvent):
     @classmethod
     def authentication_refresh_user_info(cls, request, token_dict: dict = None):
 
+
         access_token = str(request.headers.get(Auth.ACCESS_TOKEN_TAG))
         if token_user := get_object_via_access_key(request=request):
             if found_user := Users.find_one(uu_id=token_user.get("uu_id")):
@@ -619,9 +620,7 @@ class AuthenticationDownloadAvatarEventMethods(MethodToEvent):
         found_user = Users.check_user_exits(
             access_key=data.access_key, domain=data.domain
         )
-        expired_str = str(
+        expired_str = str(system_arrow.now() - system_arrow.get(str(found_user.expiry_ends)))
-            system_arrow.now() - system_arrow.get(str(found_user.expiry_ends))
-        )
         expired_int = int(
             client_arrow.get(
                 system_arrow.now() - system_arrow.get(str(found_user.expiry_ends))

api_events/events/building/building_build.py

@@ -17,9 +17,10 @@ from api_validations.validations_request import (
     UpdateBuild,
     PatchRecord,
     ListOptions,
+
 )
 
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 
 from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
@@ -50,10 +51,8 @@ class BuildListEventMethods(MethodToEvent):
         records = Build.filter_active(
             *Build.get_smart_query(smart_query=list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Building Records are listed",
-            result=records,
         )
 
 

api_events/events/building/building_build_parts.py

@@ -7,7 +7,7 @@ from databases import (
 )
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 from api_validations.validations_request import (
     InsertBuildParts,
@@ -34,10 +34,8 @@ class BuildingBuildPartsListEventMethods(MethodToEvent):
         records = BuildParts.filter_active(
             *BuildParts.get_smart_query(list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Building Parts Records are listed",
-            result=records,
         )
 
 

api_events/events/building/building_living_spaces.py

@@ -13,7 +13,7 @@ from databases import (
 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
+from api_validations.core_response import return_json_response_from_alchemy
 from api_validations.validations_request import (
     InsertBuildLivingSpace,
     ListOptions,
@@ -48,10 +48,8 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
             ),
             *BuildLivingSpace.get_smart_query(smart_query=list_options.query),
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Building Living Spaces are listed successfully",
-            result=records,
         )
 
     @classmethod
@@ -73,10 +71,8 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
             *BuildLivingSpace.get_smart_query(smart_query=list_options.query),
             expired=False,
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Building Living Spaces are listed successfully",
-            result=records,
         )
 
 
@@ -151,7 +147,7 @@ class BuildingLivingSpacesPartsCreateEventMethods(MethodToEvent):
         ).first()
 
         last_living_space = BuildLivingSpace.filter_one(
-            BuildLivingSpace.id == living_space_id[0] if living_space_id else None
+            BuildLivingSpace.id==living_space_id[0] if living_space_id else None
         )
 
         data_dict["expiry_starts"] = str(system_arrow.now())
@@ -213,9 +209,7 @@ class BuildingLivingSpacesPartsUpdateEventMethods(MethodToEvent):
         )
         living_space_id = BuildLivingSpace.session.execute(living_spaces).first()
         last_living_space = BuildLivingSpace.filter_one(
-            BuildLivingSpace.id == getattr(living_space_id[0], "id", None)
+            BuildLivingSpace.id==getattr(living_space_id[0], "id", None) if living_space_id else None
-            if living_space_id
-            else None
         )
 
         data_dict["expiry_starts"] = str(system_arrow.now())

api_events/events/company/company_company.py

@@ -14,7 +14,7 @@ from api_validations.validations_request import (
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class CompanyListEventMethods(MethodToEvent):
@@ -45,10 +45,8 @@ class CompanyListEventMethods(MethodToEvent):
         records = Companies.filter_active(
             *Companies.get_smart_query(list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Building Living Spaces are listed successfully",
-            result=records,
         )
 
 
@@ -95,7 +93,7 @@ class CompanyUpdateEventMethods(MethodToEvent):
 
     @classmethod
     def company_update(cls, company_uu_id: str, data: UpdateCompany, token_dict):
-        find_one_company = Companies.filter_one(Companies.uu_id == company_uu_id)
+        find_one_company = Companies.filter_one(Companies.uu_id==company_uu_id)
         access_authorized_company = Companies.select_action(
             duty_id=getattr(token_dict, "duty_id", 5),
             filter_expr=[Companies.id == token_dict.get("")],

api_events/events/company/company_department.py

@@ -13,7 +13,7 @@ from databases import Departments
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class DepartmentListEventMethods(MethodToEvent):
@@ -25,19 +25,15 @@ class DepartmentListEventMethods(MethodToEvent):
 
     @classmethod
     def department_list(
-        cls,
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        list_options: ListOptions,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         Departments.filter_attr = list_options
         records = Departments.filter_active(
             *Departments.get_smart_query(smart_query=list_options.query),
-            Departments.company_id == token_dict.selected_company.company_id,
+            Departments.company_id == token_dict.selected_company.company_id
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Departments are listed successfully",
-            result=records,
         )
 
 
@@ -85,7 +81,7 @@ class DepartmentUpdateEventMethods(MethodToEvent):
     def department_update(
         cls, company_uu_id: str, data: DepartmentsPydantic, token_dict
     ):
-        find_one_company = Departments.filter_one(Departments.uu_id == company_uu_id)
+        find_one_company = Departments.filter_one(Departments.uu_id==company_uu_id)
         access_authorized_company = Departments.select_action(
             duty_id=getattr(token_dict, "duty_id", 5),
             filter_expr=[Departments.id == token_dict.get("")],

api_events/events/company/company_duties.py

@@ -17,6 +17,7 @@ from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
 
 
+
 class DutiesListEventMethods(MethodToEvent):
 
     event_type = "SELECT"
@@ -26,14 +27,12 @@ class DutiesListEventMethods(MethodToEvent):
 
     @classmethod
     def duties_list(
-        cls,
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        list_options: ListOptions,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         Duties.filter_attr = list_options
         records = Duties.filter_all(
             *Duties.get_smart_query(smart_query=list_options.query),
-            Duties.company_id == token_dict.selected_company.company_id,
+            Duties.company_id == token_dict.selected_company.company_id
         )
         return {
             "completed": True if records.count else False,
@@ -51,12 +50,10 @@ class DutiesGetByUUIDEventMethods(MethodToEvent):
 
     @classmethod
     def duties_get_by_uuid(
-        cls,
+            cls, data: SelectDuties, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: SelectDuties,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
 
-        duty = Duty.filter_one(Duty.uu_id == data.duty_uu_id).data
+        duty = Duty.filter_one(Duty.uu_id==data.duty_uu_id).data
         if not duty:
             return JSONResponse(
                 content={
@@ -96,12 +93,10 @@ class DutiesCreateEventMethods(MethodToEvent):
 
     @classmethod
     def duties_create(
-        cls,
+            cls, data: InsertDuties, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: InsertDuties,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
-        duty = Duty.filter_one(Duty.uu_id == data.duties_uu_id).data
+        duty = Duty.filter_one(Duty.uu_id==data.duties_uu_id).data
-        department = Departments.filter_one(Duty.uu_id == data.department_uu_id).data
+        department = Departments.filter_one(Duty.uu_id==data.department_uu_id).data
 
         created_duties = Duties.find_or_create(
             company_id=token_dict.selected_company.company_id,

api_events/events/company/company_duty.py

@@ -4,16 +4,14 @@ from fastapi import status
 from fastapi.responses import JSONResponse
 
 from api_validations.validations_request import (
-    InsertCompanyDuty,
+    InsertCompanyDuty, PatchRecord, ListOptions
-    PatchRecord,
-    ListOptions,
 )
 
 from databases import Duty
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class DutyListEventMethods(MethodToEvent):
@@ -25,17 +23,13 @@ class DutyListEventMethods(MethodToEvent):
 
     @classmethod
     def duty_list(
-        cls,
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        list_options: ListOptions,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         records = Duty.filter_active(
             *Duty.get_smart_query(list_options.query),
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Duty list is brought successfully",
-            result=records,
         )
 
 
@@ -48,9 +42,7 @@ class DutyCreateEventMethods(MethodToEvent):
 
     @classmethod
     def duty_create(
-        cls,
+            cls, data: InsertCompanyDuty, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: InsertCompanyDuty,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         created_duty = Duty.find_or_create(**data.excluded_dump())
         Duty.save()
@@ -72,12 +64,7 @@ class DutyUpdateEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def duty_update(
+    def duty_update(cls, company_uu_id: str, data, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]):
-        cls,
-        company_uu_id: str,
-        data,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
-    ):
         find_one_company = Duty.find_one_or_abort(uu_id=company_uu_id)
         access_authorized_company = Duty.select_action(
             duty_id=getattr(token_dict, "duty_id", 5),  # ?
@@ -117,15 +104,9 @@ class DutyPatchEventMethods(MethodToEvent):
         )
         if access_authorized_company.count:
             action = data.excluded_dump()
-            find_one_company.active = bool(
+            find_one_company.active = bool(action.get("active", find_one_company.active))
-                action.get("active", find_one_company.active)
+            find_one_company.is_confirmed = bool(action.get("confirm", find_one_company.is_confirmed))
-            )
+            find_one_company.deleted = bool(action.get("delete", find_one_company.deleted))
-            find_one_company.is_confirmed = bool(
-                action.get("confirm", find_one_company.is_confirmed)
-            )
-            find_one_company.deleted = bool(
-                action.get("delete", find_one_company.deleted)
-            )
             find_one_company.save()
             return JSONResponse(
                 content={

api_events/events/company/company_employee.py

@@ -15,7 +15,7 @@ from databases import Employees, Staff, People, EmployeeHistory
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class EmployeeListEventMethods(MethodToEvent):
@@ -27,19 +27,15 @@ class EmployeeListEventMethods(MethodToEvent):
 
     @classmethod
     def employee_list(
-        cls,
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        list_options: ListOptions,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         Employees.filter_attr = list_options
         records = Employees.filter_active(
             *Employees.get_smart_query(smart_query=list_options.query),
             Employees.company_id == token_dict.selected_company.company_id,
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Employee are listed successfully",
-            result=records,
         )
 
 
@@ -52,9 +48,7 @@ class EmployeeCreateEventMethods(MethodToEvent):
 
     @classmethod
     def employee_create(
-        cls,
+            cls, data: InsertEmployees, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: InsertEmployees,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         person = People.find_one(uu_id=data.people_uu_id)
         staff = Staff.find_one(uu_id=data.staff_uu_id)
@@ -130,10 +124,7 @@ class EmployeePatchEventMethods(MethodToEvent):
 
     @classmethod
     def employee_patch(
-        cls,
+            cls, employee_uu_id: str, data: PatchRecord, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        employee_uu_id: str,
-        data: PatchRecord,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         find_one_employee = Employees.find_one_or_abort(uu_id=employee_uu_id)
         access_authorized_employee = Employees.select_action(

api_events/events/company/company_staff.py

@@ -13,7 +13,7 @@ from databases import Staff, Duties
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class StaffListEventMethods(MethodToEvent):
@@ -28,10 +28,8 @@ class StaffListEventMethods(MethodToEvent):
         records = Staff.filter_active(
             *Staff.get_smart_query(smart_query=list_options.query),
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Staff are listed successfully",
-            result=records,
         )
 
 

api_events/events/decision_book/decision_book_decision_book.py

@@ -17,7 +17,7 @@ from api_validations.validations_request import (
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 from api_library.date_time_actions.date_functions import DateTimeLocal
 
 
@@ -55,10 +55,8 @@ class DecisionBookListEventMethods(MethodToEvent):
                 BuildDecisionBook.build_id == token_dict.selected_occupant.build_id,
                 *BuildDecisionBook.get_smart_query(list_options.query),
             )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="DecisionBook are listed successfully",
-            result=records,
         )
 
 

api_events/events/decision_book/decision_book_decision_book_items.py

@@ -20,7 +20,7 @@ from databases import (
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 from api_library.date_time_actions.date_functions import system_arrow, client_arrow
 
 from api_validations.validations_request import (
@@ -75,25 +75,20 @@ class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
                     status_code=status.HTTP_404_NOT_FOUND,
                     detail=f"No company is match with given Employee UUID {token_dict.selected_company.employee_uu_id}",
                 )
-            BuildDecisionBookItems.filter_attr = BuildDecisionBookItems.FilterModel(**data.dump())
+
             records = BuildDecisionBookItems.filter_active(
                 BuildDecisionBookItems.build_decision_book_id == decision_book.id
             )
-            return AlchemyJsonResponse(
+            return JSONResponse(
-                completed=True,
+                status_code=status.HTTP_200_OK,
-                message="DecisionBook are listed successfully",
+                content=dict(
-                result=records,
+                    total_count=records.count,
+                    count=len(records.data),
+                    message=f"Decision Book Items has found from given Decision Book UUID {data.build_decision_book_uu_id}",
+                    completed=True,
+                    data=[record.get_dict() for record in records.data],
+                ),
             )
-            # return JSONResponse(
-            #     status_code=status.HTTP_200_OK,
-            #     content=dict(
-            #         total_count=records.count,
-            #         count=len(records.data),
-            #         message=f"Decision Book Items has found from given Decision Book UUID {data.build_decision_book_uu_id}",
-            #         completed=True,
-            #         data=[record.get_dict() for record in records.data],
-            #     ),
-            # )
         else:
             # BuildDecisionBookItems.pre_query = BuildDecisionBookItems.select_action(
             #     occupant_id=token_dict.occupant_list["occupant_id"]
@@ -114,15 +109,15 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
 
     @classmethod
     def iterate_over_build_parts(
-        cls,
+            cls,
-        build_parts_list,
+            build_parts_list,
-        payment_types,
+            payment_types,
-        local_date,
+            local_date,
-        end_date,
+            end_date,
-        unit_price,
+            unit_price,
-        unit_type,
+            unit_type,
-        book_payment_dict,
+            book_payment_dict,
-        unit_price_is_fixed,
+            unit_price_is_fixed
     ):
         start_date, payment_return_dict = local_date, {}
         for build_part_single in build_parts_list:
@@ -134,9 +129,7 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                     unit_amount = str(build_part_single.due_part_key).replace(" ", "")
                     unit_amount = unit_amount.replace(str(unit_type).upper(), "")
                     payment_amount = abs(unit_price * float(unit_amount)) * -1
-                    payment_amount = -1 * (
+                    payment_amount = -1 * (abs(payment_amount) + (50 - float(abs(payment_amount)) % 50))
-                        abs(payment_amount) + (50 - float(abs(payment_amount)) % 50)
-                    )
                 BuildDecisionBookPayments.create(
                     build_parts_id=build_part_single.id,
                     build_parts_uu_id=str(build_part_single.uu_id),
@@ -147,7 +140,7 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                     process_date_m=int(local_date.month),
                     process_date_y=int(local_date.year),
                     period_time=f"{local_date.year}-{str(local_date.month).zfill(2)}",
-                    **book_payment_dict,
+                    **book_payment_dict
                 )
                 local_date = local_date.shift(days=2)
                 part_key = str(build_part_single.due_part_key).upper()
@@ -158,17 +151,17 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
 
     @classmethod
     def create_payment_records_for_each_build_part(
-        cls,
+            cls,
-        data_info_type,
+            data_info_type,
-        build_id,
+            build_id,
-        unit_price,
+            unit_price,
-        unit_type,
+            unit_type,
-        decision_book,
+            decision_book,
-        decision_book_item,
+            decision_book_item,
-        unit_price_is_fixed,
+            unit_price_is_fixed,
-        currency,
+            currency,
-        debit_start_date: str = None,
+            debit_start_date: str = None,
-        debit_end_date: str = None,
+            debit_end_date: str = None,
     ):
         build_parts_list = BuildParts.filter_active(
             BuildParts.human_livable == True,
@@ -183,12 +176,8 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
         )
         payment_types = ApiEnumDropdown.get_debit_search(search_debit="DT-D")
         if data_info_type.key == "BDT-D":
-            local_date = system_arrow.get(
+            local_date = system_arrow.get(system_arrow.get(decision_book.expiry_starts).date())
-                system_arrow.get(decision_book.expiry_starts).date()
+            end_date = system_arrow.get(system_arrow.get(decision_book.expiry_ends).date())
-            )
-            end_date = system_arrow.get(
-                system_arrow.get(decision_book.expiry_ends).date()
-            )
             cls.iterate_over_build_parts(
                 build_parts_list=build_parts_list.data,
                 payment_types=payment_types,
@@ -223,9 +212,8 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
             meeting_date = system_arrow.get(decision_book.meeting_date).date()
 
             already_book_projects = BuildDecisionBookProjects.filter_all(
-                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}",
             )
             management_room = BuildParts.find_one(
                 build_id=build_id, part_no=0, active=True, is_confirmed=True
@@ -234,8 +222,7 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                 occupant_code="MT-VPR", occupant_category_type="MT"
             )
             manager_living_space = BuildLivingSpace.filter_by_active(
-                build_parts_id=management_room.id,
+                build_parts_id=management_room.id, occupant_type=occupant_man.id,
-                occupant_type=occupant_man.id,
             )
             if not manager_living_space.data:
                 raise HTTPException(
@@ -258,12 +245,10 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                 project_response_living_space_id=manager_living_space.id,
                 project_response_living_space_uu_id=str(manager_living_space.uu_id),
             )
-            book_project_created = BuildDecisionBookProjects.find_or_create(
+            book_project_created = BuildDecisionBookProjects.find_or_create(**book_project_dict)
-                **book_project_dict
-            )
             decision_book_item.update(
                 item_comment=f"{book_project_created.project_no}_{book_project_created.project_name} "
-                f"is assigned to {occupant_man.occupant_description}"
+                             f"is assigned to {occupant_man.occupant_description}"
             )
             project_lead = ApiEnumDropdown.find_one(
                 key="PTT-LDR", enum_class="ProjectTeamTypes"
@@ -347,18 +332,13 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                     raise HTTPException(
                         status_code=status.HTTP_400_BAD_REQUEST,
                         detail="Debit Start Date and Debit End Date is required for this payment type. "
-                        "Check debit start date and debit end date and try again",
+                               "Check debit start date and debit end date and try again",
                     )
 
             data_dict["info_type_id"] = data_info_type.id
             data_dict["info_type_uu_id"] = str(data_info_type.uu_id)
-            unit_price, unit_type = float(data_dict["unit_price"]), str(
+            unit_price, unit_type = float(data_dict["unit_price"]), str(data_dict["unit_type"])
-                data_dict["unit_type"]
+            debit_start_date, debit_end_date = data_dict["debit_start_date"], data_dict["debit_end_date"]
-            )
-            debit_start_date, debit_end_date = (
-                data_dict["debit_start_date"],
-                data_dict["debit_end_date"],
-            )
             currency = data_dict["currency"]
             del (
                 data_dict["token"],
@@ -367,12 +347,10 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                 data_dict["unit_price_is_fixed"],
                 data_dict["debit_start_date"],
                 data_dict["debit_end_date"],
-                data_dict["currency"],
+                data_dict["currency"]
             )
 
-            if new_decision_book_item := BuildDecisionBookItems.find_or_create(
+            if new_decision_book_item := BuildDecisionBookItems.find_or_create(**data_dict):
-                **data_dict
-            ):
                 if new_decision_book_item.is_found:
                     return JSONResponse(
                         status_code=status.HTTP_200_OK,
@@ -383,32 +361,32 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
                         ),
                     )
                 if created_payment_records_dict := cls.create_payment_records_for_each_build_part(
-                    data_info_type=data_info_type,
+                        data_info_type=data_info_type,
-                    build_id=decision_book.build_id,
+                        build_id=decision_book.build_id,
-                    unit_price=unit_price,
+                        unit_price=unit_price,
-                    unit_type=unit_type.upper(),
+                        unit_type=unit_type.upper(),
-                    decision_book=decision_book,
+                        decision_book=decision_book,
-                    decision_book_item=new_decision_book_item,
+                        decision_book_item=new_decision_book_item,
-                    unit_price_is_fixed=data.unit_price_is_fixed,
+                        unit_price_is_fixed=data.unit_price_is_fixed,
-                    debit_start_date=debit_start_date,
+                        debit_start_date=debit_start_date,
-                    debit_end_date=debit_end_date,
+                        debit_end_date=debit_end_date,
-                    currency=currency,
+                        currency=currency
                 ):
                     if data_info_type.key == "BDT-A" or data_info_type.key == "BDT-D":
                         if data_info_type.key == "BDT-D":
                             item_comment = "Regular Payment Plan : "
                         else:
                             item_comment = "Additional Payment Plan : "
-                        for key, value in dict(
+                        for key, value in dict(sorted(
-                            sorted(
                                 created_payment_records_dict.items(),
                                 key=lambda x: x[1],
-                                reverse=True,
+                                reverse=True
-                            )
+                        )).items():
-                        ).items():
                             item_comment += f" {key} | {abs(float(value))} {currency}, "
                         item_comment = item_comment[:-2]
-                        new_decision_book_item.update(item_comment=item_comment)
+                        new_decision_book_item.update(
+                            item_comment=item_comment
+                        )
                 new_decision_book_item.update(is_payment_created=True)
                 return JSONResponse(
                     status_code=status.HTTP_200_OK,

api_events/events/decision_book/decision_book_decision_book_person.py

@@ -25,7 +25,7 @@ from api_validations.validations_request import (
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class DecisionBookPersonListEventMethods(MethodToEvent):

api_events/events/decision_book/decision_book_invitations.py

@@ -22,7 +22,7 @@ from api_validations.validations_request import (
 )
 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
+from api_validations.core_response import return_json_response_from_alchemy
 from api_library.date_time_actions.date_functions import system_arrow
 
 

api_events/events/decision_book/project_decision_book_project_decision_book.py

@@ -1,6 +1,6 @@
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ProjectDecisionBookProjectDecisionBookEvents(MethodToEvent): ...

api_events/events/decision_book/project_decision_book_project_decision_book_person.py

@@ -1,6 +1,6 @@
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ProjectDecisionBookProjectDecisionBookPersonEvents(MethodToEvent): ...

api_events/events/events/events_bind_events.py

@@ -15,7 +15,7 @@ from databases import (
 from api_validations.validations_request import RegisterEvents2Occupant
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class EventBindOccupantEventMethods(MethodToEvent):
@@ -26,9 +26,7 @@ class EventBindOccupantEventMethods(MethodToEvent):
 
     @classmethod
     def bind_events_occupant_super_user(
-        cls,
+        cls, data: RegisterEvents2Occupant, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: RegisterEvents2Occupant,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
 
         if not str(token_dict.user_type) == "1":
@@ -140,9 +138,7 @@ class EventBindEmployeeEventMethods(MethodToEvent):
 
     @classmethod
     def bind_events_employee(
-        cls,
+            cls, data: RegisterEvents2Occupant, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: RegisterEvents2Occupant,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         return token_dict.available_event(data=data, token_dict=token_dict)
 

api_events/events/events/events_bind_modules.py

@@ -4,17 +4,12 @@ from databases import (
     Modules,
     BuildLivingSpace,
 )
-from api_validations.validations_request import (
+from api_validations.validations_request import RegisterModules2Occupant, RegisterModules2Employee
-    RegisterModules2Occupant,
-    RegisterModules2Employee,
-)
 from api_events.events.abstract_class import MethodToEvent, ActionsSchema
 from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
-from api_events.events.events.events_bind_services import (
+from api_events.events.events.events_bind_services import ServiceBindOccupantEventMethods
-    ServiceBindOccupantEventMethods,
-)
 from api_library.date_time_actions.date_functions import system_arrow
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ModulesBindOccupantEventMethods(MethodToEvent):
@@ -29,15 +24,11 @@ class ModulesBindOccupantEventMethods(MethodToEvent):
         cls, build_living_space_id: int, modules_id: int, expires_at: str = None
     ):
 
-        living_space = BuildLivingSpace.filter_one(
+        living_space = BuildLivingSpace.filter_one(Modules.id==build_living_space_id).data
-            Modules.id == build_living_space_id
+        modules = Modules.filter_one(Modules.id==modules_id).data
-        ).data
-        modules = Modules.filter_one(Modules.id == modules_id).data
 
         service_build_dict = dict(build_living_space_id=living_space.id)
-        service_build_dict["expires_at"] = str(
+        service_build_dict["expires_at"] = str(system_arrow.get(living_space.expiry_ends))
-            system_arrow.get(living_space.expiry_ends)
-        )
         if not expires_at:
             service_build_dict["expires_at"] = str(system_arrow.get(expires_at))
 
@@ -80,4 +71,4 @@ ModulesBindOccupantEventMethod = ModulesBindOccupantEventMethods(
 )
 ModulesBindEmployeeEventMethod = ModulesBindEmployeeEventMethods(
     action=ActionsSchema(endpoint="/bind/modules/employee")
-)
+)

api_events/events/events/events_bind_services.py

@@ -15,13 +15,10 @@ from databases import (
     Event2Employee,
     Event2Occupant,
 )
-from api_validations.validations_request import (
+from api_validations.validations_request import RegisterServices2Occupant, RegisterServices2Employee
-    RegisterServices2Occupant,
-    RegisterServices2Employee,
-)
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ServiceBindOccupantEventMethods(MethodToEvent):
@@ -36,13 +33,9 @@ class ServiceBindOccupantEventMethods(MethodToEvent):
     ):
         from sqlalchemy.dialects.postgresql import insert
 
-        living_space = BuildLivingSpace.filter_one(
+        living_space = BuildLivingSpace.filter_one(BuildLivingSpace.id==build_living_space_id)
-            BuildLivingSpace.id == build_living_space_id
+        service = Services.filter_one(Services.id==service_id)
-        )
+        add_events_list = Service2Events.filter_all(Service2Events.service_id == service.id).data
-        service = Services.filter_one(Services.id == service_id)
-        add_events_list = Service2Events.filter_all(
-            Service2Events.service_id == service.id
-        ).data
         if not add_events_list:
             raise Exception(
                 "Service has no events registered. Please contact with your manager"

api_events/events/events/events_events.py

@@ -20,7 +20,7 @@ from api_validations.validations_request import (
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class EventsListEventMethods(MethodToEvent):
@@ -31,19 +31,12 @@ class EventsListEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def events_list(
+    def events_list(cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]):
-        cls,
-        list_options: ListOptions,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
-    ):
-        Events.filter_attr = list_options
         records = Events.filter_active(
             *Events.get_smart_query(list_options.query),
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="DecisionBook are listed successfully",
-            result=records,
         )
 
 

api_events/events/events/events_models.py

@@ -1,12 +1,8 @@
-from api_validations.validations_request import (
+from api_validations.validations_request import DepartmentsPydantic, PatchRecord, ListOptions
-    DepartmentsPydantic,
-    PatchRecord,
-    ListOptions,
-)
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ModelEvents(MethodToEvent):

api_events/events/events/events_modules.py

@@ -2,7 +2,7 @@ from api_validations.validations_request import DepartmentsPydantic, PatchRecord
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ModulesEvents(MethodToEvent):

api_events/events/events/events_services.py

@@ -1,12 +1,8 @@
-from api_validations.validations_request import (
+from api_validations.validations_request import DepartmentsPydantic, PatchRecord, ListOptions
-    DepartmentsPydantic,
-    PatchRecord,
-    ListOptions,
-)
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class ServicesEvents(MethodToEvent):

api_events/events/identity/people.py

@@ -13,7 +13,7 @@ from api_validations.validations_request import InsertPerson, UpdateUsers
 
 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
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 class PeopleListEventMethods(MethodToEvent):
@@ -31,31 +31,23 @@ class PeopleListEventMethods(MethodToEvent):
         records = People.filter_active(
             *People.get_smart_query(smart_query=list_options.query)
         )
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="People are listed successfully",
-            result=records,
         )
 
     @classmethod
     def sales_users_people_list(cls, data, token_dict):
 
         records = People.filter_active(*People.get_smart_query(smart_query=data.query))
-        return AlchemyJsonResponse(
+        # records = [model_class(**record) for record in records.data]
-            completed=True,
+        return return_json_response_from_alchemy(response=records, pagination=data)
-            message="People are listed successfully",
-            result=records,
-        )
 
     @classmethod
     def human_resources_users_people_list(cls, data, token_dict):
 
         records = People.filter_active(*People.get_smart_query(smart_query=data.query))
-        return AlchemyJsonResponse(
+        # records = [model_class(**record) for record in records.data]
-            completed=True,
+        return return_json_response_from_alchemy(response=records, pagination=data)
-            message="People are listed successfully",
-            result=records,
-        )
 
 
 class PeopleCreateEventMethods(MethodToEvent):
@@ -67,9 +59,7 @@ class PeopleCreateEventMethods(MethodToEvent):
 
     @classmethod
     def people_create(
-        cls,
+            cls, data: InsertPerson, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: InsertPerson,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         created_user = People.create_action(data=data, token=token_dict)
         People.save()
@@ -92,14 +82,11 @@ class PeopleUpdateEventMethods(MethodToEvent):
 
     @classmethod
     def people_update(
-        cls,
+            cls, data: UpdateUsers, user_uu_id: str, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
-        data: UpdateUsers,
-        user_uu_id: str,
-        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         find_one_user = Users.find_one_or_abort(uu_id=user_uu_id)
         access_authorized_company = Companies.select_action(
-            duty_id_list=[getattr(token_dict, "duty_id")],
+            duty_id=getattr(token_dict, "duty_id", 5),
             filter_expr=[Companies.id == find_one_user.id],
         )
         if access_authorized_company.count:

api_events/events/identity/users.py

@@ -9,15 +9,13 @@ from databases.no_sql_models.validations import DomainViaUser
 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
+from api_validations.core_response import return_json_response_from_alchemy
-
 
 from api_validations.validations_request import (
     InsertUsers,
     UpdateUsers,
     PatchRecord,
-    ListOptions,
+    ListOptions, RegisterServices2Occupant,
-    RegisterServices2Occupant,
 )
 
 
@@ -44,19 +42,13 @@ class UserListEventMethods(MethodToEvent):
                 user.person_id
                 for user in Users.filter_active(Users.uu_id.in_(people_ids)).data
             ]
-            People.filter_attr = list_options
             records = People.filter_active(People.id.in_(people_id_list))
-            return AlchemyJsonResponse(
+            return return_json_response_from_alchemy(
-                completed=True,
+                response=records, pagination=list_options
-                message="Users are listed successfully",
-                result=records,
             )
-        People.filter_attr = list_options
         records = Users.filter_active(*Users.get_smart_query(list_options.query))
-        return AlchemyJsonResponse(
+        return return_json_response_from_alchemy(
-            completed=True,
+            response=records, pagination=list_options
-            message="Users are listed successfully",
-            result=records,
         )
 
 
@@ -69,9 +61,7 @@ class UserCreateEventMethods(MethodToEvent):
 
     @classmethod
     def user_create(
-        cls,
+            cls, data: InsertUsers, token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject]
-        data: InsertUsers,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         created_user = Users.create_action(create_user=data)
         created_user.related_company = token_dict.selected_company.company_uu_id
@@ -109,10 +99,7 @@ class UserUpdateEventMethods(MethodToEvent):
 
     @classmethod
     def user_update(
-        cls,
+            cls, data: UpdateUsers, user_uu_id: str, token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject]
-        data: UpdateUsers,
-        user_uu_id: str,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         find_one_user = Users.find_one_or_abort(uu_id=user_uu_id)
         access_authorized_company = Companies.select_action(

api_events/tasks2events/__init__.py

@@ -1,20 +1,16 @@
-from api_events.tasks2events.common_tasks.default_user import AuthDefaultEventBlock
+from tasks2events.common_tasks.default_user import AuthDefaultEventBlock
-from api_events.tasks2events.employee_tasks.super_user import SuperUserEventBlock
+from tasks2events.employee_tasks.super_user import SuperUserEventBlock
 
-from api_events.tasks2events.occupant_tasks.build_manager import BuildManager
+from tasks2events.occupant_tasks.build_manager import BuildManager
-from api_events.tasks2events.occupant_tasks.build_owner import BuildOwner
+from tasks2events.occupant_tasks.build_owner import BuildOwner
-from api_events.tasks2events.occupant_tasks.build_resident import BuildResident
+from tasks2events.occupant_tasks.build_resident import BuildResident
-from api_events.tasks2events.occupant_tasks.build_tenant import BuildTenant
+from tasks2events.occupant_tasks.build_tenant import BuildTenant
-from api_events.tasks2events.occupant_tasks.build_represent import BuildRepresent
+from tasks2events.occupant_tasks.build_represent import BuildRepresent
-from api_events.tasks2events.occupant_tasks.meeting_writer import BuildMeetingWriter
+from tasks2events.occupant_tasks.meeting_writer import BuildMeetingWriter
-from api_events.tasks2events.occupant_tasks.meeting_advisor import BuildMeetingAdvisor
+from tasks2events.occupant_tasks.meeting_advisor import BuildMeetingAdvisor
-from api_events.tasks2events.occupant_tasks.meeting_attendance import (
+from tasks2events.occupant_tasks.meeting_attendance import BuildMeetingAttendance
-    BuildMeetingAttendance,
+from tasks2events.occupant_tasks.meeting_president import BuildMeetingPresident
-)
+from tasks2events.occupant_tasks.meeting_voted_president import (
-from api_events.tasks2events.occupant_tasks.meeting_president import (
-    BuildMeetingPresident,
-)
-from api_events.tasks2events.occupant_tasks.meeting_voted_president import (
     BuildMeetingVotedPresident,
 )
 

api_library/__init__.py

@@ -1,4 +1,7 @@
 from date_time_actions.date_functions import client_arrow, system_arrow
 
 
-__all__ = ["client_arrow", "system_arrow"]
+__all__ = [
+    "client_arrow",
+    "system_arrow"
+]

api_library/date_time_actions/date_functions.py

@@ -9,7 +9,7 @@ class DateTimeLocal:
     def __init__(self, timezone: str = "GMT+3", is_client: bool = True):
         self.timezone = self.__SYSTEM__
         if is_client:
-            self.timezone = timezone.replace("-", "+")
+            self.timezone = timezone.replace('-', '+')
 
     def find_last_day_of_month(self, date_value):
         today = self.get(date_value).date()

api_services/__init__.py

@@ -22,4 +22,4 @@ __all__ = [
     "update_selected_to_redis",
     "password_is_changed_template",
     "change_your_password_template",
-]
+]

api_services/redis/auth_actions/auth.py

@@ -22,10 +22,7 @@ from api_objects import (
 )
 
 from api_services.redis.conn import redis_cli
-from api_services.redis.functions import (
+from api_services.redis.functions import get_object_via_user_uu_id, get_object_via_access_key
-    get_object_via_user_uu_id,
-    get_object_via_access_key,
-)
 
 
 def save_object_to_redis(

api_validations/core_response.py

@@ -1,96 +1,58 @@
-from typing import Any, Union
 from fastapi import status
 from fastapi.responses import JSONResponse
 
-from databases.sql_models.response_model import AlchemyResponse
-
-
-class AlchemyJsonResponse:
-    status_code: status
-    message: str
-    result: AlchemyResponse
-    completed: bool
-    filter_attributes: Any = None
-    response_model: Any = None
-    def __new__(
-            cls,
-            message: str,
-            status_code: str = 'HTTP_200_OK',
-            result: Union[Any, list] = None,
-            completed: bool = True
-    ):
-        cls.status_code = getattr(status, status_code, 'HTTP_200_OK')
-        cls.message = message
-        cls.result = result
-        cls.completed = completed
-
-        first_item = cls.result.get(1)
-        if not first_item:
-            return JSONResponse(
-                status_code=cls.status_code,
-                content=dict(
-                    total_count=0,
-                    count=0,
-                    pagination=None,
-                    completed=cls.completed,
-                    message=cls.message,
-                    data=[],
-                ),
-            )
-        if cls.result.first:
-            return JSONResponse(
-                status_code=cls.status_code,
-                content=dict(
-                    total_count=1,
-                    count=1,
-                    pagination=None,
-                    completed=cls.completed,
-                    message=cls.message,
-                    data=cls.result.data.get_dict(),
-                ),
-            )
-
-        if not first_item.filter_attr:
-            counts = cls.result.count
-            return JSONResponse(
-                status_code=cls.status_code,
-                content=dict(
-                    total_count=counts,
-                    count=counts,
-                    pagination=None,
-                    completed=cls.completed,
-                    message=cls.message,
-                    data=[result_data.get_dict() for result_data in cls.result.data],
-                ),
-            )
-
-        filter_model = first_item.filter_attr
-        total_count = cls.result.query.limit(None).offset(None).count()
-        total_page_number = round(total_count / int(first_item.filter_attr.size), 0) + 1
 
+def return_json_response_from_alchemy(
+    response, cls_obj=None, pagination=None, response_model=None
+):
+    enums = cls_obj.__enums__ if cls_obj else []
+    if response.count:
+        total_count = response.query.limit(None).offset(None).count()
+        total_page_number = round(total_count / int(pagination.size), 0) + 1
         pagination_dict = {
-            "size/total_count": [cls.result.count, total_count],
+            "size/total_count": [response.count, total_count],
-            "page/total_page": [filter_model.page, total_page_number],
+            "page/total_page": [pagination.page, total_page_number],
-            "order_field": filter_model.order_field,
+            "order_field": pagination.order_field,
-            "order_type": filter_model.order_type,
+            "order_type": pagination.order_type,
         }
         include_joins = dict(
-            include_joins=filter_model.include_joins if filter_model.include_joins else []
+            include_joins=pagination.include_joins if pagination.include_joins else None
         )
-        data = []
+
-        for data_object in cls.result.data:
+        if not isinstance(response.data[0], dict):
-            data_dict = data_object.get_dict(include_joins=include_joins)
+            data = []
-            if cls.response_model:
+            for obj in response.data:
-                data_dict = cls.response_model(**data_object.get_dict(include_joins=include_joins)).dump()
+                data_object = obj.get_dict(**include_joins)
-            data.append(data_dict)
+                if response_model:
+                    data_object = response_model(
+                        **obj.get_dict(**include_joins)
+                    ).model_dump()
+                data.append(data_object)
+        else:
+            data = []
+            for obj in response.data:
+                data_object = obj
+                if response_model:
+                    data_object = response_model(**obj).model_dump()
+                data.append(data_object)
+
         return JSONResponse(
-            status_code=cls.status_code,
+            status_code=status.HTTP_200_OK,
             content=dict(
-                total_count=total_count,
-                count=cls.result.count,
                 pagination=pagination_dict,
-                message=cls.message,
+                message="Found records are listed",
-                completed=cls.completed,
+                completed=True,
                 data=data,
             ),
         )
+
+    return JSONResponse(
+        status_code=status.HTTP_404_NOT_FOUND,
+        content=dict(
+            total_count=0,
+            count=0,
+            message="No record has found",
+            completed=False,
+            data=[],
+        ),
+    )

api_validations/core_validations.py

@@ -20,3 +20,4 @@ class BaseModelRegular(BaseModel):
 
     def dump(self):
         return self.model_dump()
+

api_validations/validations_request/__init__.py

@@ -1,3 +1,4 @@
+
 from .core_request_validations import (
     ListOptions,
     PydanticBaseModel,
@@ -5,7 +6,11 @@ from .core_request_validations import (
     EndpointPydantic,
     BaseModelRegular,
 )
-from .address import InsertAddress, InsertPostCode, SearchAddress
+from .address import (
+    InsertAddress,
+    InsertPostCode,
+    SearchAddress
+)
 from .application import (
     SingleEnumUUID,
     SingleEnumClassKey,
@@ -217,4 +222,4 @@ __all__ = [
     "DeleteUsers",
     "RegisterModules2Occupant",
     "RegisterModules2Employee",
-]
+]

api_validations/validations_request/area.py

@@ -5,7 +5,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class InsertBuildArea(BaseModelRegular):
     build_uu_id: str
     area_name: str

api_validations/validations_request/authentication.py

@@ -6,7 +6,6 @@ from api_validations.validations_request import (
 from typing import Optional
 from pydantic import BaseModel
 
-
 class ChangePassword(BaseModelRegular):
     domain_name: str
     access_key: str

api_validations/validations_request/build_part.py

@@ -5,7 +5,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class UpdateBuildTypes(PydanticBaseModel): ...
 
 

api_validations/validations_request/building.py

@@ -5,7 +5,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class InsertBuild(PydanticBaseModel):
     gov_address_code: str
     build_name: str

api_validations/validations_request/company.py

@@ -5,7 +5,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class InsertCompany(PydanticBaseModel):
     formal_name: str
     company_type: str

api_validations/validations_request/create_model.py

@@ -38,7 +38,6 @@ class ConvertField:
         default_value = getattr(self.default_val, "field_default_value", None)
         return matches_with, default_value
 
-
 #
 # def create_model_from_database(model_id: typing.Union[int, str]):
 #     if isinstance(model_id, int):

api_validations/validations_request/decision_book.py

@@ -6,18 +6,18 @@ from api_validations.validations_request import (
 )
 
 
-class DecisionBookDecisionBookInvitations(BaseModelRegular):
+class DecisionBookDecisionBookInvitations(PydanticBaseModel):
     build_decision_book_uu_id: str
     message: str
     planned_date: str
 
 
-class DecisionBookDecisionBookInvitationsAttend(BaseModelRegular):
+class DecisionBookDecisionBookInvitationsAttend(PydanticBaseModel):
     token: str
     is_attend: bool
 
 
-class DecisionBookDecisionBookInvitationsAssign(BaseModelRegular):
+class DecisionBookDecisionBookInvitationsAssign(PydanticBaseModel):
     token: str
     build_living_space_uu_id: str
     occupant_type_uu_id: str
@@ -28,7 +28,7 @@ class DecisionBookDecisionBookInvitationsUpdate(PydanticBaseModel):
     occupant_type_uu_id: Optional[str] = None
 
 
-class ListDecisionBook(ListOptions, PydanticBaseModel):
+class ListDecisionBook(PydanticBaseModel):
     build_decision_book_uu_id: Optional[str] = None
 
 
@@ -42,12 +42,12 @@ class InsertDecisionBook(PydanticBaseModel):
     resp_company_uu_id: Optional[str] = None
 
 
-class InsertDecisionBookCompleted(BaseModelRegular):
+class InsertDecisionBookCompleted(PydanticBaseModel):
     build_decision_book_uu_id: str
     meeting_completed_date: str
 
 
-class InsertDecisionBookPerson(BaseModelRegular):
+class InsertDecisionBookPerson(PydanticBaseModel):
     person_uu_id: str
     build_decision_book_uu_id: str
     management_typecode_uu_id: str
@@ -74,7 +74,7 @@ class UpdateDecisionBook(PydanticBaseModel):
     resp_company_uu_id: Optional[str] = None
 
 
-class InsertBuildDecisionBookItems(BaseModelRegular):
+class InsertBuildDecisionBookItems(PydanticBaseModel):
     token: str
     info_type_uu_id: str
     unit_price: float
@@ -94,7 +94,7 @@ class UpdateBuildDecisionBookItems(PydanticBaseModel):
     item_objection: Optional[str] = None
 
 
-class InsertBuildDecisionBookItemDebits(BaseModelRegular):
+class InsertBuildDecisionBookItemDebits(PydanticBaseModel):
     build_decision_book_item_uu_id: str
     dues_values: dict
     # dues_types_uu_id: str

api_validations/validations_request/modules.py

@@ -4,7 +4,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class RegisterModules2Occupant(BaseModelRegular):
     modules_uu_id: str
     occupant_uu_id: str
@@ -14,3 +13,6 @@ class RegisterModules2Occupant(BaseModelRegular):
 class RegisterModules2Employee(BaseModelRegular):
     modules_uu_id: str
     employee_uu_id: str
+
+
+

api_validations/validations_request/services.py

@@ -4,7 +4,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class RegisterServices2Occupant(BaseModelRegular):
     service_uu_id: str
     occupant_uu_id: str

api_validations/validations_request/user.py

@@ -5,7 +5,6 @@ from api_validations.validations_request import (
     ListOptions,
 )
 
-
 class InsertUsers(PydanticBaseModel):
     people_uu_id: str
     user_tag: str

databases/__init__.py

@@ -11,7 +11,9 @@ from databases.sql_models.account.iban import (
     BuildIbans,
     BuildIbanDescription,
 )
-from databases.sql_models.api.encrypter import CrypterEngine
+from databases.sql_models.api.encrypter import (
+    CrypterEngine
+)
 from databases.sql_models.building.build import (
     Build,
     BuildTypes,
@@ -84,7 +86,7 @@ from databases.sql_models.rules.rules import (
     EndpointRestriction,
 )
 
-# NO-SQL Models
+#NO-SQL Models
 from databases.no_sql_models.mongo_database import (
     MongoQuery,
 )
@@ -159,3 +161,5 @@ __all__ = [
     "MongoQuery",
     "MongoQueryIdentity",
 ]
+
+

databases/extensions/__init__.py

@@ -1,11 +0,0 @@
-from .selector_classes import (
-    Explanation,
-    SelectActionWithEmployee,
-    SelectAction,
-)
-
-__all__ = [
-    "Explanation",
-    "SelectAction",
-    "SelectActionWithEmployee",
-]

databases/extensions/auth.py

@@ -1,351 +0,0 @@
-import uuid
-import secrets
-import hashlib
-import requests
-
-from sqlalchemy import or_
-from datetime import timedelta
-from fastapi.exceptions import HTTPException
-from fastapi import status
-
-from databases import (
-    Users,
-    People,
-    Companies,
-    UsersTokens,
-    MongoQueryIdentity,
-)
-from databases.no_sql_models.validations import (
-    PasswordHistoryViaUser,
-    AccessHistoryViaUser,
-)
-
-from api_library.date_time_actions.date_functions import system_arrow, client_arrow
-from api_configs import ApiStatic, Auth
-
-from api_services.redis.auth_actions.auth import save_access_token_to_redis
-
-
-class PasswordModule:
-
-    @classmethod
-    def generate_token(cls, length):
-        return secrets.token_urlsafe(length)
-
-    @classmethod
-    def create_hashed_password(cls, domain, id_, password):
-        salted_password = f"{domain}-{id_}-{password}"
-        return hashlib.sha256(salted_password.encode()).hexdigest()
-
-    @classmethod
-    def check_hashed_password(cls, domain, id_, password, password_hashed):
-        return cls.create_hashed_password(domain, id_, password) == password_hashed
-
-
-class AuthModule(PasswordModule):
-
-    @classmethod
-    def check_user_exits(cls, access_key, domain):
-
-        found_user: Users = cls.filter_active(
-            or_(
-                cls.email == str(access_key).lower(),
-                cls.phone_number == str(access_key).replace(" ", ""),
-            ),
-            filter_records=False,
-        )
-        if not found_user.data:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="Given access key or domain is not matching with the any user record.",
-            )
-        found_user = found_user.data[0]
-        other_domains_list = found_user.get_main_domain_and_other_domains(
-            get_main_domain=False
-        )
-
-        if domain not in other_domains_list:
-            raise HTTPException(
-                status_code=401,
-                detail=dict(message="Unauthorized User attempts to connect api"),
-            )
-
-        if not found_user:
-            raise HTTPException(
-                status_code=401,
-                detail="Given access key or domain is not matching with the any user record.",
-            )
-        return found_user
-
-    def generate_access_token(self):
-        return self.generate_token(Auth.ACCESS_TOKEN_LENGTH)
-
-    def remove_refresher_token(self, domain, disconnect: bool = False):
-        registered_tokens = ([], 0)
-        if disconnect:
-            registered_tokens = UsersTokens.filter_by(user_id=self.id)
-        else:
-            registered_tokens = UsersTokens.filter_by(domain=domain, user_id=self.id)
-        for token in registered_tokens[0]:
-            token.session.delete(token)
-            token.session.commit()
-            token.session.flush()
-
-    def check_password(self, password):
-        main_domain = self.get_main_domain_and_other_domains(get_main_domain=True)
-        if check_password := self.check_hashed_password(
-            domain=main_domain,
-            id_=self.uu_id,
-            password_hashed=self.hash_password,
-            password=password,
-        ):
-            return check_password
-        raise HTTPException(
-            status_code=401,
-            detail="Password is not correct.",
-        )
-
-    def check_password_is_different(self, password):
-        main_domain = self.get_main_domain_and_other_domains(get_main_domain=True)
-        if self.hash_password == self.create_hashed_password(
-            domain=main_domain, id_=self.uu_id, password=password
-        ):
-            raise HTTPException(
-                status_code=401,
-                detail="New password is same with old password.",
-            )
-
-    def create_password(self, password, password_token=None):
-        if self.password_token:
-            replace_day = 0
-            try:
-                replace_day = int(
-                    str(self.password_expires_day or 0)
-                    .split(",")[0]
-                    .replace(" days", "")
-                )
-            except Exception as e:
-                err = e
-            token_is_expired = system_arrow.now() >= system_arrow.get(
-                self.password_expiry_begins
-            ).shift(days=replace_day)
-
-            if not password_token == self.password_token and token_is_expired:
-                raise HTTPException(
-                    status_code=401,
-                    detail="Password token is not valid. Please request a new password token.",
-                )
-
-        query_engine = MongoQueryIdentity(company_uuid=self.related_company)
-        domain_via_user = query_engine.get_domain_via_user(user_uu_id=str(self.uu_id))[
-            "main_domain"
-        ]
-        new_password_dict = {
-            "password": self.create_hashed_password(
-                domain=domain_via_user, id_=self.uu_id, password=password
-            ),
-            "date": str(system_arrow.now()),
-        }
-        history_dict = PasswordHistoryViaUser(
-            user_uu_id=str(self.uu_id),
-            password_add=new_password_dict,
-            access_history_detail={
-                "request": "",
-                "ip": "",
-            },
-        )
-        query_engine.refresh_password_history_via_user(payload=history_dict)
-        self.password_expiry_begins = str(system_arrow.now())
-        self.hash_password = new_password_dict.get("password")
-        if self.password_token:
-            self.password_token = None
-        self.save()
-
-    def reset_password_token(self):
-        self.password_expiry_begins = str(system_arrow.now())
-        self.password_token = self.generate_token(127)
-        self.save()
-
-    def generate_refresher_token(self, domain: str, remember_me=False):
-        if remember_me:
-            refresh_token = self.generate_token(Auth.REFRESHER_TOKEN_LENGTH)
-            if already_token := UsersTokens.find_one(
-                user_id=self.id, token_type="RememberMe", domain=domain
-            ):
-                already_token.update(token=refresh_token)
-                already_token.expires_at = system_arrow.shift(days=3)
-                already_token.save()
-                return refresh_token
-            UsersTokens.create(
-                user_id=self.id,
-                token_type="RememberMe",
-                token=refresh_token,
-                domain=domain,
-            )
-            return refresh_token
-        return None
-
-    def remainder_day(self):
-        return float(
-            timedelta(
-                days=int(
-                    "".join(
-                        [
-                            _
-                            for _ in str(self.password_expires_day).split(",")[0]
-                            if _.isdigit()
-                        ]
-                    )
-                )
-            ).seconds
-        )
-
-
-class UserLoginModule(AuthModule):
-
-    @classmethod
-    def login_user_with_credentials(cls, data, request):
-
-        found_user = Users.check_user_exits(
-            access_key=data.access_key, domain=data.domain
-        )
-        access_token = found_user.generate_access_token()
-        query_engine = MongoQueryIdentity(company_uuid=found_user.related_company)
-
-        if found_user.check_password(password=data.password):
-            access_object_to_redis = save_access_token_to_redis(
-                request=request,
-                found_user=found_user,
-                domain=data.domain,
-                access_token=access_token,
-            )
-            refresher_token = found_user.generate_refresher_token(
-                domain=data.domain, remember_me=data.remember_me
-            )
-            headers_request = request.headers
-            headers_request = dict(headers_request)
-            headers_request["evyos-user-agent"] = headers_request.get("user-agent")
-            headers_request["evyos-platform"] = headers_request.get("user-agent")
-            headers_request["evyos-ip-ext"] = "94.54.68.158"
-            found_user.last_agent = headers_request.get("evyos-user-agent", None)
-            found_user.last_platform = headers_request.get("evyos-platform", None)
-            found_user.last_remote_addr = headers_request.get("evyos-ip-ext", None)
-            found_user.last_seen = str(system_arrow.now())
-
-            if ext_ip := headers_request.get("evyos-ip-ext"):
-                agent = headers_request.get("evyos-user-agent", "")
-                platform = headers_request.get("evyos-platform", "")
-                address = requests.get(f"http://ip-api.com/json/{ext_ip}").json()
-                address_package = {
-                    "city": address["city"],
-                    "zip": address["zip"],
-                    "country": address["country"],
-                    "countryCode": address["countryCode"],
-                    "region": address["region"],
-                    "regionName": address["regionName"],
-                }
-                mongo_db = MongoQueryIdentity(
-                    company_uuid=str(found_user.related_company).replace(" ", ""),
-                    storage_reasoning="AccessHistory",
-                )
-                filter_query = {
-                    "agent": agent,
-                    "platform": platform,
-                    "address": address_package,
-                    "user_id": found_user.id,
-                }
-                already_exits = mongo_db.mongo_engine.filter_by(filter_query) or None
-                no_address_validates = mongo_db.mongo_engine.get_all()[0] == 0
-                record_id = uuid.uuid4().__str__()
-                notice_link = ApiStatic.blacklist_login(record_id=record_id)
-                found_people = People.find_one(id=found_user.person_id)
-                access_via_user = query_engine.update_access_history_via_user(
-                    AccessHistoryViaUser(
-                        **{
-                            "user_uu_id": found_user.uu_id.__str__(),
-                            "access_history": {
-                                "record_id": record_id,
-                                "agent": agent,
-                                "platform": platform,
-                                "address": address_package,
-                                "ip": ext_ip,
-                                "access_token": access_token,
-                                "created_at": system_arrow.now().timestamp(),
-                                # "is_confirmed": True if no_address_validates else False,
-                                # "is_first": True if no_address_validates else False,
-                            },
-                        }
-                    )
-                )
-                if already_exits:
-                    update_mongo = mongo_db.mongo_engine.table.update_one(
-                        filter=filter_query,
-                        update={
-                            "$set": {
-                                "ip": ext_ip,
-                                "access_token": access_token,
-                                "created_at": system_arrow.now().timestamp(),
-                            }
-                        },
-                    )
-                else:
-                    mongo_db.mongo_engine.insert(
-                        payload={
-                            "user_id": found_user.id,
-                            "record_id": record_id,
-                            "agent": agent,
-                            "platform": platform,
-                            "address": address_package,
-                            "ip": ext_ip,
-                            "access_token": access_token,
-                            "created_at": system_arrow.now().timestamp(),
-                            "is_confirmed": True if no_address_validates else False,
-                            "is_first": True if no_address_validates else False,
-                        }
-                    )
-            found_user.remember_me = bool(data.remember_me)
-            found_user.save()
-            return {
-                "access_token": access_token,
-                "refresher_token": refresher_token,
-                "user": found_user,
-                "access_object": access_object_to_redis,
-            }
-        raise HTTPException(
-            status_code=401,
-            detail="Login is not successful. Please check your credentials.",
-        )
-
-
-# UserLogger.log_error(
-#     dict(
-#         user_id=found_user.id,
-#         domain=data.domain,
-#         access_key=data.access_key,
-#         agent=found_user.last_agent,
-#         ip=getattr(request, "remote_addr", None)
-#         or request.headers.get("X-Forwarded-For", None),
-#         platform=found_user.last_platform,
-#         login_date=str(DateTimeLocal.now()),
-#         is_login=True,
-#     )
-# )
-
-# if (
-#     not str(found_people.country_code).lower()
-#     == str(address_package.get("countryCode")).lower()
-# ):
-#     send_email_completed = send_email(
-#         subject=f"Dear {found_user.nick_name}, your password has been changed.",
-#         receivers=[str(found_user.email)],
-#         html=invalid_ip_or_address_found(
-#             user_name=found_user.nick_name,
-#             address=address_package,
-#             notice_link=notice_link,
-#         ),
-#     )
-#     if not send_email_completed:
-#         raise HTTPException(
-#             status_code=400,
-#             detail="An error occured at sending email. Please contact with support team.",
-#         )

databases/extensions/selector_classes.py

@@ -1,79 +0,0 @@
-class Explanation: ...
-
-
-class SelectorsBase:
-    @classmethod
-    def add_confirmed_filter(cls, first_table, second_table) -> tuple:
-        return (
-            first_table.active == True,
-            first_table.is_confirmed == True,
-            first_table.deleted == False,
-            second_table.active == True,
-            second_table.is_confirmed == True,
-            second_table.deleted == False,
-        )
-
-
-class SelectActionWithEmployee:
-
-    @classmethod
-    def select_action(cls, employee_id, filter_expr: list = None):
-        if filter_expr is not None:
-            filter_expr = (cls.__many__table__.employee_id == employee_id, *filter_expr)
-            data = (
-                cls.session.query(cls.id)
-                .select_from(cls)
-                .join(cls.__many__table__, cls.__many__table__.member_id == cls.id)
-                .filter(
-                    *filter_expr,
-                    *SelectorsBase.add_confirmed_filter(
-                        first_table=cls, second_table=cls.__many__table__
-                    ),
-                )
-            )
-            return cls.query.filter(cls.id.in_([comp[0] for comp in data.all()]))
-        data = (
-            cls.session.query(cls.id)
-            .select_from(cls)
-            .join(cls.__many__table__, cls.__many__table__.member_id == cls.id)
-            .filter(
-                cls.__many__table__.employee_id == employee_id,
-                *SelectorsBase.add_confirmed_filter(
-                    first_table=cls, second_table=cls.__many__table__
-                ),
-            )
-        )
-        return cls.query.filter(cls.id.in_([comp[0] for comp in data.all()]))
-
-
-class SelectAction:
-
-    @classmethod
-    def select_action(cls, duty_id_list: list, filter_expr: list = None):
-        if filter_expr is not None:
-            data = (
-                cls.session.query(cls.id)
-                .select_from(cls)
-                .join(cls.__many__table__, cls.__many__table__.member_id == cls.id)
-                .filter(
-                    cls.__many__table__.duties_id.in_(duty_id_list),
-                    *SelectorsBase.add_confirmed_filter(
-                        first_table=cls, second_table=cls.__many__table__
-                    ),
-                    *filter_expr,
-                )
-            )
-            return cls.query.filter(cls.id.in_([comp[0] for comp in data.all()]))
-
-        data = (
-            cls.session.query(cls.id)
-            .select_from(cls)
-            .join(cls.__many__table__, cls.__many__table__.member_id == cls.id)
-            .filter(
-                cls.__many__table__.duties_id.in_(duty_id_list)
-                * SelectorsBase.add_confirmed_filter(
-                    first_table=cls, second_table=cls.__many__table__
-                ),
-            )
-        )
-        return cls.query.filter(cls.id.in_([comp[0] for comp in data.all()]))

databases/no_sql_models/login_handlers.py

@@ -36,7 +36,8 @@ def load_user_with_erp_details(found_user, access_dict: dict = None):
         #     }
         # )
         err = e
-        print("MongoQuery load_user_with_erp_details", err)
+        print('MongoQuery load_user_with_erp_details', err)
+
 
     for building in list(set(employee.duty.department.company.response_buildings)):
         build_parts = []

databases/no_sql_models/mongo_database.py

@@ -8,7 +8,6 @@ from api_configs import MongoConfig
 from pymongo import MongoClient
 from pymongo.collection import Collection
 from pymongo.results import InsertManyResult
-
 # from configs import TestMongo as MongoConfig
 
 

databases/sql_models/account/account.py

@@ -1,6 +1,6 @@
 from databases.sql_models.core_mixin import CrudCollection
 
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
 from sqlalchemy import (
     String,
     Integer,
@@ -10,8 +10,6 @@ from sqlalchemy import (
     Boolean,
     TIMESTAMP,
     Numeric,
-    Identity,
-    UUID,
 )
 
 
@@ -20,15 +18,15 @@ class AccountBooks(CrudCollection):
     __tablename__ = "account_books"
     __exclude__fields__ = []
 
-    country: Mapped[str] = mapped_column(String, nullable=False)
+    country = mapped_column(String, nullable=False)
-    branch_type: Mapped[str] = mapped_column(SmallInteger, server_default="0")
+    branch_type = mapped_column(SmallInteger, server_default="0")
+    # start_date = mapped_column(TIMESTAMP, nullable=False, comment="Account Start Date")
+    # stop_date = mapped_column(TIMESTAMP, server_default="2900-01-01 00:00:00")
 
-    company_id: Mapped[Identity] = mapped_column(
+    company_id = mapped_column(ForeignKey("companies.id"), nullable=False)
-        ForeignKey("companies.id"), nullable=False
+    company_uu_id = mapped_column(String, nullable=False)
-    )
+    branch_id = mapped_column(ForeignKey("companies.id"))
-    company_uu_id: Mapped[UUID] = mapped_column(String, nullable=False)
+    branch_uu_id = mapped_column(String, comment="Branch UU ID")
-    branch_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
-    branch_uu_id: Mapped[UUID] = mapped_column(String, comment="Branch UU ID")
 
     # company: Mapped["Companies"] = relationship(
     #     "Company", back_populates="company_account_books", foreign_keys=[company_id]
@@ -60,34 +58,24 @@ class AccountCodes(CrudCollection):
     __tablename__ = "account_codes"
     __exclude__fields__ = []
 
-    account_code: Mapped[str] = mapped_column(
+    account_code = mapped_column(String(48), nullable=False, comment="Account Code")
-        String(48), nullable=False, comment="Account Code"
+    comment_line = mapped_column(String(128), nullable=False, comment="Comment Line")
-    )
-    comment_line: Mapped[str] = mapped_column(
-        String(128), nullable=False, comment="Comment Line"
-    )
 
-    is_receive_or_debit: Mapped[bool] = mapped_column(Boolean)
+    is_receive_or_debit = mapped_column(Boolean)
-    product_id: Mapped[Identity] = mapped_column(Integer, server_default="0")
+    product_id = mapped_column(Integer, server_default="0")
-    nvi_id: Mapped[str] = mapped_column(String(48), server_default="")
+    nvi_id = mapped_column(String(48), server_default="")
-    status_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    status_id = mapped_column(SmallInteger, server_default="0")
-    account_code_seperator: Mapped[str] = mapped_column(String(1), server_default=".")
+    account_code_seperator = mapped_column(String(1), server_default=".")
 
-    system_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    system_id = mapped_column(SmallInteger, server_default="0")
-    locked: Mapped[bool] = mapped_column(SmallInteger, server_default="0")
+    locked = mapped_column(SmallInteger, server_default="0")
 
-    company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    company_id = mapped_column(ForeignKey("companies.id"))
-    company_uu_id: Mapped[UUID] = mapped_column(
+    company_uu_id = mapped_column(String, nullable=False, comment="Company UU ID")
-        String, nullable=False, comment="Company UU ID"
+    customer_id = mapped_column(ForeignKey("companies.id"))
-    )
+    customer_uu_id = mapped_column(String, nullable=False, comment="Customer UU ID")
-    customer_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    person_id = mapped_column(ForeignKey("people.id"))
-    customer_uu_id: Mapped[UUID] = mapped_column(
+    person_uu_id = mapped_column(String, nullable=False, comment="Person UU ID")
-        String, nullable=False, comment="Customer UU ID"
-    )
-    person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
-    person_uu_id: Mapped[UUID] = mapped_column(
-        String, nullable=False, comment="Person UU ID"
-    )
 
     # company: Mapped["Companies"] = relationship(
     #     "Company", back_populates="account_codes", foreign_keys=[company_id]
@@ -116,17 +104,15 @@ class AccountCodeParser(CrudCollection):
     __tablename__ = "account_code_parser"
     __exclude__fields__ = []
 
-    account_code_1: Mapped[str] = mapped_column(String, nullable=False, comment="Order")
+    account_code_1 = mapped_column(String, nullable=False, comment="Order")
-    account_code_2: Mapped[str] = mapped_column(String, nullable=False, comment="Order")
+    account_code_2 = mapped_column(String, nullable=False, comment="Order")
-    account_code_3: Mapped[str] = mapped_column(String, nullable=False, comment="Order")
+    account_code_3 = mapped_column(String, nullable=False, comment="Order")
-    account_code_4: Mapped[str] = mapped_column(String, server_default="")
+    account_code_4 = mapped_column(String, server_default="")
-    account_code_5: Mapped[str] = mapped_column(String, server_default="")
+    account_code_5 = mapped_column(String, server_default="")
-    account_code_6: Mapped[str] = mapped_column(String, server_default="")
+    account_code_6 = mapped_column(String, server_default="")
 
-    account_code_id: Mapped[Identity] = mapped_column(
+    account_code_id = mapped_column(ForeignKey("account_codes.id"), nullable=False)
-        ForeignKey("account_codes.id"), nullable=False
+    account_code_uu_id = mapped_column(
-    )
-    account_code_uu_id: Mapped[UUID] = mapped_column(
         String, nullable=False, comment="Account Code UU ID"
     )
 
@@ -160,61 +146,51 @@ class AccountMaster(CrudCollection):
     __tablename__ = "account_master"
     __exclude__fields__ = []
 
-    doc_date: Mapped[TIMESTAMP] = mapped_column(
+    doc_date = mapped_column(TIMESTAMP, nullable=False, comment="Document Date")
-        TIMESTAMP, nullable=False, comment="Document Date"
+    plug_type = mapped_column(String, nullable=False, comment="Plug Type")
-    )
+    plug_number = mapped_column(Integer, nullable=False, comment="Plug Number")
-    plug_type: Mapped[str] = mapped_column(String, nullable=False, comment="Plug Type")
-    plug_number: Mapped[int] = mapped_column(
-        Integer, nullable=False, comment="Plug Number"
-    )
 
-    special_code: Mapped[str] = mapped_column(String(12), server_default="")
+    special_code = mapped_column(String(12), server_default="")
-    authorization_code: Mapped[str] = mapped_column(String(12), server_default="")
+    authorization_code = mapped_column(String(12), server_default="")
 
-    doc_code: Mapped[str] = mapped_column(String(12), server_default="")
+    doc_code = mapped_column(String(12), server_default="")
-    doc_type: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    doc_type = mapped_column(SmallInteger, server_default="0")
 
-    comment_line1: Mapped[str] = mapped_column(String, server_default="")
+    comment_line1 = mapped_column(String, server_default="")
-    comment_line2: Mapped[str] = mapped_column(String, server_default="")
+    comment_line2 = mapped_column(String, server_default="")
-    comment_line3: Mapped[str] = mapped_column(String, server_default="")
+    comment_line3 = mapped_column(String, server_default="")
-    comment_line4: Mapped[str] = mapped_column(String, server_default="")
+    comment_line4 = mapped_column(String, server_default="")
-    comment_line5: Mapped[str] = mapped_column(String, server_default="")
+    comment_line5 = mapped_column(String, server_default="")
-    comment_line6: Mapped[str] = mapped_column(String, server_default="")
+    comment_line6 = mapped_column(String, server_default="")
-    project_code: Mapped[str] = mapped_column(String(12), server_default="")
+    project_code = mapped_column(String(12), server_default="")
-    module_no: Mapped[str] = mapped_column(String, server_default="")
+    module_no = mapped_column(String, server_default="")
-    journal_no: Mapped[int] = mapped_column(Integer, server_default="0")
+    journal_no = mapped_column(Integer, server_default="0")
 
-    status_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    status_id = mapped_column(SmallInteger, server_default="0")
-    canceled: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    canceled = mapped_column(Boolean, server_default="0")
-    print_count: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    print_count = mapped_column(SmallInteger, server_default="0")
-    total_active: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_active = mapped_column(Numeric(20, 6), server_default="0")
-    total_passive: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_passive = mapped_column(Numeric(20, 6), server_default="0")
-    total_active_1: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_active_1 = mapped_column(Numeric(20, 6), server_default="0")
-    total_passive_1: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_passive_1 = mapped_column(Numeric(20, 6), server_default="0")
-    total_active_2: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_active_2 = mapped_column(Numeric(20, 6), server_default="0")
-    total_passive_2: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_passive_2 = mapped_column(Numeric(20, 6), server_default="0")
-    total_active_3: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_active_3 = mapped_column(Numeric(20, 6), server_default="0")
-    total_passive_3: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_passive_3 = mapped_column(Numeric(20, 6), server_default="0")
-    total_active_4: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_active_4 = mapped_column(Numeric(20, 6), server_default="0")
-    total_passive_4: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    total_passive_4 = mapped_column(Numeric(20, 6), server_default="0")
-    cross_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    cross_ref = mapped_column(Integer, server_default="0")
-    data_center_id: Mapped[str] = mapped_column(String, server_default="")
+    data_center_id = mapped_column(String, server_default="")
-    data_center_rec_num: Mapped[int] = mapped_column(Integer, server_default="0")
+    data_center_rec_num = mapped_column(Integer, server_default="0")
 
-    account_header_id: Mapped[Identity] = mapped_column(
+    account_header_id = mapped_column(ForeignKey("account_books.id"), nullable=False)
-        ForeignKey("account_books.id"), nullable=False
+    account_header_uu_id = mapped_column(
-    )
-    account_header_uu_id: Mapped[UUID] = mapped_column(
         String, nullable=False, comment="Account Header UU ID"
     )
-    project_item_id: Mapped[Identity] = mapped_column(
+    project_item_id = mapped_column(ForeignKey("build_decision_book_projects.id"))
-        ForeignKey("build_decision_book_projects.id")
+    project_item_uu_id = mapped_column(String, comment="Project Item UU ID")
-    )
+    department_id = mapped_column(ForeignKey("departments.id"))
-    project_item_uu_id: Mapped[UUID] = mapped_column(
+    department_uu_id = mapped_column(String, comment="Department UU ID")
-        String, comment="Project Item UU ID"
-    )
-    department_id: Mapped[Identity] = mapped_column(ForeignKey("departments.id"))
-    department_uu_id: Mapped[UUID] = mapped_column(String, comment="Department UU ID")
 
     # account_header: Mapped["AccountBooks"] = relationship(
     #     "AccountBooks",
@@ -247,77 +223,59 @@ class AccountDetail(CrudCollection):
     __exclude__fields__ = []
     __enum_list__ = [("plug_type", "AccountingReceiptTypes", "M")]
 
-    doc_date: Mapped[TIMESTAMP] = mapped_column(
+    doc_date = mapped_column(TIMESTAMP, nullable=False, comment="Document Date")
-        TIMESTAMP, nullable=False, comment="Document Date"
+    line_no = mapped_column(SmallInteger, nullable=False, comment="Line Number")
-    )
+    receive_debit = mapped_column(String(1), nullable=False, comment="Receive Debit")
-    line_no: Mapped[int] = mapped_column(
+    debit = mapped_column(Numeric(20, 6), nullable=False, comment="Debit")
-        SmallInteger, nullable=False, comment="Line Number"
-    )
-    receive_debit: Mapped[str] = mapped_column(
-        String(1), nullable=False, comment="Receive Debit"
-    )
-    debit: Mapped[float] = mapped_column(
-        Numeric(20, 6), nullable=False, comment="Debit"
-    )
 
-    department: Mapped[str] = mapped_column(String(24), server_default="")
+    department = mapped_column(String(24), server_default="")
-    special_code: Mapped[str] = mapped_column(String(12), server_default="")
+    special_code = mapped_column(String(12), server_default="")
-    account_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    account_ref = mapped_column(Integer, server_default="0")
-    account_fiche_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    account_fiche_ref = mapped_column(Integer, server_default="0")
-    center_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    center_ref = mapped_column(Integer, server_default="0")
-    general_code: Mapped[str] = mapped_column(String(32), server_default="")
+    general_code = mapped_column(String(32), server_default="")
-    credit: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    credit = mapped_column(Numeric(20, 6), server_default="0")
-    currency_type: Mapped[str] = mapped_column(String(4), server_default="TL")
+    currency_type = mapped_column(String(4), server_default="TL")
-    exchange_rate: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    exchange_rate = mapped_column(Numeric(20, 6), server_default="0")
-    debit_cur: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    debit_cur = mapped_column(Numeric(20, 6), server_default="0")
-    credit_cur: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    credit_cur = mapped_column(Numeric(20, 6), server_default="0")
-    discount_cur: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    discount_cur = mapped_column(Numeric(20, 6), server_default="0")
-    amount: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    amount = mapped_column(Numeric(20, 6), server_default="0")
-    cross_account_code: Mapped[float] = mapped_column(String(32), server_default="")
+    cross_account_code = mapped_column(String(32), server_default="")
-    inf_index: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    inf_index = mapped_column(Numeric(20, 6), server_default="0")
-    not_inflated: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    not_inflated = mapped_column(SmallInteger, server_default="0")
-    not_calculated: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    not_calculated = mapped_column(SmallInteger, server_default="0")
-    comment_line1: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line1 = mapped_column(String(64), server_default="")
-    comment_line2: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line2 = mapped_column(String(64), server_default="")
-    comment_line3: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line3 = mapped_column(String(64), server_default="")
-    comment_line4: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line4 = mapped_column(String(64), server_default="")
-    comment_line5: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line5 = mapped_column(String(64), server_default="")
-    comment_line6: Mapped[str] = mapped_column(String(64), server_default="")
+    comment_line6 = mapped_column(String(64), server_default="")
-    owner_acc_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    owner_acc_ref = mapped_column(Integer, server_default="0")
-    from_where: Mapped[int] = mapped_column(Integer, server_default="0")
+    from_where = mapped_column(Integer, server_default="0")
-    orj_eid: Mapped[int] = mapped_column(Integer, server_default="0")
+    orj_eid = mapped_column(Integer, server_default="0")
-    canceled: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    canceled = mapped_column(SmallInteger, server_default="0")
-    cross_ref: Mapped[int] = mapped_column(Integer, server_default="0")
+    cross_ref = mapped_column(Integer, server_default="0")
-    data_center_id: Mapped[str] = mapped_column(String, server_default="")
+    data_center_id = mapped_column(String, server_default="")
-    data_center_rec_num: Mapped[str] = mapped_column(Integer, server_default="0")
+    data_center_rec_num = mapped_column(Integer, server_default="0")
-    status_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    status_id = mapped_column(SmallInteger, server_default="0")
 
-    plug_type_id: Mapped[Identity] = mapped_column(
+    plug_type_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
-    )
     plug_type_uu_id = mapped_column(String, nullable=False, comment="Plug Type UU ID")
-    account_header_id: Mapped[Identity] = mapped_column(
+    account_header_id = mapped_column(ForeignKey("account_books.id"), nullable=False)
-        ForeignKey("account_books.id"), nullable=False
+    account_header_uu_id = mapped_column(
-    )
-    account_header_uu_id: Mapped[UUID] = mapped_column(
         String, nullable=False, comment="Account Header UU ID"
     )
-    account_code_id: Mapped[Identity] = mapped_column(
+    account_code_id = mapped_column(ForeignKey("account_codes.id"), nullable=False)
-        ForeignKey("account_codes.id"), nullable=False
+    account_code_uu_id = mapped_column(
-    )
-    account_code_uu_id: Mapped[UUID] = mapped_column(
         String, nullable=False, comment="Account Code UU ID"
     )
-    account_master_id: Mapped[Identity] = mapped_column(
+    account_master_id = mapped_column(ForeignKey("account_master.id"), nullable=False)
-        ForeignKey("account_master.id"), nullable=False
+    account_master_uu_id = mapped_column(
-    )
-    account_master_uu_id: Mapped[UUID] = mapped_column(
         String, nullable=False, comment="Account Master UU ID"
     )
-    project_id: Mapped[Identity] = mapped_column(
+    project_id = mapped_column(ForeignKey("build_decision_book_projects.id"))
-        ForeignKey("build_decision_book_projects.id")
+    project_uu_id = mapped_column(String, comment="Project UU ID")
-    )
-    project_uu_id: Mapped[UUID] = mapped_column(String, comment="Project UU ID")
 
     # account_header: Mapped["AccountBooks"] = relationship(
     #     "AccountBooks",
@@ -384,102 +342,87 @@ class AccountRecords(CrudCollection):
     build_decision_book_id = kaydın sorumlu olduğu karar defteri
     send_company_id = kaydı gönderen firma, send_person_id = gönderen kişi
     customer_id = sorumlu kullanıcı bilgisi, company_id = sorumlu firma
+
     """
 
-    iban: Mapped[str] = mapped_column(
+    iban = mapped_column(String(64), nullable=False, comment="IBAN Number of Bank")
-        String(64), nullable=False, comment="IBAN Number of Bank"
+    bank_date = mapped_column(
-    )
-    bank_date: Mapped[TIMESTAMP] = mapped_column(
         TIMESTAMP, nullable=False, comment="Bank Transaction Date"
     )
 
-    currency_value: Mapped[float] = mapped_column(
+    currency_value = mapped_column(
         Numeric(20, 6), nullable=False, comment="Currency Value"
     )
-    bank_balance: Mapped[float] = mapped_column(
+    bank_balance = mapped_column(Numeric(20, 6), nullable=False, comment="Bank Balance")
-        Numeric(20, 6), nullable=False, comment="Bank Balance"
+    currency = mapped_column(String(5), nullable=False, comment="Unit of Currency")
-    )
+    additional_balance = mapped_column(
-    currency: Mapped[str] = mapped_column(
-        String(5), nullable=False, comment="Unit of Currency"
-    )
-    additional_balance: Mapped[float] = mapped_column(
         Numeric(20, 6), nullable=False, comment="Additional Balance"
     )
-    channel_branch: Mapped[str] = mapped_column(
+    channel_branch = mapped_column(String(120), nullable=False, comment="Branch Bank")
-        String(120), nullable=False, comment="Branch Bank"
+    process_name = mapped_column(
-    )
-    process_name: Mapped[str] = mapped_column(
         String, nullable=False, comment="Bank Process Type Name"
     )
-    process_type: Mapped[str] = mapped_column(
+    process_type = mapped_column(
         String, nullable=False, comment="Bank Process Type"
     )
-    process_comment: Mapped[str] = mapped_column(
+    process_comment = mapped_column(
         String, nullable=False, comment="Transaction Record Comment"
     )
-    bank_reference_code: Mapped[str] = mapped_column(
+    bank_reference_code = mapped_column(
         String, nullable=False, comment="Bank Reference Code"
     )
 
-    add_comment_note: Mapped[str] = mapped_column(String, server_default="")
+    add_comment_note = mapped_column(String, server_default="")
-    is_receipt_mail_send: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    is_receipt_mail_send = mapped_column(Boolean, server_default="0")
     found_from = mapped_column(String, server_default="")
-    similarity: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    similarity = mapped_column(Numeric(20, 6), server_default="0")
-    remainder_balance: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    remainder_balance = mapped_column(Numeric(20, 6), server_default="0")
 
-    bank_date_y: Mapped[int] = mapped_column(Integer)
+    bank_date_y = mapped_column(Integer)
-    bank_date_m: Mapped[int] = mapped_column(SmallInteger)
+    bank_date_m = mapped_column(SmallInteger)
-    bank_date_w: Mapped[int] = mapped_column(SmallInteger)
+    bank_date_w = mapped_column(SmallInteger)
-    bank_date_d: Mapped[int] = mapped_column(SmallInteger)
+    bank_date_d = mapped_column(SmallInteger)
 
-    approving_accounting_record: Mapped[bool] = mapped_column(
+    approving_accounting_record = mapped_column(Boolean, server_default="0")
-        Boolean, server_default="0"
-    )
     accounting_receipt_date = mapped_column(
         TIMESTAMP, server_default="1900-01-01 00:00:00"
     )
     accounting_receipt_number = mapped_column(Integer, server_default="0")
     status_id = mapped_column(SmallInteger, server_default="0")
 
-    approved_record: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    approved_record = mapped_column(Boolean, server_default="0")
     import_file_name = mapped_column(String, nullable=True, comment="XLS Key")
 
-    receive_debit: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"))
+    receive_debit = mapped_column(ForeignKey("api_enum_dropdown.id"))
     receive_debit_uu_id = mapped_column(String, nullable=True, comment="Debit UU ID")
-    budget_type: Mapped[Identity] = mapped_column(
+    budget_type = mapped_column(ForeignKey("api_enum_dropdown.uu_id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
-    )
     budget_type_uu_id = mapped_column(
         String, nullable=True, comment="Budget Type UU ID"
     )
 
-    company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    company_id = mapped_column(ForeignKey("companies.id"))
     company_uu_id = mapped_column(String, nullable=True, comment="Company UU ID")
-    send_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    send_company_id = mapped_column(ForeignKey("companies.id"))
     send_company_uu_id = mapped_column(
         String, nullable=True, comment="Send Company UU ID"
     )
 
-    customer_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    customer_id = mapped_column(ForeignKey("people.id"))
     customer_uu_id = mapped_column(String, nullable=True, comment="Customer UU ID")
-    send_person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    send_person_id = mapped_column(ForeignKey("people.id"))
     send_person_uu_id = mapped_column(
         String, nullable=True, comment="Send Person UU ID"
     )
-    approving_accounting_person: Mapped[Identity] = mapped_column(
+    approving_accounting_person = mapped_column(ForeignKey("people.id"))
-        ForeignKey("people.id")
-    )
     approving_accounting_person_uu_id = mapped_column(
         String, nullable=True, comment="Approving Accounting Person UU ID"
     )
-    # build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"), nullable=True)
+    # build_id = mapped_column(ForeignKey("build.id"), nullable=True)
-    build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"))
+    build_parts_id = mapped_column(ForeignKey("build_parts.id"))
     build_parts_uu_id = mapped_column(
         String, nullable=True, comment="Build Parts UU ID"
     )
-    build_decision_book_id: Mapped[Identity] = mapped_column(
+    build_decision_book_id = mapped_column(ForeignKey("build_decision_book.id"))
-        ForeignKey("build_decision_book.id")
-    )
     build_decision_book_uu_id = mapped_column(
         String, nullable=True, comment="Build Decision Book UU ID"
     )

databases/sql_models/account/iban.py

@@ -1,5 +1,5 @@
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
-from sqlalchemy import String, ForeignKey, Index, TIMESTAMP, SmallInteger, Identity
+from sqlalchemy import String, ForeignKey, Index, TIMESTAMP, SmallInteger
 
 from databases.sql_models.core_mixin import CrudCollection
 
@@ -12,23 +12,21 @@ class BuildIbans(CrudCollection):
     __tablename__ = "build_ibans"
     __exclude__fields__ = []
 
-    iban: Mapped[str] = mapped_column(
+    iban = mapped_column(
         String(40), server_default="", nullable=False, comment="IBAN number"
     )
-    start_date: Mapped[TIMESTAMP] = mapped_column(
+    start_date = mapped_column(
         TIMESTAMP, nullable=False, comment="Bank Transaction Start Date"
     )
 
-    stop_date: Mapped[TIMESTAMP] = mapped_column(
+    stop_date = mapped_column(TIMESTAMP, server_default="2900-01-01 00:00:00")
-        TIMESTAMP, server_default="2900-01-01 00:00:00"
+    bank_code = mapped_column(String(24), server_default="TR0000000000000")
-    )
+    xcomment = mapped_column(String(64), server_default="????")
-    bank_code: Mapped[str] = mapped_column(String(24), server_default="TR0000000000000")
-    xcomment: Mapped[str] = mapped_column(String(64), server_default="????")
 
-    build_id: Mapped[Identity] = mapped_column(
+    build_id = mapped_column(
         ForeignKey("build.id"), nullable=False, comment="Building ID"
     )
-    build_uu_id: Mapped[str] = mapped_column(
+    build_uu_id = mapped_column(
         String, nullable=False, comment="Building UUID", index=True
     )
     # building: Mapped["Build"] = relationship(
@@ -59,30 +57,22 @@ class BuildIbanDescription(CrudCollection):
     __tablename__ = "build_iban_description"
     __exclude__fields__ = []
 
-    iban: Mapped[str] = mapped_column(String, nullable=False, comment="IBAN Number")
+    iban = mapped_column(String, nullable=False, comment="IBAN Number")
-    group_id: Mapped[int] = mapped_column(
+    group_id = mapped_column(SmallInteger, nullable=False, comment="Group ID")
-        SmallInteger, nullable=False, comment="Group ID"
+    search_word = mapped_column(
-    )
-    search_word: Mapped[str] = mapped_column(
         String, nullable=False, comment="Search Word", index=True
     )
 
-    decision_book_project_id: Mapped[Identity] = mapped_column(
+    decision_book_project_id = mapped_column(ForeignKey("build_decision_book_projects.id"))
-        ForeignKey("build_decision_book_projects.id")
+    decision_book_project_uu_id = mapped_column(
-    )
-    decision_book_project_uu_id: Mapped[str] = mapped_column(
         String, nullable=False, comment="Decision Book Project UUID"
     )
-    customer_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    customer_id = mapped_column(ForeignKey("people.id"))
-    customer_uu_id: Mapped[str] = mapped_column(
+    customer_uu_id = mapped_column(String, nullable=False, comment="Customer UUID")
-        String, nullable=False, comment="Customer UUID"
+    company_id = mapped_column(ForeignKey("companies.id"))
-    )
+    company_uu_id = mapped_column(String, nullable=False, comment="Company UUID")
-    company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    build_parts_id = mapped_column(ForeignKey("build_parts.id"))
-    company_uu_id: Mapped[str] = mapped_column(
+    build_parts_uu_id = mapped_column(
-        String, nullable=False, comment="Company UUID"
-    )
-    build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"))
-    build_parts_uu_id: Mapped[str] = mapped_column(
         String, nullable=False, comment="Build Parts UUID"
     )
 

databases/sql_models/building/build.py

@@ -16,19 +16,18 @@ from sqlalchemy import (
     TIMESTAMP,
     Text,
     Numeric,
-    Identity,
 )
 
 from databases.sql_models.core_mixin import CrudCollection
 from databases import ApiEnumDropdown
 
-from databases.extensions.selector_classes import SelectActionWithEmployee, Explanation
+from application.shared_classes import SelectActionWithEmployee, Explanation
-from api_validations.validations_request import (
+from validations import (
     InsertBuildParts,
     InsertBuild,
     UpdateBuild,
 )
-from api_objects.auth.token_objects import EmployeeTokenObject, OccupantTokenObject
+from valids.auth.token_validations import EmployeeTokenObject, OccupantTokenObject
 
 
 class AbstractBuild:
@@ -120,16 +119,16 @@ class BuildTypes(CrudCollection):
     __exclude__fields__ = []
     __include__fields__ = []
 
-    function_code: Mapped[str] = mapped_column(
+    function_code = mapped_column(
         String(12), server_default="", nullable=False, comment="Function Code"
     )
-    type_code: Mapped[str] = mapped_column(
+    type_code = mapped_column(
         String(12), server_default="", nullable=False, comment="Structure Type Code"
     )
-    lang: Mapped[str] = mapped_column(
+    lang = mapped_column(
         String(4), server_default="TR", nullable=False, comment="Language"
     )
-    type_name: Mapped[str] = mapped_column(
+    type_name = mapped_column(
         String(48), server_default="", nullable=False, comment="Type Name"
     )
 
@@ -149,11 +148,11 @@ class Part2Employee(CrudCollection):
     __exclude__fields__ = []
     __include__fields__ = []
 
-    build_id: Mapped[int] = mapped_column(Integer, comment="Building ID")
+    build_id = mapped_column(Integer, comment="Building ID")
-    part_id: Mapped[Identity] = mapped_column(
+    part_id = mapped_column(
         ForeignKey("build_parts.id"), nullable=False, comment="Part ID"
     )
-    employee_id: Mapped[Identity] = mapped_column(
+    employee_id = mapped_column(
         ForeignKey("employees.id"), nullable=False, comment="Employee ID"
     )
 
@@ -173,20 +172,16 @@ class RelationshipEmployee2Build(CrudCollection):
     __tablename__ = "relationship_employee2build"
     __exclude__fields__ = []
 
-    company_id: Mapped[Identity] = mapped_column(
+    company_id = mapped_column(ForeignKey("companies.id"), nullable=False)  # 1, 2, 3
-        ForeignKey("companies.id"), nullable=False
+    employee_id = mapped_column(
-    )  # 1, 2, 3
-    employee_id: Mapped[Identity] = mapped_column(
         ForeignKey("employees.id"), nullable=False
     )  # employee -> (n)person Evyos LTD
-    member_id: Mapped[Identity] = mapped_column(
+    member_id = mapped_column(ForeignKey("build.id"), nullable=False)  # 2, 3, 4
-        ForeignKey("build.id"), nullable=False
-    )  # 2, 3, 4
 
-    relationship_type: Mapped[str] = mapped_column(
+    relationship_type = mapped_column(
         String, nullable=True, server_default="Employee"
     )  # Commercial
-    show_only: Mapped[bool] = mapped_column(Boolean, server_default="False")
+    show_only = mapped_column(Boolean, server_default="False")
 
     __table_args__ = (
         Index(
@@ -213,56 +208,44 @@ class Build(CrudCollection, SelectActionWithEmployee):
     __many__table__ = RelationshipEmployee2Build
     __explain__ = AbstractBuild()
 
-    gov_address_code: Mapped[str] = mapped_column(
+    gov_address_code = mapped_column(String, server_default="", unique=True)
-        String, server_default="", unique=True
+    build_name = mapped_column(String, nullable=False, comment="Building Name")
-    )
+    build_no = mapped_column(String(8), nullable=False, comment="Building Number")
-    build_name: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Building Name"
-    )
-    build_no: Mapped[str] = mapped_column(
-        String(8), nullable=False, comment="Building Number"
-    )
 
-    max_floor: Mapped[int] = mapped_column(
+    max_floor = mapped_column(
         SmallInteger, server_default="1", nullable=False, comment="Max Floor"
     )
-    underground_floor: Mapped[int] = mapped_column(
+    underground_floor = mapped_column(
         SmallInteger, server_default="0", nullable=False, comment="Underground Floor"
     )
-    build_date: Mapped[TIMESTAMP] = mapped_column(
+    build_date = mapped_column(TIMESTAMP, server_default="1900-01-01")
-        TIMESTAMP, server_default="1900-01-01"
+    decision_period_date = mapped_column(
-    )
-    decision_period_date: Mapped[TIMESTAMP] = mapped_column(
         TIMESTAMP,
         server_default="1900-01-01",
         comment="Building annual ordinary meeting period",
     )
-    tax_no: Mapped[str] = mapped_column(String(24), server_default="")
+    tax_no = mapped_column(String(24), server_default="")
-    lift_count: Mapped[int] = mapped_column(SmallInteger, server_default="0")
+    lift_count = mapped_column(SmallInteger, server_default="0")
-    heating_system: Mapped[bool] = mapped_column(Boolean, server_default="True")
+    heating_system = mapped_column(Boolean, server_default="True")
-    cooling_system: Mapped[bool] = mapped_column(Boolean, server_default="False")
+    cooling_system = mapped_column(Boolean, server_default="False")
-    hot_water_system: Mapped[bool] = mapped_column(Boolean, server_default="False")
+    hot_water_system = mapped_column(Boolean, server_default="False")
-    block_service_man_count: Mapped[int] = mapped_column(
+    block_service_man_count = mapped_column(SmallInteger, server_default="0")
-        SmallInteger, server_default="0"
+    security_service_man_count = mapped_column(SmallInteger, server_default="0")
-    )
+    garage_count = mapped_column(
-    security_service_man_count: Mapped[int] = mapped_column(
-        SmallInteger, server_default="0"
-    )
-    garage_count: Mapped[int] = mapped_column(
         SmallInteger, server_default="0", comment="Garage Count"
     )
-    management_room_id: Mapped[int] = mapped_column(
+    management_room_id = mapped_column(
         Integer, nullable=True, comment="Management Room ID"
     )
 
-    site_id: Mapped[Identity] = mapped_column(ForeignKey("build_sites.id"))
+    site_id = mapped_column(ForeignKey("build_sites.id"))
-    site_uu_id: Mapped[str] = mapped_column(String, comment="Site UUID")
+    site_uu_id = mapped_column(String, comment="Site UUID")
-    address_id: Mapped[Identity] = mapped_column(ForeignKey("addresses.id"))
+    address_id = mapped_column(ForeignKey("addresses.id"))
-    address_uu_id: Mapped[str] = mapped_column(String, comment="Address UUID")
+    address_uu_id = mapped_column(String, comment="Address UUID")
     build_types_id = mapped_column(
         ForeignKey("build_types.id"), nullable=False, comment="Building Type"
     )
-    build_types_uu_id: Mapped[str] = mapped_column(String, comment="Building Type UUID")
+    build_types_uu_id = mapped_column(String, comment="Building Type UUID")
 
     parts: Mapped[List["BuildParts"]] = relationship(
         "BuildParts", back_populates="buildings", foreign_keys="BuildParts.build_id"
@@ -313,7 +296,7 @@ class Build(CrudCollection, SelectActionWithEmployee):
 
     @classmethod
     def create_action(cls, data: InsertBuild, token):
-        from databases import Addresses
+        from database_sql_models import Addresses
 
         data_dict = data.excluded_dump()
         data_dict["address_id"] = None
@@ -342,7 +325,7 @@ class Build(CrudCollection, SelectActionWithEmployee):
 
     @classmethod
     def update_action(cls, data: UpdateBuild, build_uu_id: str, token):
-        from databases import Addresses
+        from database_sql_models import Addresses
 
         data_dict = data.excluded_dump()
         if data.official_address_uu_id:
@@ -422,7 +405,7 @@ class BuildParts(CrudCollection):
     address_gov_code = mapped_column(
         String, nullable=False, comment="Goverment Door Code"
     )
-    # part_name: Mapped[str] = mapped_column(String(24), server_default="", nullable=False, comment="Part Name")
+    # part_name = mapped_column(String(24), server_default="", nullable=False, comment="Part Name")
     part_no = mapped_column(
         SmallInteger, server_default="0", nullable=False, comment="Part Number"
     )
@@ -439,9 +422,7 @@ class BuildParts(CrudCollection):
     default_accessory = mapped_column(
         Text, server_default="0", comment="Default Accessory"
     )
-    human_livable: Mapped[bool] = mapped_column(
+    human_livable = mapped_column(Boolean, server_default="1", comment="Human Livable")
-        Boolean, server_default="1", comment="Human Livable"
-    )
     due_part_key = mapped_column(
         String, server_default="", nullable=False, comment="Constant Payment Group"
     )
@@ -449,12 +430,8 @@ class BuildParts(CrudCollection):
     build_id = mapped_column(
         ForeignKey("build.id"), nullable=False, comment="Building ID"
     )
-    build_uu_id: Mapped[str] = mapped_column(
+    build_uu_id = mapped_column(String, nullable=False, comment="Building UUID")
-        String, nullable=False, comment="Building UUID"
+    part_direction_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-    )
-    part_direction_id: Mapped[Identity] = mapped_column(
-        ForeignKey("api_enum_dropdown.id"), nullable=True
-    )
     part_direction_uu_id = mapped_column(
         String, nullable=True, comment="Part Direction UUID"
     )
@@ -564,15 +541,11 @@ class BuildLivingSpace(CrudCollection):
         comment="Fixed percent is deducted from debit.",
     )
 
-    agreement_no: Mapped[str] = mapped_column(
+    agreement_no = mapped_column(String, server_default="", comment="Agreement No")
-        String, server_default="", comment="Agreement No"
+    marketing_process = mapped_column(Boolean, server_default="False")
-    )
-    marketing_process: Mapped[bool] = mapped_column(Boolean, server_default="False")
     marketing_layer = mapped_column(SmallInteger, server_default="0")
 
-    discounted_percentage: Mapped[float] = mapped_column(
+    discounted_percentage = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
-        Numeric(6, 2), server_default="0.00"
-    )  # %22
     discounted_price = mapped_column(
         Numeric(20, 2), server_default="0.00"
     )  # Normal: 78.00 TL
@@ -586,9 +559,7 @@ class BuildLivingSpace(CrudCollection):
         index=True,
         comment="Build Part ID",
     )
-    build_parts_uu_id: Mapped[str] = mapped_column(
+    build_parts_uu_id = mapped_column(String, nullable=False, comment="Build Part UUID")
-        String, nullable=False, comment="Build Part UUID"
-    )
     person_id = mapped_column(
         ForeignKey("people.id"),
         nullable=False,
@@ -617,9 +588,7 @@ class BuildLivingSpace(CrudCollection):
         token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         from databases import Services, OccupantTypes
-        from api_events.events.events.events_bind_services import (
+        from api_events.events.events.events_bind_services import ServiceBindOccupantEventMethods
-            ServiceBindOccupantEventMethods,
-        )
 
         created_living_space = BuildLivingSpace.find_or_create(**data)
         occupant_type = OccupantTypes.find_one(
@@ -663,16 +632,16 @@ class BuildArea(CrudCollection):
 
     __tablename__ = "build_area"
 
-    area_name: Mapped[str] = mapped_column(String, server_default="")
+    area_name = mapped_column(String, server_default="")
-    area_code: Mapped[str] = mapped_column(String, server_default="")
+    area_code = mapped_column(String, server_default="")
-    area_type: Mapped[str] = mapped_column(String, server_default="GREEN")
+    area_type = mapped_column(String, server_default="GREEN")
-    area_direction: Mapped[str] = mapped_column(String(2), server_default="NN")
+    area_direction = mapped_column(String(2), server_default="NN")
-    area_gross_size: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    area_gross_size = mapped_column(Numeric(20, 6), server_default="0")
-    area_net_size: Mapped[float] = mapped_column(Numeric(20, 6), server_default="0")
+    area_net_size = mapped_column(Numeric(20, 6), server_default="0")
     width = mapped_column(Integer, server_default="0")
     size = mapped_column(Integer, server_default="0")
 
-    build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"))
+    build_id = mapped_column(ForeignKey("build.id"))
     build_uu_id = mapped_column(String, comment="Building UUID")
     part_type_id = mapped_column(
         ForeignKey("build_types.id"), nullable=True, comment="Building Part Type"
@@ -702,7 +671,7 @@ class BuildSites(CrudCollection):
     site_name = mapped_column(String(24), nullable=False)
     site_no = mapped_column(String(8), nullable=False)
 
-    address_id: Mapped[Identity] = mapped_column(ForeignKey("addresses.id"))
+    address_id = mapped_column(ForeignKey("addresses.id"))
     address_uu_id = mapped_column(String, comment="Address UUID")
 
     # addresses: Mapped["Address"] = relationship(
@@ -719,63 +688,47 @@ class BuildSites(CrudCollection):
 
 
 class BuildCompaniesProviding(CrudCollection):
-    """ """
+    """
+
+    """
 
     __tablename__ = "build_companies_providing"
     __exclude__fields__ = []
     __include__fields__ = []
 
-    build_id = mapped_column(
+    build_id = mapped_column(ForeignKey("build.id"), nullable=False, comment="Building ID")
-        ForeignKey("build.id"), nullable=False, comment="Building ID"
-    )
     build_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    company_id = mapped_column(ForeignKey("companies.id"))
     company_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    provide_id: Mapped[Identity] = mapped_column(
+    provide_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
-    )
     provide_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    contract_id = mapped_column(Integer, ForeignKey("companies.id"), nullable=True)
+    contract_id = mapped_column(Integer, ForeignKey('companies.id'), nullable=True)
 
     __table_args__ = (
-        Index(
+        Index("_build_companies_providing_ndx_00", build_id, company_id, provide_id , unique=True),
-            "_build_companies_providing_ndx_00",
-            build_id,
-            company_id,
-            provide_id,
-            unique=True,
-        ),
         {"comment": "Companies providing services for building"},
     )
 
 
 class BuildPersonProviding(CrudCollection):
-    """ """
+    """
+
+    """
 
     __tablename__ = "build_person_providing"
     __exclude__fields__ = []
     __include__fields__ = []
 
-    build_id = mapped_column(
+    build_id = mapped_column(ForeignKey("build.id"), nullable=False, comment="Building ID")
-        ForeignKey("build.id"), nullable=False, comment="Building ID"
-    )
     build_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    people_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    people_id = mapped_column(ForeignKey("people.id"))
     people_uu_id = mapped_column(String, nullable=True, comment="People UUID")
-    provide_id: Mapped[Identity] = mapped_column(
+    provide_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
-    )
     provide_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    contract_id = mapped_column(Integer, ForeignKey("companies.id"), nullable=True)
+    contract_id = mapped_column(Integer, ForeignKey('companies.id'), nullable=True)
 
     __table_args__ = (
-        Index(
+        Index("_build_person_providing_ndx_00", build_id, people_id, provide_id , unique=True),
-            "_build_person_providing_ndx_00",
-            build_id,
-            people_id,
-            provide_id,
-            unique=True,
-        ),
         {"comment": "People providing services for building"},
     )
 
@@ -836,9 +789,9 @@ class BuildPersonProviding(CrudCollection):
 # life_people: Mapped["People"] = relationship(
 #     "People", back_populates="life_living_spaces", foreign_keys=[life_person_id]
 # )
-# company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+# company_id = mapped_column(ForeignKey("companies.id"))
-# response_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+# response_company_id = mapped_column(ForeignKey("companies.id"))
-# person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+# person_id = mapped_column(ForeignKey("people.id"))
 
 # companies: Mapped["Companies"] = relationship(
 #     "Companies", back_populates="buildings", foreign_keys=[company_id]

databases/sql_models/building/decision_book.py

@@ -8,13 +8,11 @@ from databases.sql_models.core_mixin import CrudCollection
 from databases import (
     Build,
     BuildLivingSpace,
-    BuildIbans,
     People,
-    Companies,
+    BuildParts,
     OccupantTypes,
-    Services,
 )
-from api_library.date_time_actions.date_functions import system_arrow, client_arrow
+from api_library.date_time_actions.date_functions import DateTimeLocal
 
 from sqlalchemy import (
     String,
@@ -26,11 +24,10 @@ from sqlalchemy import (
     Text,
     Numeric,
     Integer,
-    Identity,
 )
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
-from api_validations.validations_request import (
+from validations import (
     InsertDecisionBook,
     InsertBuildDecisionBookItems,
     InsertBuildDecisionBookItemDebits,
@@ -55,34 +52,24 @@ class BuildDecisionBook(CrudCollection):
     __tablename__ = "build_decision_book"
     __exclude__fields__ = []
 
-    decision_book_pdf_path: Mapped[str] = mapped_column(String)
+    decision_book_pdf_path = mapped_column(String)
-    resp_company_fix_wage: Mapped[float] = mapped_column(
+    resp_company_fix_wage = mapped_column(Numeric(10, 2), server_default="0")  #
-        Numeric(10, 2), server_default="0"
+    is_out_sourced = mapped_column(Boolean, server_default="0")
-    )  #
+    contact_id = mapped_column(ForeignKey("contracts.id"), nullable=True, comment="Contract id")
-    is_out_sourced: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    contact_uu_id = mapped_column(String, nullable=True, comment="Contract UUID")
-    meeting_date: Mapped[TIMESTAMP] = mapped_column(
+    meeting_date = mapped_column(TIMESTAMP, server_default="1900-01-01")
-        TIMESTAMP, server_default="1900-01-01"
+    decision_type = mapped_column(String(3), server_default="RBM")
-    )
+
-    decision_type: Mapped[str] = mapped_column(String(3), server_default="RBM")
+
-    meeting_is_completed: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    meeting_is_completed = mapped_column(Boolean, server_default="0")
-    meeting_completed_date: Mapped[TIMESTAMP] = mapped_column(
+    meeting_completed_date = mapped_column(
         TIMESTAMP, nullable=True, comment="Meeting Completed Date"
     )
 
-    build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"), nullable=False)
+    build_id = mapped_column(ForeignKey("build.id"), nullable=False)
-    build_uu_id: Mapped[str] = mapped_column(
+    build_uu_id = mapped_column(String, nullable=True, comment="Build UUID")
-        String, nullable=True, comment="Build UUID"
+    resp_company_id = mapped_column(ForeignKey("companies.id"))
-    )
+    resp_company_uu_id = mapped_column(String, nullable=True, comment="Company UUID")
-    resp_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
-    resp_company_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Company UUID"
-    )
-    contact_id: Mapped[Identity] = mapped_column(
-        ForeignKey("contracts.id"), nullable=True, comment="Contract id"
-    )
-    contact_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Contract UUID"
-    )
 
     buildings: Mapped["Build"] = relationship(
         "Build",
@@ -106,11 +93,11 @@ class BuildDecisionBook(CrudCollection):
     @classmethod
     def retrieve_active_rbm(cls):
         related_build = Build.find_one(id=cls.build_id)
-        related_date = system_arrow.get(related_build.build_date)
+        related_date = DateTimeLocal.get(str(related_build.build_date))
         date_processed = related_date.replace(
-            year=system_arrow.now().date().year, month=related_date.month, day=1
+            year=DateTimeLocal.now().date().year, month=related_date.month, day=1
         )
-        if system_arrow.now().date() <= date_processed:
+        if DateTimeLocal.now().date() <= date_processed:
             book = cls.filter_active(
                 cls.expiry_ends <= date_processed,
                 cls.decision_type == "RBM",
@@ -124,6 +111,7 @@ class BuildDecisionBook(CrudCollection):
 
     @classmethod
     def select_action(cls, duty_id, token=None):
+        from database_sql_models import Companies
 
         related_companies = Companies.select_action(duty_id=duty_id)
         related_companies_ids = list(
@@ -135,6 +123,7 @@ class BuildDecisionBook(CrudCollection):
 
     @classmethod
     def create_action(cls, data: InsertDecisionBook, token=None):
+        from database_sql_models import Build, Companies
 
         data_dict = data.model_dump()
         if building := Build.find_one(uu_id=data.build_uu_id):
@@ -148,33 +137,25 @@ class BuildDecisionBook(CrudCollection):
                 status_code=status.HTTP_406_NOT_ACCEPTABLE,
                 detail="Building must be given to create decision book.",
             )
-        expiry_starts = system_arrow.get(str(data_dict.get("expiry_starts"))).format(
+        expiry_starts = datetime.strptime(
-            "%Y-%m-%d"
+            str(data_dict.get("expiry_starts")), "%Y-%m-%d"
         )
-        data_dict["expiry_starts"] = str(expiry_starts)
+        expiry_ends = datetime.strptime(str(data_dict.get("expiry_ends")), "%Y-%m-%d")
-        expiry_ends = system_arrow.get(str(data_dict.get("expiry_ends"))).format(
+        data_dict["expiry_ends"] = expiry_ends.replace(
-            "%Y-%m-%d"
+            month=expiry_ends.month + 1, day=1
-        )
+        ) - timedelta(days=1)
-        data_dict["expiry_ends"] = str(
+        decision_book = BuildDecisionBook.filter_active(
-            expiry_ends.replace(month=expiry_ends.month + 1, day=1) - timedelta(days=1)
-        )
-
-        if decision_book := BuildDecisionBook.filter_all(
             BuildDecisionBook.build_id == building.id,
             BuildDecisionBook.expiry_ends > data_dict["expiry_starts"],
             BuildDecisionBook.decision_type == data_dict.get("decision_type"),
-        ).count:  # Decision book is already exist:
+        )  # Decision book is already exist
-            cls.raise_http_exception(
+        if decision_book.count:
-                status_code=status.HTTP_409_CONFLICT,
+            return
-                error_case="RECORDEXITS",
-                message="Decision Book is already exist.",
-                data=decision_book.get_dict(),
-            )
 
-        data_dict["expiry_starts"] = str(expiry_starts.replace(day=1))
+        data_dict["expiry_starts"] = expiry_starts.replace(day=1)
-        data_dict["expiry_ends"] = str(
+        data_dict["expiry_ends"] = expiry_ends.replace(
-            expiry_ends.replace(month=expiry_ends.month + 1, day=1) - timedelta(days=1)
+            month=expiry_ends.month + 1, day=1
-        )
+        ) - timedelta(days=1)
         del data_dict["build_uu_id"], data_dict["resp_company_uu_id"]
         return cls.find_or_create(**data_dict)
 
@@ -193,15 +174,13 @@ class BuildDecisionBook(CrudCollection):
             [True if letter in str(bank_date) else False for letter in ["-", " ", ":"]]
         ):
             bank_date = datetime.strptime(str(bank_date), "%Y-%m-%d %H:%M:%S")
-        date_valid = (
+        date_valid = self.expiry_starts < bank_date < self.expiry_ends
-            system_arrow.get(self.expiry_starts)
-            < system_arrow.get(bank_date)
-            < system_arrow.get(self.expiry_ends)
-        )
         return date_valid and self.active and not self.deleted
 
     @classmethod
     def retrieve_valid_book(cls, bank_date, iban):
+        from database_sql_models import BuildIbans
+
         if all(
             [True if letter in str(bank_date) else False for letter in ["-", " ", ":"]]
         ):
@@ -227,25 +206,19 @@ class BuildDecisionBookInvitations(CrudCollection):
     __tablename__ = "build_decision_book_invitations"
     __exclude__fields__ = []
 
-    build_id: Mapped[int] = mapped_column(Integer, nullable=False)
+    build_id = mapped_column(Integer, nullable=False)
-    build_uu_id: Mapped[str] = mapped_column(
+    build_uu_id = mapped_column(String, nullable=True, comment="Build UUID")
-        String, nullable=True, comment="Build UUID"
+    decision_book_id = mapped_column(
-    )
-    decision_book_id: Mapped[Identity] = mapped_column(
         ForeignKey("build_decision_book.id"), nullable=False
     )
-    decision_book_uu_id: Mapped[str] = mapped_column(
+    decision_book_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book UUID"
     )
 
-    invitation_type: Mapped[str] = mapped_column(
+    invitation_type = mapped_column(String, nullable=False, comment="Invite Type")
-        String, nullable=False, comment="Invite Type"
+    invitation_attempt = mapped_column(SmallInteger, server_default="1")
-    )
+    living_part_count = mapped_column(SmallInteger, server_default="1")
-    invitation_attempt: Mapped[int] = mapped_column(SmallInteger, server_default="1")
+    living_part_percentage = mapped_column(Numeric(10, 2), server_default="0.51")
-    living_part_count: Mapped[int] = mapped_column(SmallInteger, server_default="1")
-    living_part_percentage: Mapped[float] = mapped_column(
-        Numeric(10, 2), server_default="0.51"
-    )
 
     message = mapped_column(Text, nullable=True, comment="Invitation Message")
     planned_date = mapped_column(
@@ -326,7 +299,7 @@ class BuildDecisionBookPerson(CrudCollection):
     __enum_list__ = [("management_typecode", "BuildManagementType", "bm")]
 
     dues_percent_discount = mapped_column(SmallInteger, server_default="0")
-    dues_fix_discount: Mapped[float] = mapped_column(Numeric(10, 2), server_default="0")
+    dues_fix_discount = mapped_column(Numeric(10, 2), server_default="0")
     dues_discount_approval_date = mapped_column(
         TIMESTAMP, server_default="1900-01-01 00:00:00"
     )
@@ -337,9 +310,7 @@ class BuildDecisionBookPerson(CrudCollection):
     confirmed_date = mapped_column(
         TIMESTAMP, nullable=True, comment="Confirmation Date"
     )
-    token: Mapped[str] = mapped_column(
+    token = mapped_column(String, server_default="", comment="Invitation Token")
-        String, server_default="", comment="Invitation Token"
-    )
 
     vicarious_person_id = mapped_column(
         ForeignKey("people.id"), nullable=True, comment="Vicarious Person ID"
@@ -351,9 +322,7 @@ class BuildDecisionBookPerson(CrudCollection):
     invite_id = mapped_column(
         ForeignKey("build_decision_book_invitations.id"), nullable=False
     )
-    invite_uu_id: Mapped[str] = mapped_column(
+    invite_uu_id = mapped_column(String, nullable=False, comment="Invite UUID")
-        String, nullable=False, comment="Invite UUID"
-    )
 
     build_decision_book_id = mapped_column(
         ForeignKey("build_decision_book.id"), nullable=False
@@ -367,8 +336,8 @@ class BuildDecisionBookPerson(CrudCollection):
     build_living_space_uu_id = mapped_column(
         String, nullable=True, comment="Living Space UUID"
     )
-    person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=False)
+    person_id = mapped_column(ForeignKey("people.id"), nullable=False)
-    # person_uu_id: Mapped[str] = mapped_column(String, nullable=False, comment="Person UUID")
+    # person_uu_id = mapped_column(String, nullable=False, comment="Person UUID")
 
     __table_args__ = (
         Index(
@@ -390,9 +359,8 @@ class BuildDecisionBookPerson(CrudCollection):
         return BuildDecisionBookPersonOccupants.filter_active(filter_records=False)
 
     def add_occupant_type(self, occupant_type, build_living_space_id: int = None):
-        from api_events.events.events.events_bind_services import (
+        from database_sql_models import Services
-            ServiceBindOccupantEventMethods,
+        from events.events_bind_services import ServiceBindOccupantEventMethods
-        )
 
         book_dict = dict(
             build_decision_book_person_id=self.id,
@@ -445,10 +413,10 @@ class BuildDecisionBookPerson(CrudCollection):
                     occupant_type_uu_id=str(occupant_type.uu_id),
                     person_id=living_space.person_id,
                     person_uu_id=str(living_space.person_uu_id),
-                    expiry_starts=system_arrow.get(
+                    expiry_starts=DateTimeLocal.get(
                         decision_book.meeting_date
                     ).__str__(),
-                    expiry_ends=system_arrow.get(decision_book.meeting_date)
+                    expiry_ends=DateTimeLocal.get(decision_book.meeting_date)
                     .shift(hours=23)
                     .__str__(),
                     is_confirmed=True,
@@ -458,7 +426,9 @@ class BuildDecisionBookPerson(CrudCollection):
                     build_living_space_id=related_living_space.id,
                     service_id=related_service.id,
                     expires_at=str(
-                        system_arrow.get(decision_book.meeting_date).shift(days=15)
+                        DateTimeLocal.get(decision_book.meeting_date).shift(
+                            days=15
+                        )
                     ),
                 )
             return person_occupants
@@ -504,16 +474,10 @@ class BuildDecisionBookPersonOccupants(CrudCollection):
     invite_id = mapped_column(
         ForeignKey("build_decision_book_invitations.id"), nullable=True
     )
-    invite_uu_id: Mapped[str] = mapped_column(
+    invite_uu_id = mapped_column(String, nullable=True, comment="Invite UUID")
-        String, nullable=True, comment="Invite UUID"
-    )
 
-    occupant_type_id: Mapped[Identity] = mapped_column(
+    occupant_type_id = mapped_column(ForeignKey("occupant_types.id"), nullable=False)
-        ForeignKey("occupant_types.id"), nullable=False
+    occupant_type_uu_id = mapped_column(String, nullable=True, comment="Occupant UUID")
-    )
-    occupant_type_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Occupant UUID"
-    )
 
     __table_args__ = (
         Index(
@@ -549,12 +513,8 @@ class BuildDecisionBookItems(CrudCollection):
         Boolean, server_default="0", comment="Are payment Records Created"
     )
 
-    info_type_id: Mapped[Identity] = mapped_column(
+    info_type_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
+    info_type_uu_id = mapped_column(String, nullable=True, comment="Info Type UUID")
-    )
-    info_type_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Info Type UUID"
-    )
 
     build_decision_book_id = mapped_column(
         ForeignKey("build_decision_book.id"), nullable=False
@@ -576,6 +536,7 @@ class BuildDecisionBookItems(CrudCollection):
 
     @classmethod
     def select_action(cls, duty_id, token=None):
+        from database_sql_models import Companies
 
         related_companies = Companies.select_action(duty_id=duty_id)
         related_companies_ids = list(
@@ -618,6 +579,7 @@ class BuildDecisionBookItems(CrudCollection):
 
     @classmethod
     def check_meeting_is_valid_to_start_add_attendance(cls, decision_book, token_dict):
+        from database_sql_models import OccupantTypes
 
         active_invite = (
             BuildDecisionBookInvitations.check_invites_are_ready_for_meeting(
@@ -766,10 +728,8 @@ class BuildDecisionBookItemsUnapproved(CrudCollection):
     decision_book_item_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book Item"
     )
-    person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=False)
+    person_id = mapped_column(ForeignKey("people.id"), nullable=False)
-    person_uu_id: Mapped[str] = mapped_column(
+    person_uu_id = mapped_column(String, nullable=True, comment="Person UUID")
-        String, nullable=True, comment="Person UUID"
-    )
     build_decision_book_item = mapped_column(
         ForeignKey("build_decision_book_items.id"), nullable=False
     )
@@ -802,18 +762,14 @@ class BuildDecisionBookPayments(CrudCollection):
     payment_amount = mapped_column(
         Numeric(16, 2), nullable=False, comment="Payment Amount"
     )
-    currency: Mapped[str] = mapped_column(String(8), server_default="TRY")
+    currency = mapped_column(String(8), server_default="TRY")
 
-    payment_types_id: Mapped[Identity] = mapped_column(
+    payment_types_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-        ForeignKey("api_enum_dropdown.id"), nullable=True
+    payment_types_uu_id = mapped_column(String, nullable=True, comment="Dues Type UUID")
-    )
-    payment_types_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Dues Type UUID"
-    )
 
-    period_time: Mapped[str] = mapped_column(String(12))
+    period_time = mapped_column(String(12))
-    process_date_y: Mapped[int] = mapped_column(SmallInteger)
+    process_date_y = mapped_column(SmallInteger)
-    process_date_m: Mapped[int] = mapped_column(SmallInteger)
+    process_date_m = mapped_column(SmallInteger)
 
     build_decision_book_item_id = mapped_column(
         ForeignKey("build_decision_book_items.id"),
@@ -824,33 +780,21 @@ class BuildDecisionBookPayments(CrudCollection):
         String, nullable=True, comment="Decision Book Item UUID"
     )
     decision_book_project_id = mapped_column(
-        ForeignKey("build_decision_book_projects.id"),
+        ForeignKey("build_decision_book_projects.id"), nullable=True, comment="Decision Book Project ID"
-        nullable=True,
-        comment="Decision Book Project ID",
     )
     decision_book_project_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book Project UUID"
     )
 
-    build_parts_id: Mapped[Identity] = mapped_column(
+    build_parts_id = mapped_column(ForeignKey("build_parts.id"), nullable=False)
-        ForeignKey("build_parts.id"), nullable=False
+    build_parts_uu_id = mapped_column(String, nullable=True, comment="Build Part UUID")
-    )
-    build_parts_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Build Part UUID"
-    )
 
-    budget_records_id: Mapped[Identity] = mapped_column(
+    budget_records_id = mapped_column(ForeignKey("account_records.id"))
-        ForeignKey("account_records.id")
+    budget_records_uu_id = mapped_column(String, nullable=True, comment="Budget UUID")
-    )
+    accounting_id = mapped_column(ForeignKey("account_detail.id"))
-    budget_records_uu_id: Mapped[str] = mapped_column(
+    accounting_uu_id = mapped_column(String, nullable=True, comment="Accounting UUID")
-        String, nullable=True, comment="Budget UUID"
+    # receive_debit_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-    )
+    # receive_debit_uu_id = mapped_column(String, nullable=True, comment="Debit UUID")
-    accounting_id: Mapped[Identity] = mapped_column(ForeignKey("account_detail.id"))
-    accounting_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Accounting UUID"
-    )
-    # receive_debit_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
-    # receive_debit_uu_id: Mapped[str] = mapped_column(String, nullable=True, comment="Debit UUID")
 
     # accounting: Mapped["AccountDetail"] = relationship(
     #     "AccountDetail",
@@ -907,10 +851,8 @@ class BuildDecisionBookLegal(CrudCollection):
     )
 
     period_stop_date = mapped_column(TIMESTAMP, server_default="2099-12-31 23:59:59")
-    decision_book_pdf_path: Mapped[str] = mapped_column(String(128))
+    decision_book_pdf_path = mapped_column(String(128))
-    resp_company_total_wage: Mapped[float] = mapped_column(
+    resp_company_total_wage = mapped_column(Numeric(10, 2), server_default="0")
-        Numeric(10, 2), server_default="0"
-    )
     contact_agreement_path = mapped_column(String(128))
     contact_agreement_date = mapped_column(
         TIMESTAMP, server_default="1900-01-01 00:00:00"
@@ -919,12 +861,12 @@ class BuildDecisionBookLegal(CrudCollection):
     lawsuits_type = mapped_column(String(1), server_default="C")
     lawsuits_name = mapped_column(String(128))
     lawsuits_note = mapped_column(String(512))
-    lawyer_cost: Mapped[float] = mapped_column(Numeric(20, 2))
+    lawyer_cost = mapped_column(Numeric(20, 2))
-    mediator_lawyer_cost: Mapped[float] = mapped_column(Numeric(20, 2))
+    mediator_lawyer_cost = mapped_column(Numeric(20, 2))
-    other_cost: Mapped[float] = mapped_column(Numeric(20, 2))
+    other_cost = mapped_column(Numeric(20, 2))
-    legal_cost: Mapped[float] = mapped_column(Numeric(20, 2))
+    legal_cost = mapped_column(Numeric(20, 2))
-    approved_cost: Mapped[float] = mapped_column(Numeric(20, 2))
+    approved_cost = mapped_column(Numeric(20, 2))
-    total_price: Mapped[float] = mapped_column(Numeric(20, 2))
+    total_price = mapped_column(Numeric(20, 2))
 
     build_db_item_id = mapped_column(
         ForeignKey("build_decision_book_items.id"), nullable=False
@@ -932,17 +874,13 @@ class BuildDecisionBookLegal(CrudCollection):
     build_db_item_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book Item UUID"
     )
-    resp_attorney_id: Mapped[Identity] = mapped_column(
+    resp_attorney_id = mapped_column(ForeignKey("people.id"), nullable=False)
-        ForeignKey("people.id"), nullable=False
-    )
     resp_attorney_uu_id = mapped_column(String, nullable=True, comment="Attorney UUID")
-    resp_attorney_company_id: Mapped[Identity] = mapped_column(
+    resp_attorney_company_id = mapped_column(ForeignKey("companies.id"))
-        ForeignKey("companies.id")
-    )
     resp_attorney_company_uu_id = mapped_column(
         String, nullable=True, comment="Company UUID"
     )
-    mediator_lawyer_person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    mediator_lawyer_person_id = mapped_column(ForeignKey("people.id"))
     mediator_lawyer_person_uu_id = mapped_column(
         String, nullable=True, comment="Mediator Lawyer UUID"
     )
@@ -964,9 +902,7 @@ class BuildDecisionBookProjects(CrudCollection):
     __tablename__ = "build_decision_book_projects"
     __exclude__fields__ = []
 
-    project_no = mapped_column(
+    project_no = mapped_column(String(12), nullable=True, comment="Project Number of Decision Book")
-        String(12), nullable=True, comment="Project Number of Decision Book"
-    )
     project_name = mapped_column(String, nullable=False, comment="Project Name")
     project_start_date = mapped_column(
         TIMESTAMP, nullable=False, comment="Project Start Date"
@@ -978,45 +914,33 @@ class BuildDecisionBookProjects(CrudCollection):
 
     decision_book_pdf_path = mapped_column(String)
 
-    resp_company_fix_wage: Mapped[float] = mapped_column(
+    resp_company_fix_wage = mapped_column(Numeric(10, 2), server_default="0")
-        Numeric(10, 2), server_default="0"
+    is_out_sourced = mapped_column(Boolean, server_default="0")
-    )
+    contact_id = mapped_column(ForeignKey("contracts.id"), nullable=True, comment="Contract id")
-    is_out_sourced: Mapped[bool] = mapped_column(Boolean, server_default="0")
-    contact_id = mapped_column(
-        ForeignKey("contracts.id"), nullable=True, comment="Contract id"
-    )
     contact_uu_id = mapped_column(String, nullable=True, comment="Contract UUID")
     meeting_date = mapped_column(
         TIMESTAMP, server_default="1900-01-01 00:00:00", index=True
     )
     currency = mapped_column(String(8), server_default="TRY")
-    bid_price: Mapped[float] = mapped_column(Numeric(16, 4), server_default="0")
+    bid_price = mapped_column(Numeric(16, 4), server_default="0")
-    approved_price: Mapped[float] = mapped_column(Numeric(16, 4), server_default="0")
+    approved_price = mapped_column(Numeric(16, 4), server_default="0")
-    final_price: Mapped[float] = mapped_column(Numeric(16, 4), server_default="0")
+    final_price = mapped_column(Numeric(16, 4), server_default="0")
 
-    build_decision_book_id = mapped_column(
+    build_decision_book_id = mapped_column(ForeignKey("build_decision_book.id"), nullable=False)
-        ForeignKey("build_decision_book.id"), nullable=False
-    )
     build_decision_book_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book UUID"
     )
-    build_decision_book_item_id = mapped_column(
+    build_decision_book_item_id = mapped_column(ForeignKey("build_decision_book_items.id"), nullable=False)
-        ForeignKey("build_decision_book_items.id"), nullable=False
-    )
     build_decision_book_item_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book Item UUID"
     )
     project_response_living_space_id = mapped_column(
-        ForeignKey("build_living_space.id"),
+        ForeignKey("build_living_space.id"), nullable=True, comment="Project Response Person ID"
-        nullable=True,
-        comment="Project Response Person ID",
     )
     project_response_living_space_uu_id = mapped_column(
         String, nullable=True, comment="Project Response Person UUID"
     )
-    resp_company_id: Mapped[Identity] = mapped_column(
+    resp_company_id = mapped_column(ForeignKey("companies.id"), nullable=True)
-        ForeignKey("companies.id"), nullable=True
-    )
     resp_company_uu_id = mapped_column(String, nullable=True, comment="Company UUID")
 
     build_decision_book_item: Mapped["BuildDecisionBookItems"] = relationship(
@@ -1027,6 +951,11 @@ class BuildDecisionBookProjects(CrudCollection):
 
     @classmethod
     def select_action(cls, duty_id, token=None):
+        from database_sql_models import (
+            Companies,
+            BuildDecisionBook,
+            BuildDecisionBookItems,
+        )
 
         related_companies = Companies.select_action(duty_id=duty_id)
         related_companies_ids = list(
@@ -1054,6 +983,8 @@ class BuildDecisionBookProjects(CrudCollection):
 
     @classmethod
     def create_action(cls, data: InsertBuildDecisionBookProjects, token=None):
+        from database_sql_models import People, BuildDecisionBookItems, Companies
+
         data_dict = data.dump()
         BuildDecisionBookItems.pre_query = BuildDecisionBookItems.select_action(
             duty_id=token.duty_list["duty_id"]
@@ -1109,9 +1040,9 @@ class BuildDecisionBookProjectPerson(CrudCollection):
     __enum_list__ = [("management_typecode", "ProjectTeamTypes", "PTT-EMP")]
 
     dues_percent_discount = mapped_column(SmallInteger, server_default="0")
-    job_fix_wage: Mapped[float] = mapped_column(Numeric(10, 2), server_default="0")
+    job_fix_wage = mapped_column(Numeric(10, 2), server_default="0")
-    bid_price: Mapped[float] = mapped_column(Numeric(10, 2), server_default="0")
+    bid_price = mapped_column(Numeric(10, 2), server_default="0")
-    decision_price: Mapped[float] = mapped_column(Numeric(10, 2), server_default="0")
+    decision_price = mapped_column(Numeric(10, 2), server_default="0")
 
     build_decision_book_project_id = mapped_column(
         ForeignKey("build_decision_book_projects.id"), nullable=False
@@ -1119,12 +1050,8 @@ class BuildDecisionBookProjectPerson(CrudCollection):
     build_decision_book_project_uu_id = mapped_column(
         String, nullable=True, comment="Decision Book Project UUID"
     )
-    living_space_id: Mapped[Identity] = mapped_column(
+    living_space_id = mapped_column(ForeignKey("build_living_space.id"), nullable=False)
-        ForeignKey("build_living_space.id"), nullable=False
+    living_space_uu_id = mapped_column(String, nullable=True, comment="Living Space UUID")
-    )
-    living_space_uu_id = mapped_column(
-        String, nullable=True, comment="Living Space UUID"
-    )
 
     project_team_type_id = mapped_column(
         ForeignKey("api_enum_dropdown.id"), nullable=True
@@ -1155,7 +1082,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #         Numeric(20, 2), nullable=False, comment="Default Payment Amount"
 #     )
 #
-#     dues_types_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
+#     dues_types_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
 #     dues_types_uu_id = mapped_column(String, nullable=True, comment="Dues Type UUID")
 #     build_decision_book_item_debits_id = mapped_column(
 #         ForeignKey("build_decision_book_item_debits.id"), nullable=False
@@ -1163,7 +1090,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     build_decision_book_item_debits_uu_id = mapped_column(
 #         String, nullable=True, comment="Decision Book Item Debit UUID"
 #     )
-#     build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"), nullable=False)
+#     build_parts_id = mapped_column(ForeignKey("build_parts.id"), nullable=False)
 #     build_parts_uu_id = mapped_column(String, nullable=True, comment="Build Part UUID")
 #
 #     # decision_books_item_debits: Mapped["BuildDecisionBookItemDebits"] = relationship(
@@ -1292,7 +1219,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     __exclude__fields__ = []
 #     __enum_list__ = [("dues_types", "BuildDuesTypes", "D")]
 #
-#     dues_types_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
+#     dues_types_id = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
 #     dues_types_uu_id = mapped_column(String, nullable=True, comment="Dues Type UUID")
 #     # dues_values = mapped_column(
 #     #     MutableDict.as_mutable(JSONB()),
@@ -1305,7 +1232,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     flat_payment = mapped_column(
 #         Numeric(20, 2), nullable=True, comment="Flat Payment Amount"
 #     )
-#     decision_taken: Mapped[bool] = mapped_column(Boolean, server_default="0")
+#     decision_taken = mapped_column(Boolean, server_default="0")
 #
 #     build_decision_book_item_id = mapped_column(
 #         ForeignKey("build_decision_book_items.id"), nullable=False
@@ -1423,15 +1350,15 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #
 #     item_order = mapped_column(SmallInteger, nullable=False, comment="Order Number")
 #     budget_type = mapped_column(String, nullable=False, comment="Budget Type")
-#     plan_value: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False, comment="Plan Value")
+#     plan_value = mapped_column(Numeric(10, 2), nullable=False, comment="Plan Value")
 #
 #     line_comment = mapped_column(String(32), server_default="")
-#     process_date_y: Mapped[int] = mapped_column(SmallInteger)
+#     process_date_y = mapped_column(SmallInteger)
-#     process_date_m: Mapped[int] = mapped_column(SmallInteger)
+#     process_date_m = mapped_column(SmallInteger)
-#     process_date_w: Mapped[int] = mapped_column(SmallInteger)
+#     process_date_w = mapped_column(SmallInteger)
 #     period_time = mapped_column(String(12), server_default="")
 #
-#     build_decision_book_id: Mapped[Identity] = mapped_column(ForeignKey("build_decision_book.id"))
+#     build_decision_book_id = mapped_column(ForeignKey("build_decision_book.id"))
 #     accounting_id = mapped_column(ForeignKey("account_detail.id"))
 #
 #     __table_args__ = (
@@ -1450,7 +1377,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #
 #     paid_date = mapped_column(TIMESTAMP, nullable=False, comment="Payment Due Date")
 #     period_time = mapped_column(String(12), server_default="")
-#     paid_value: Mapped[float] = mapped_column(Numeric(10, 2), server_default="0")
+#     paid_value = mapped_column(Numeric(10, 2), server_default="0")
 #
 #     build_decision_book_budget_id = mapped_column(
 #         ForeignKey("build_decision_book_budget.id"), nullable=False
@@ -1639,7 +1566,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     person_uu_id = mapped_column(String, nullable=False, comment="Person UUID")
 #
 #     send_date = mapped_column(TIMESTAMP, nullable=False, comment="Confirmation Date")
-#     is_confirmed: Mapped[bool] = mapped_column(Boolean, server_default="0", comment="Message is Confirmed")
+#     is_confirmed = mapped_column(Boolean, server_default="0", comment="Message is Confirmed")
 #     confirmed_date = mapped_column(TIMESTAMP, nullable=True, comment="Confirmation Date")
 #     token = mapped_column(String, server_default="", comment="Invitation Token")
 #

databases/sql_models/company/company.py

@@ -1,22 +1,14 @@
 from fastapi.exceptions import HTTPException
-
-from databases import (
-    Addresses,
-    Duties,
-)
 from databases.sql_models.core_mixin import CrudCollection
 
-from sqlalchemy import String, Integer, Boolean, ForeignKey, Index, Identity
+from sqlalchemy import String, Integer, Boolean, ForeignKey, Index
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
 
 from api_configs import RelationAccess
-from databases.extensions import SelectAction, Explanation
+from application.shared_classes import SelectAction, Explanation
-from api_validations.validations_request import (
+from validations import InsertCompany, UpdateCompany
-    InsertCompany,
+from validations.company import MatchCompany2Company
-    UpdateCompany,
+from valids.auth.token_validations import EmployeeTokenObject
-    MatchCompany2Company,
-)
-from api_objects.auth.token_objects import EmployeeTokenObject
 
 
 class RelationshipDutyCompany(CrudCollection):
@@ -36,25 +28,19 @@ class RelationshipDutyCompany(CrudCollection):
     __exclude__fields__ = []
     __access_by__ = RelationAccess.SuperAccessList
 
-    owner_id: Mapped[Identity] = mapped_column(
+    owner_id = mapped_column(ForeignKey("companies.id"), nullable=False)  # 1
-        ForeignKey("companies.id"), nullable=False
+    duties_id = mapped_column(
-    )  # 1
-    duties_id: Mapped[Identity] = mapped_column(
         ForeignKey("duties.id"), nullable=False
     )  # duty -> (n)employee Evyos LTD
 
-    member_id: Mapped[Identity] = mapped_column(
+    member_id = mapped_column(ForeignKey("companies.id"), nullable=False)  # 2, 3, 4
-        ForeignKey("companies.id"), nullable=False
+    parent_id = mapped_column(ForeignKey("companies.id"), nullable=True)  # None
-    )  # 2, 3, 4
-    parent_id: Mapped[Identity] = mapped_column(
-        ForeignKey("companies.id"), nullable=True
-    )  # None
 
-    relationship_type: Mapped[str] = mapped_column(
+    relationship_type = mapped_column(
         String, nullable=True, server_default="Commercial"
     )  # Commercial, Organization # Bulk
-    child_count: Mapped[int] = mapped_column(Integer)  # 0
+    child_count = mapped_column(Integer)  # 0
-    show_only: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    show_only = mapped_column(Boolean, server_default="0")
 
     # related_company: Mapped[List["Companies"]] = relationship(
     #     "Companies",
@@ -64,6 +50,7 @@ class RelationshipDutyCompany(CrudCollection):
 
     @classmethod
     def match_company_to_company_commercial(cls, data: MatchCompany2Company, token):
+        from database_sql_models import Companies, Duties
 
         token_duties_id, token_company_id = token.get("duty_id"), token.get(
             "company_id"
@@ -103,6 +90,7 @@ class RelationshipDutyCompany(CrudCollection):
 
     @classmethod
     def match_company_to_company_organization(cls, data: MatchCompany2Company, token):
+        from database_sql_models import Companies, Duties
 
         token_duties_id, token_company_id = token.get("duty_id"), token.get(
             "company_id"
@@ -131,10 +119,7 @@ class RelationshipDutyCompany(CrudCollection):
             list_match_company_id.append(bulk_company)
 
         for match_company_id in list_match_company_id:
-            Duties.init_a_company_default_duties(
+            Duties.init_a_company_default_duties(company_id=match_company_id.id)
-                company_id=match_company_id.id,
-                company_uu_id=str(match_company_id.uu_id),
-            )
             RelationshipDutyCompany.find_or_create(
                 owner_id=token_company_id,
                 duties_id=send_user_duties.id,
@@ -318,29 +303,23 @@ class Companies(CrudCollection, SelectAction):
     __many__table__ = RelationshipDutyCompany
     __explain__ = AbstractCompany()
 
-    formal_name: Mapped[str] = mapped_column(
+    formal_name = mapped_column(String, nullable=False, comment="Formal Name")
-        String, nullable=False, comment="Formal Name"
+    company_type = mapped_column(String, nullable=False, comment="Company Type")
-    )
+    commercial_type = mapped_column(String, nullable=False, comment="Commercial Type")
-    company_type: Mapped[str] = mapped_column(
+    tax_no = mapped_column(
-        String, nullable=False, comment="Company Type"
-    )
-    commercial_type: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Commercial Type"
-    )
-    tax_no: Mapped[str] = mapped_column(
         String, index=True, unique=True, nullable=False, comment="Tax No"
     )
 
-    public_name: Mapped[str] = mapped_column(String, comment="Public Name of a company")
+    public_name = mapped_column(String, comment="Public Name of a company")
-    company_tag: Mapped[str] = mapped_column(String, comment="Company Tag")
+    company_tag = mapped_column(String, comment="Company Tag")
-    default_lang_type: Mapped[str] = mapped_column(String, server_default="TR")
+    default_lang_type = mapped_column(String, server_default="TR")
-    default_money_type: Mapped[str] = mapped_column(String, server_default="TL")
+    default_money_type = mapped_column(String, server_default="TL")
-    is_commercial: Mapped[bool] = mapped_column(Boolean, server_default="False")
+    is_commercial = mapped_column(Boolean, server_default="False")
-    is_blacklist: Mapped[bool] = mapped_column(Boolean, server_default="False")
+    is_blacklist = mapped_column(Boolean, server_default="False")
     parent_id = mapped_column(Integer, nullable=True)
-    workplace_no: Mapped[str] = mapped_column(String, nullable=True)
+    workplace_no = mapped_column(String, nullable=True)
 
-    official_address_id: Mapped[Identity] = mapped_column(ForeignKey("addresses.id"))
+    official_address_id = mapped_column(ForeignKey("addresses.id"))
     official_address_uu_id = mapped_column(
         String, nullable=True, comment="Official Address UUID"
     )
@@ -368,13 +347,13 @@ class Companies(CrudCollection, SelectAction):
         from databases import Addresses, Duties
 
         data_dict = data.model_dump()
-        if cls.filter_one(cls.tax_no == str(data.tax_no).strip()):
+        if cls.filter_one(cls.tax_no==str(data.tax_no).strip()):
             raise Exception(
                 "Company already exists. Please ask supervisor to make company visible for your duty."
             )
 
         official_address = Addresses.filter_one(
-            Addresses.uu_id == data.official_address_uu_id
+            Addresses.uu_id==data.official_address_uu_id
         )
         if not official_address:
             raise HTTPException(
@@ -423,6 +402,8 @@ class Companies(CrudCollection, SelectAction):
 
     @classmethod
     def update_action(cls, data: UpdateCompany, token):
+        from database_sql_models import Addresses
+
         data_dict = data.excluded_dump()
         duty_id = token.get("duty_id")
         company_id = token.get("company_id")
@@ -431,7 +412,7 @@ class Companies(CrudCollection, SelectAction):
             data_dict["official_address_id"] = official_address.id
         del data_dict["official_address_uu_id"], data_dict["company_uu_id"]
         company_to_update = cls.select_action(
-            duty_id_list=[duty_id],
+            duty_id=duty_id,
             filter_expr=[
                 cls.uu_id == data.company_uu_id,
                 RelationshipDutyCompany.parent_id == company_id,

databases/sql_models/company/department.py

@@ -1,5 +1,5 @@
-from sqlalchemy import String, Integer, ForeignKey, Index, Boolean, Identity
+from sqlalchemy import String, Integer, ForeignKey, Index, Boolean
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
 
 from databases.sql_models.core_mixin import CrudCollection
 
@@ -13,17 +13,13 @@ class Departments(CrudCollection):
     department_code = mapped_column(
         String(16), nullable=False, index=True, comment="Department Code"
     )
-    department_name: Mapped[str] = mapped_column(
+    department_name = mapped_column(
         String(128), nullable=False, comment="Department Name"
     )
-    department_description: Mapped[str] = mapped_column(String, server_default="")
+    department_description = mapped_column(String, server_default="")
 
-    company_id: Mapped[Identity] = mapped_column(
+    company_id = mapped_column(ForeignKey("companies.id"), nullable=False)
-        ForeignKey("companies.id"), nullable=False
+    company_uu_id = mapped_column(String, nullable=False, comment="Company UUID")
-    )
-    company_uu_id: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Company UUID"
-    )
 
     # @classmethod
     # def create_action(cls, data: DepartmentsPydantic, token):
@@ -39,11 +35,9 @@ class Duty(CrudCollection):
     __tablename__ = "duty"
     __exclude__fields__ = []
 
-    duty_name: Mapped[str] = mapped_column(
+    duty_name = mapped_column(String, unique=True, nullable=False, comment="Duty Name")
-        String, unique=True, nullable=False, comment="Duty Name"
+    duty_code = mapped_column(String, nullable=False, comment="Duty Code")
-    )
+    duty_description = mapped_column(String, comment="Duty Description")
-    duty_code: Mapped[str] = mapped_column(String, nullable=False, comment="Duty Code")
-    duty_description: Mapped[str] = mapped_column(String, comment="Duty Description")
 
     # @classmethod
     # def create_action(cls, data: InsertCompanyDuty, token):
@@ -66,21 +60,15 @@ class Duties(CrudCollection):
     users_default_duty = mapped_column(
         ForeignKey("duty.id"), nullable=True, comment="Default Duty for Users"
     )
-    company_id: Mapped[int] = mapped_column(Integer)
+    company_id = mapped_column(Integer)
-    company_uu_id: Mapped[str] = mapped_column(
+    company_uu_id = mapped_column(String, nullable=False, comment="Company UUID")
-        String, nullable=False, comment="Company UUID"
+    duties_id = mapped_column(ForeignKey("duty.id"), nullable=False)
-    )
+    duties_uu_id = mapped_column(String, nullable=False, comment="Duty UUID")
-    duties_id: Mapped[Identity] = mapped_column(ForeignKey("duty.id"), nullable=False)
-    duties_uu_id: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Duty UUID"
-    )
     department_id = mapped_column(
         ForeignKey("departments.id"), nullable=False, comment="Department ID"
     )
-    department_uu_id: Mapped[str] = mapped_column(
+    department_uu_id = mapped_column(String, nullable=False, comment="Department UUID")
-        String, nullable=False, comment="Department UUID"
+    # priority_id = mapped_column(ForeignKey("priority.id"), nullable=True)
-    )
-    # priority_id: Mapped[Identity] = mapped_column(ForeignKey("priority.id"), nullable=True)
     management_duty = mapped_column(
         Boolean, server_default="0"
     )  # is this a prime Company Duty ???

databases/sql_models/company/employee.py

@@ -3,12 +3,11 @@ from sqlalchemy import (
     ForeignKey,
     Index,
     Numeric,
-    Identity,
 )
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
 from databases.sql_models.core_mixin import CrudCollection
 
-from api_validations.validations_request import InsertCompanyEmployees
+from validations import InsertCompanyEmployees
 
 
 class Staff(CrudCollection):
@@ -16,20 +15,14 @@ class Staff(CrudCollection):
     __tablename__ = "staff"
     __exclude__fields__ = []
 
-    staff_description: Mapped[str] = mapped_column(
+    staff_description = mapped_column(
         String, server_default="", comment="Staff Description"
     )
-    staff_name: Mapped[str] = mapped_column(
+    staff_name = mapped_column(String, nullable=False, comment="Staff Name")
-        String, nullable=False, comment="Staff Name"
+    staff_code = mapped_column(String, nullable=False, comment="Staff Code")
-    )
-    staff_code: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Staff Code"
-    )
 
-    duties_id: Mapped[Identity] = mapped_column(ForeignKey("duties.id"), nullable=False)
+    duties_id = mapped_column(ForeignKey("duties.id"), nullable=False)
-    duties_uu_id: Mapped[str] = mapped_column(
+    duties_uu_id = mapped_column(String, nullable=False, comment="Duty UUID")
-        String, nullable=False, comment="Duty UUID"
-    )
 
     # people: Mapped["People"] = relationship(
     #     "People", back_populates="employees", foreign_keys=[people_id], uselist=True
@@ -40,7 +33,7 @@ class Staff(CrudCollection):
 
     @classmethod
     def create_action(cls, data: InsertCompanyEmployees):
-        from databases import Duties
+        from database_sql_models import Duties
 
         data_dict = data.model_dump()
         if duty := Duties.find_one(uu_id=data.duty_uu_id):
@@ -63,14 +56,10 @@ class Employees(CrudCollection):
     __tablename__ = "employees"
     __exclude__fields__ = []
 
-    staff_id: Mapped[Identity] = mapped_column(ForeignKey("staff.id"))
+    staff_id = mapped_column(ForeignKey("staff.id"))
-    staff_uu_id: Mapped[str] = mapped_column(
+    staff_uu_id = mapped_column(String, nullable=False, comment="Staff UUID")
-        String, nullable=False, comment="Staff UUID"
+    people_id = mapped_column(ForeignKey("people.id"), nullable=True)
-    )
+    people_uu_id = mapped_column(String, nullable=True, comment="People UUID")
-    people_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=True)
-    people_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="People UUID"
-    )
 
     __table_args__ = (
         Index("employees_ndx_00", people_id, staff_id, unique=True),
@@ -83,18 +72,12 @@ class EmployeeHistory(CrudCollection):
     __tablename__ = "employee_history"
     __exclude__fields__ = []
 
-    staff_id: Mapped[Identity] = mapped_column(
+    staff_id = mapped_column(ForeignKey("staff.id"), nullable=False, comment="Staff ID")
-        ForeignKey("staff.id"), nullable=False, comment="Staff ID"
+    staff_uu_id = mapped_column(String, nullable=False, comment="Staff UUID")
-    )
+    people_id = mapped_column(
-    staff_uu_id: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Staff UUID"
-    )
-    people_id: Mapped[Identity] = mapped_column(
         ForeignKey("people.id"), nullable=False, comment="People ID"
     )
-    people_uu_id: Mapped[str] = mapped_column(
+    people_uu_id = mapped_column(String, nullable=False, comment="People UUID")
-        String, nullable=False, comment="People UUID"
-    )
 
     __table_args__ = (
         Index("_employee_history_ndx_00", people_id, staff_id),
@@ -107,17 +90,11 @@ class EmployeesSalaries(CrudCollection):
     __tablename__ = "employee_salaries"
     __exclude__fields__ = []
 
-    gross_salary: Mapped[float] = mapped_column(
+    gross_salary = mapped_column(Numeric(20, 6), nullable=False, comment="Gross Salary")
-        Numeric(20, 6), nullable=False, comment="Gross Salary"
+    net_salary = mapped_column(Numeric(20, 6), nullable=False, comment="Net Salary")
-    )
-    net_salary: Mapped[float] = mapped_column(
-        Numeric(20, 6), nullable=False, comment="Net Salary"
-    )
 
-    people_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=False)
+    people_id = mapped_column(ForeignKey("people.id"), nullable=False)
-    people_uu_id: Mapped[str] = mapped_column(
+    people_uu_id = mapped_column(String, nullable=False, comment="People UUID")
-        String, nullable=False, comment="People UUID"
-    )
 
     # people: Mapped["People"] = relationship(
     #     "People", back_populates="employee_salaries", foreign_keys=[people_id]

databases/sql_models/core_mixin.py

@@ -67,12 +67,8 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
     creds: Credentials = None  # The credentials to use in the model.
     client_arrow: DateTimeLocal = None  # The arrow to use in the model.
 
-    expiry_starts: Mapped[TIMESTAMP] = mapped_column(
+    expiry_starts: Mapped[TIMESTAMP] = mapped_column(TIMESTAMP, server_default=func.now(), nullable=False)
-        TIMESTAMP, server_default=func.now(), nullable=False
+    expiry_ends: Mapped[TIMESTAMP] = mapped_column(TIMESTAMP, default="2099-12-31", server_default="2099-12-31")
-    )
-    expiry_ends: Mapped[TIMESTAMP] = mapped_column(
-        TIMESTAMP, default="2099-12-31", server_default="2099-12-31"
-    )
 
     @classmethod
     def extract_system_fields(cls, filter_kwargs: dict, create: bool = True):
@@ -80,9 +76,7 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
         Extracts the system fields from the given attributes.
         """
         system_fields = filter_kwargs.copy()
-        extract_fields = (
+        extract_fields = cls.__system__fields__create__ if create else cls.__system__fields__update__
-            cls.__system__fields__create__ if create else cls.__system__fields__update__
-        )
         for field in extract_fields:
             system_fields.pop(field, None)
         return system_fields
@@ -90,7 +84,6 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
     @classmethod
     def find_or_create(cls, **kwargs):
         from api_library.date_time_actions.date_functions import system_arrow
-
         """
         Finds a record with the given attributes or creates it if it doesn't exist.
         If found, sets is_found to True, otherwise False.
@@ -170,9 +163,7 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
         self.flush()
         return self
 
-    def get_dict(
+    def get_dict(self, exclude: list = None, include: list = None, include_joins: list = None):
-        self, exclude: list = None, include: list = None, include_joins: list = None
-    ):
         return_dict = {}
         if exclude:
             exclude.extend(list(set(self.__exclude__fields__).difference(exclude)))
@@ -198,7 +189,7 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
             for record in self.__class__.__dict__
             if "_" not in record[0] and "id" not in record[-2:]
         ]
-
+        include_joins = include_joins or []
         for all_argument in all_arguments:
             column = getattr(self.__class__, all_argument)
             is_populate = isinstance(column, InstrumentedAttribute) and not hasattr(
@@ -272,4 +263,4 @@ class CrudCollection(CrudMixin, BaseMixin, SmartQueryMixin):
     deleted: Mapped[bool] = mapped_column(Boolean, server_default="0")
     active: Mapped[bool] = mapped_column(Boolean, server_default="1")
     is_notification_send: Mapped[bool] = mapped_column(Boolean, server_default="0")
-    is_email_send: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    is_email_send: Mapped[bool] = mapped_column(Boolean, server_default="0")

databases/sql_models/event/event.py

@@ -8,9 +8,8 @@ from sqlalchemy import (
     Boolean,
     Integer,
     Index,
-    Identity,
 )
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column
 
 
 class Events(CrudCollection):
@@ -22,30 +21,20 @@ class Events(CrudCollection):
     __tablename__ = "events"
     __exclude__fields__ = []
 
-    event_type: Mapped[str] = mapped_column(String, nullable=False, comment="default")
+    event_type = mapped_column(String, nullable=False, comment="default")
-    function_code: Mapped[str] = mapped_column(
+    function_code = mapped_column(String, nullable=False, comment="function code")
-        String, nullable=False, comment="function code"
+    function_class = mapped_column(String, nullable=False, comment="class name")
-    )
-    function_class: Mapped[str] = mapped_column(
-        String, nullable=False, comment="class name"
-    )
 
-    # name: Mapped[str] = mapped_column(String, nullable=True)  # form or page title
+    # name = mapped_column(String, nullable=True)  # form or page title
-    description: Mapped[str] = mapped_column(
+    description = mapped_column(String, server_default="")  # form or page description
-        String, server_default=""
+    property_description = mapped_column(String, server_default="")
-    )  # form or page description
-    property_description: Mapped[str] = mapped_column(String, server_default="")
 
     marketing_layer = mapped_column(SmallInteger, server_default="3")
-    cost: Mapped[float] = mapped_column(Numeric(20, 2), server_default="0.00")
+    cost = mapped_column(Numeric(20, 2), server_default="0.00")
-    unit_price: Mapped[float] = mapped_column(Numeric(20, 2), server_default="0.00")
+    unit_price = mapped_column(Numeric(20, 2), server_default="0.00")
 
-    endpoint_id: Mapped[Identity] = mapped_column(
+    endpoint_id = mapped_column(ForeignKey("endpoint_restriction.id"), nullable=True)
-        ForeignKey("endpoint_restriction.id"), nullable=True
+    endpoint_uu_id = mapped_column(String, nullable=True, comment="Endpoint UUID")
-    )
-    endpoint_uu_id: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Endpoint UUID"
-    )
 
     __table_args__ = ({"comment": "Events Information"},)
 
@@ -58,13 +47,9 @@ class Modules(CrudCollection):
     __tablename__ = "modules"
     __exclude__fields__ = []
 
-    module_name: Mapped[str] = mapped_column(
+    module_name = mapped_column(String, nullable=False, comment="Module Name")
-        String, nullable=False, comment="Module Name"
+    module_description = mapped_column(String, server_default="")
-    )
+    module_code = mapped_column(String, nullable=False, comment="Module Code")
-    module_description: Mapped[str] = mapped_column(String, server_default="")
-    module_code: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Module Code"
-    )
     module_layer = mapped_column(Integer, nullable=False, comment="Module Layer")
     is_default_module = mapped_column(Boolean, server_default="0")
 
@@ -92,20 +77,12 @@ class Services(CrudCollection):
     __tablename__ = "services"
     __exclude__fields__ = []
 
-    module_id: Mapped[Identity] = mapped_column(
+    module_id = mapped_column(ForeignKey("modules.id"), nullable=False)
-        ForeignKey("modules.id"), nullable=False
+    module_uu_id = mapped_column(String, nullable=False, comment="Module UUID")
-    )
+    service_name = mapped_column(String, nullable=False, comment="Service Name")
-    module_uu_id: Mapped[str] = mapped_column(
+    service_description = mapped_column(String, server_default="")
-        String, nullable=False, comment="Module UUID"
+    service_code = mapped_column(String, nullable=True, comment="Service Code")
-    )
+    related_responsibility = mapped_column(String, server_default="")
-    service_name: Mapped[str] = mapped_column(
-        String, nullable=False, comment="Service Name"
-    )
-    service_description: Mapped[str] = mapped_column(String, server_default="")
-    service_code: Mapped[str] = mapped_column(
-        String, nullable=True, comment="Service Code"
-    )
-    related_responsibility: Mapped[str] = mapped_column(String, server_default="")
 
     __table_args__ = ({"comment": "Services Information"},)
 
@@ -118,11 +95,9 @@ class Service2Events(CrudCollection):
     __tablename__ = "services2events"
     __exclude__fields__ = []
 
-    service_id: Mapped[Identity] = mapped_column(
+    service_id = mapped_column(ForeignKey("services.id"), nullable=False)
-        ForeignKey("services.id"), nullable=False
-    )
     service_uu_id = mapped_column(String, nullable=False, comment="Service UUID")
-    event_id: Mapped[Identity] = mapped_column(ForeignKey("events.id"), nullable=False)
+    event_id = mapped_column(ForeignKey("events.id"), nullable=False)
     event_uu_id = mapped_column(String, nullable=False, comment="Event UUID")
 
     __table_args__ = ({"comment": "Service2Events Information"},)
@@ -169,7 +144,7 @@ class Event2Occupant(CrudCollection):
     build_living_space_uu_id = mapped_column(
         String, nullable=False, comment="Build Living Space UUID"
     )
-    event_id: Mapped[Identity] = mapped_column(ForeignKey("events.id"), nullable=False)
+    event_id = mapped_column(ForeignKey("events.id"), nullable=False)
     event_uu_id = mapped_column(String, nullable=False, comment="Event UUID")
 
     __table_args__ = (
@@ -205,19 +180,13 @@ class ModulePrice(CrudCollection):
     __exclude__fields__ = []
 
     campaign_code = mapped_column(String, nullable=False, comment="Campaign Code")
-    module_id: Mapped[Identity] = mapped_column(
+    module_id = mapped_column(ForeignKey("modules.id"), nullable=False)
-        ForeignKey("modules.id"), nullable=False
-    )
     module_uu_id = mapped_column(String, nullable=False, comment="Module UUID")
-    service_id: Mapped[Identity] = mapped_column(
+    service_id = mapped_column(ForeignKey("services.id"), nullable=False)
-        ForeignKey("services.id"), nullable=False
-    )
     service_uu_id = mapped_column(String, nullable=False, comment="Service UUID")
-    event_id: Mapped[Identity] = mapped_column(ForeignKey("events.id"), nullable=False)
+    event_id = mapped_column(ForeignKey("events.id"), nullable=False)
     event_uu_id = mapped_column(String, nullable=False, comment="Event UUID")
-    is_counted_percentage: Mapped[float] = mapped_column(
+    is_counted_percentage = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
-        Numeric(6, 2), server_default="0.00"
-    )  # %22
     discounted_price = mapped_column(
         Numeric(20, 2), server_default="0.00"
     )  # Normal: 78.00 TL
@@ -238,7 +207,7 @@ class ModulePrice(CrudCollection):
 #     __tablename__ = "modules2_occupant"
 #
 #
-#     discounted_percentage: Mapped[float] = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
+#     discounted_percentage = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
 #     discounted_price = mapped_column(
 #         Numeric(20, 2), server_default="0.00"
 #     )  # Normal: 78.00 TL
@@ -261,7 +230,7 @@ class ModulePrice(CrudCollection):
 #
 #     __tablename__ = "modules2_employee"
 #
-#     discounted_percentage: Mapped[float] = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
+#     discounted_percentage = mapped_column(Numeric(6, 2), server_default="0.00")  # %22
 #     discounted_price = mapped_column(
 #         Numeric(20, 2), server_default="0.00"
 #     )  # Normal: 78.00 TL

databases/sql_models/identity/identity.py

@@ -5,8 +5,7 @@ from datetime import timedelta
 from fastapi import HTTPException
 
 from databases.sql_models.core_mixin import CrudCollection
-from databases.extensions import SelectAction, SelectActionWithEmployee
+from application.shared_classes import SelectAction, SelectActionWithEmployee
-from databases import Employees, Duties
 
 from sqlalchemy import (
     String,
@@ -20,12 +19,11 @@ from sqlalchemy import (
     Integer,
     Text,
     or_,
-    Identity,
 )
-from sqlalchemy.orm import mapped_column, relationship, Mapped
+from sqlalchemy.orm import mapped_column, relationship
 
-from api_validations.validations_request import InsertUsers, InsertPerson
+from validations import InsertUsers, InsertPerson
-from databases.extensions.auth import UserLoginModule
+from extensions.auth.login import UserLoginModule
 
 
 class UsersTokens(CrudCollection):
@@ -33,11 +31,11 @@ class UsersTokens(CrudCollection):
     __tablename__ = "users_tokens"
     __exclude__fields__ = []
 
-    user_id: Mapped[Identity] = mapped_column(ForeignKey("users.id"), nullable=False)
+    user_id = mapped_column(ForeignKey("users.id"), nullable=False)
 
-    token_type: Mapped[str] = mapped_column(String(16), server_default="RememberMe")
+    token_type = mapped_column(String(16), server_default="RememberMe")
-    token: Mapped[str] = mapped_column(String, server_default="")
+    token = mapped_column(String, server_default="")
-    domain: Mapped[str] = mapped_column(String, server_default="")
+    domain = mapped_column(String, server_default="")
     expires_at = mapped_column(TIMESTAMP, default=str(DateTimeLocal.shift(days=3)))
 
     # users = relationship("Users", back_populates="tokens", foreign_keys=[user_id])
@@ -71,16 +69,14 @@ class Users(CrudCollection, UserLoginModule, SelectAction):
         comment="Email 1/ Phone 2/ User Tag 3 All 111 Only 100",
     )
 
-    avatar: Mapped[str] = mapped_column(
+    avatar = mapped_column(String, server_default="", comment="Avatar URL for the user")
-        String, server_default="", comment="Avatar URL for the user"
+    hash_password = mapped_column(
-    )
-    hash_password: Mapped[str] = mapped_column(
         String(256), server_default="", comment="Hashed password for security"
     )
-    password_token: Mapped[str] = mapped_column(
+    password_token = mapped_column(
         String(256), server_default="", comment="Token for password reset"
     )
-    remember_me: Mapped[bool] = mapped_column(
+    remember_me = mapped_column(
         Boolean, server_default="0", comment="Flag to remember user login"
     )
 
@@ -96,7 +92,7 @@ class Users(CrudCollection, UserLoginModule, SelectAction):
         server_default=func.now(),
         comment="Timestamp when password expiry begins",
     )
-    related_company: Mapped[str] = mapped_column(String, comment="Related Company UUID")
+    related_company = mapped_column(String, comment="Related Company UUID")
 
     person_id = mapped_column(
         ForeignKey("people.id"), nullable=False, comment="Foreign key to person table"
@@ -218,6 +214,8 @@ class Users(CrudCollection, UserLoginModule, SelectAction):
     #     }
 
     def get_employee_and_duty_details(self):
+        from database_sql_models.company.employee import Employees
+        from database_sql_models.company.department import Duties
 
         found_person = People.find_one(id=self.person_id)
         found_employees = Employees.filter_by_active(
@@ -267,20 +265,16 @@ class RelationshipDutyPeople(CrudCollection):
     __exclude__fields__ = []
     __access_by__ = RelationAccess.SuperAccessList
 
-    company_id: Mapped[Identity] = mapped_column(
+    company_id = mapped_column(ForeignKey("companies.id"), nullable=False)  # 1, 2, 3
-        ForeignKey("companies.id"), nullable=False
-    )  # 1, 2, 3
     duties_id = mapped_column(
         ForeignKey("duties.id"), nullable=False
     )  # duty -> (n)person Evyos LTD
-    member_id: Mapped[Identity] = mapped_column(
+    member_id = mapped_column(ForeignKey("people.id"), nullable=False)  # 2, 3, 4
-        ForeignKey("people.id"), nullable=False
-    )  # 2, 3, 4
 
     relationship_type = mapped_column(
         String, nullable=True, server_default="Employee"
     )  # Commercial
-    show_only: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    show_only = mapped_column(Boolean, server_default="0")
 
     # related_company: Mapped[List["Company"]] = relationship(
     #     "Company",
@@ -319,45 +313,43 @@ class People(CrudCollection, SelectAction):
         "tax_no",
     ]
 
-    firstname: Mapped[str] = mapped_column(
+    firstname = mapped_column(
         String, nullable=False, comment="First name of the person"
     )
-    surname: Mapped[str] = mapped_column(
+    surname = mapped_column(String(24), nullable=False, comment="Surname of the person")
-        String(24), nullable=False, comment="Surname of the person"
+    middle_name = mapped_column(
-    )
-    middle_name: Mapped[str] = mapped_column(
         String, server_default="", comment="Middle name of the person"
     )
-    sex_code: Mapped[str] = mapped_column(
+    sex_code = mapped_column(
         String(1), nullable=False, comment="Sex code of the person (e.g., M/F)"
     )
-    person_ref: Mapped[str] = mapped_column(
+    person_ref = mapped_column(
         String, server_default="", comment="Reference ID for the person"
     )
-    person_tag: Mapped[str] = mapped_column(
+    person_tag = mapped_column(
         String, server_default="", comment="Unique tag for the person"
     )
 
     # ENCRYPT DATA
-    father_name: Mapped[str] = mapped_column(
+    father_name = mapped_column(
         String, server_default="", comment="Father's name of the person"
     )
-    mother_name: Mapped[str] = mapped_column(
+    mother_name = mapped_column(
         String, server_default="", comment="Mother's name of the person"
     )
-    country_code: Mapped[str] = mapped_column(
+    country_code = mapped_column(
         String(4), server_default="TR", comment="Country code of the person"
     )
-    national_identity_id: Mapped[str] = mapped_column(
+    national_identity_id = mapped_column(
         String, server_default="", comment="National identity ID of the person"
     )
-    birth_place: Mapped[str] = mapped_column(
+    birth_place = mapped_column(
         String, server_default="", comment="Birth place of the person"
     )
     birth_date = mapped_column(
         TIMESTAMP, server_default="1900-01-01", comment="Birth date of the person"
     )
-    tax_no: Mapped[str] = mapped_column(
+    tax_no = mapped_column(
         String, server_default="", comment="Tax number of the person"
     )
     # ENCRYPT DATA
@@ -374,12 +366,15 @@ class People(CrudCollection, SelectAction):
         {"comment": "Person Information"},
     )
 
+
     @property
     def full_name(self):
         return f"{self.firstname} {self.middle_name} {self.surname}"
 
     @classmethod
     def create_action(cls, data: InsertPerson, token):
+        from database_sql_models import Duties
+
         token_duties_id, token_company_id = (
             token.selected_company.duty_id,
             token.selected_company.company_id,
@@ -422,20 +417,14 @@ class RelationshipEmployee2PostCode(CrudCollection):
     __exclude__fields__ = []
     __include__fields__ = []
 
-    company_id: Mapped[Identity] = mapped_column(
+    company_id = mapped_column(ForeignKey("companies.id"), nullable=True)  # 1, 2, 3
-        ForeignKey("companies.id"), nullable=True
+    employee_id = mapped_column(ForeignKey("employees.id"), nullable=False)
-    )  # 1, 2, 3
+    member_id = mapped_column(ForeignKey("address_postcode.id"), nullable=False)
-    employee_id: Mapped[Identity] = mapped_column(
-        ForeignKey("employees.id"), nullable=False
-    )
-    member_id: Mapped[Identity] = mapped_column(
-        ForeignKey("address_postcode.id"), nullable=False
-    )
 
     relationship_type = mapped_column(
         String, nullable=True, server_default="Employee"
     )  # Commercial
-    show_only: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    show_only = mapped_column(Boolean, server_default="0")
 
     __table_args__ = ({"comment": "Build2Employee Relationship Information"},)
 
@@ -450,7 +439,7 @@ class AddressPostcode(CrudCollection, SelectActionWithEmployee):
     __access_by__ = []
     __many__table__ = RelationshipEmployee2PostCode
 
-    street_id: Mapped[Identity] = mapped_column(ForeignKey("address_street.id"))
+    street_id = mapped_column(ForeignKey("address_street.id"))
     street_uu_id = mapped_column(String, server_default="", comment="Street UUID")
     postcode = mapped_column(String(32), nullable=False, comment="Postcode")
 
@@ -473,12 +462,10 @@ class Addresses(CrudCollection):
     letter_address = mapped_column(String, nullable=False, comment="Address")
     short_letter_address = mapped_column(String, nullable=False, comment="Address")
 
-    latitude: Mapped[float] = mapped_column(Numeric(20, 12), server_default="0")
+    latitude = mapped_column(Numeric(20, 12), server_default="0")
-    longitude: Mapped[float] = mapped_column(Numeric(20, 12), server_default="0")
+    longitude = mapped_column(Numeric(20, 12), server_default="0")
 
-    street_id: Mapped[Identity] = mapped_column(
+    street_id = mapped_column(ForeignKey("address_street.id"), nullable=False)
-        ForeignKey("address_street.id"), nullable=False
-    )
     street_uu_id = mapped_column(String, server_default="", comment="Street UUID")
 
     @classmethod
@@ -625,7 +612,7 @@ class AddressState(CrudCollection):
         BigInteger, nullable=True, comment="Address Geographic Id"
     )
 
-    country_id: Mapped[Identity] = mapped_column(ForeignKey("address_country.id"))
+    country_id = mapped_column(ForeignKey("address_country.id"))
     country_uu_id = mapped_column(String, server_default="", comment="Country UUID")
 
     __table_args__ = (
@@ -656,7 +643,7 @@ class AddressCity(CrudCollection):
         BigInteger, nullable=True, comment="Address Geographic Id"
     )
 
-    state_id: Mapped[Identity] = mapped_column(ForeignKey("address_state.id"))
+    state_id = mapped_column(ForeignKey("address_state.id"))
     state_uu_id = mapped_column(String, server_default="", comment="State UUID")
 
     __table_args__ = (
@@ -715,7 +702,7 @@ class AddressLocality(CrudCollection):
     type_code = mapped_column(String, nullable=True, comment="Type Name")
     type_description = mapped_column(String, nullable=True, comment="Type Name")
     gov_code = mapped_column(String(128), nullable=True, comment="Government Code")
-    address_show: Mapped[bool] = mapped_column(Boolean, server_default="1")
+    address_show = mapped_column(Boolean, server_default="1")
     address_geographic_id = mapped_column(
         BigInteger, nullable=True, comment="Address Geographic Id"
     )
@@ -753,7 +740,7 @@ class AddressNeighborhood(CrudCollection):
     type_code = mapped_column(String, nullable=True, comment="Type Name")
     type_description = mapped_column(String, nullable=True, comment="Type Name")
     gov_code = mapped_column(String(128), nullable=True, comment="Government Code")
-    address_show: Mapped[bool] = mapped_column(Boolean, server_default="1")
+    address_show = mapped_column(Boolean, server_default="1")
     address_geographic_id = mapped_column(
         BigInteger, nullable=True, comment="Address Geographic Id"
     )
@@ -884,7 +871,7 @@ class OccupantTypes(CrudCollection):
     occupant_code = mapped_column(String, server_default="")
     occupant_category = mapped_column(String, server_default="")
     occupant_category_type = mapped_column(String, server_default="")
-    occupant_is_unique: Mapped[bool] = mapped_column(Boolean, server_default="0")
+    occupant_is_unique = mapped_column(Boolean, server_default="0")
 
     __table_args__ = ({"comment": "Occupant Types Information"},)
 
@@ -904,52 +891,40 @@ class Contracts(CrudCollection):
     """
     Contract class based on declarative_base and BaseMixin via session
     """
-
+    __tablename__ = 'contracts'
-    __tablename__ = "contracts"
     __exclude__fields__ = []
 
-    contract_type = mapped_column(
+    contract_type = mapped_column(String(5), nullable=False, comment="The code for personnel is P and the code for companies is C.")
-        String(5),
-        nullable=False,
-        comment="The code for personnel is P and the code for companies is C.",
-    )
     contract_title = mapped_column(String(255))
     contract_details = mapped_column(Text)
     contract_terms = mapped_column(Text)
 
     contract_code = mapped_column(
-        String(100),
+        String(100), nullable=False, comment="contract_code is the unique code given by the system."
-        nullable=False,
-        comment="contract_code is the unique code given by the system.",
     )
     contract_date = mapped_column(
-        TIMESTAMP,
+        TIMESTAMP, server_default="2099-12-31 23:59:59",
-        server_default="2099-12-31 23:59:59",
         comment="contract date is the date the contract is made. "
-        "expire start is the start date of the contract, expire en is the end date of the contract.",
+                "expire start is the start date of the contract, expire en is the end date of the contract."
     )
 
-    company_id = mapped_column(Integer, ForeignKey("companies.id"), nullable=True)
+    company_id = mapped_column(Integer, ForeignKey('companies.id'), nullable=True)
     company_uu_id = mapped_column(String, server_default="", comment="Company UUID")
 
-    person_id = mapped_column(Integer, ForeignKey("people.id"), nullable=True)
+    person_id = mapped_column(Integer, ForeignKey('people.id'), nullable=True)
     person_uu_id = mapped_column(String, server_default="", comment="Person UUID")
 
     @classmethod
     def retrieve_contact_no(cls):
         import arrow
-
         # todo When create record contract_code == below string
         related_date, counter = arrow.now(), 1
-        return (
+        return f"{related_date.date().year}{str(cls.contract_type)}{str(counter).zfill(6)}"
-            f"{related_date.date().year}{str(cls.contract_type)}{str(counter).zfill(6)}"
-        )
 
     __table_args__ = (
-        Index("_contract_ndx_01", contract_code, unique=True),
+            Index("_contract_ndx_01", contract_code, unique=True),
-        {"comment": "Contract Information"},
+            {"comment": "Contract Information"}
-    )
+        )
-
 
 # def selected_employee_and_duty_details(self, selected_duty_uu_id):
 #     from database_sql_models import (

databases/sql_models/others/enums.py

@@ -4,7 +4,6 @@ from sqlalchemy import (
     UUID,
     String,
     text,
-    Identity,
 )
 from sqlalchemy.orm import (
     Mapped,
@@ -17,16 +16,14 @@ class ApiEnumDropdown(BaseCollection):
     __tablename__ = "api_enum_dropdown"
     __exclude__fields__ = ["enum_class"]
 
-    id: Mapped[Identity] = mapped_column(primary_key=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
-    uu_id: Mapped[UUID] = mapped_column(
+    uu_id: Mapped[str] = mapped_column(
         UUID, server_default=text("gen_random_uuid()"), index=True, unique=True
     )
-    enum_class: Mapped[str] = mapped_column(
+    enum_class = mapped_column(String, nullable=False, comment="Enum Constant Name")
-        String, nullable=False, comment="Enum Constant Name"
+    key = mapped_column(String, nullable=False, comment="Enum Key")
-    )
+    value = mapped_column(String, nullable=False, comment="Enum Value")
-    key: Mapped[str] = mapped_column(String, nullable=False, comment="Enum Key")
+    description = mapped_column(String, nullable=True)
-    value: Mapped[str] = mapped_column(String, nullable=False, comment="Enum Value")
-    description: Mapped[str] = mapped_column(String, nullable=True)
 
     __table_args__ = ({"comment": "Enum objets that are linked to tables"},)
 

databases/sql_models/response_model.py

@@ -1,3 +1,6 @@
+
+
+
 class AlchemyResponse:
     """
     alchemy_object = [AlchemyObject].filter_non_deleted() -> AlchemyResponse

databases/sql_models/rules/rules.py

@@ -1,6 +1,5 @@
-from sqlalchemy import String
+from sqlalchemy import Column, String
 from databases.sql_models.core_mixin import CrudCollection
-from sqlalchemy.orm import mapped_column, Mapped
 
 
 class EndpointRestriction(CrudCollection):
@@ -11,18 +10,18 @@ class EndpointRestriction(CrudCollection):
     __tablename__ = "endpoint_restriction"
     __exclude__fields__ = []
 
-    endpoint_function: Mapped[str] = mapped_column(
+    endpoint_function = Column(
         String, server_default="", comment="Function name of the API endpoint"
     )
-    endpoint_name: Mapped[str] = mapped_column(
+    endpoint_name = Column(
         String, server_default="", comment="Name of the API endpoint"
     )
-    endpoint_method: Mapped[str] = mapped_column(
+    endpoint_method = Column(
         String, server_default="", comment="HTTP method used by the endpoint"
     )
-    endpoint_desc: Mapped[str] = mapped_column(
+    endpoint_desc = Column(
         String, server_default="", comment="Description of the endpoint"
     )
-    endpoint_code: Mapped[str] = mapped_column(
+    endpoint_code = Column(
         String, server_default="", unique=True, comment="Unique code for the endpoint"
     )

databases/sql_models/sql_operations.py

@@ -20,7 +20,7 @@ class FilterAttributes:
 
     pre_query = None  # The query to use before the filtering such as: query = cls.query.filter_by(active=True)
     filter_attr = None  # The filter attributes to use in the model.
-    FilterModel = ListOptions
+    FilterModel: ListOptions = ListOptions
 
     def flush(self):
         """Flush the current session."""
@@ -32,7 +32,7 @@ class FilterAttributes:
                 status_code="HTTP_304_NOT_MODIFIED",
                 error_case=e.__class__.__name__,
                 data={},
-                message=str(e.__context__).split("\n")[0],
+                message=str(e.__context__).split('\n')[0],
             )
 
     def destroy(self):
@@ -50,7 +50,7 @@ class FilterAttributes:
                 status_code="HTTP_304_NOT_MODIFIED",
                 error_case=e.__class__.__name__,
                 data={},
-                message=str(e.__context__).split("\n")[0],
+                message=str(e.__context__).split('\n')[0],
             )
 
     @classmethod
@@ -93,7 +93,6 @@ class FilterAttributes:
     def get_not_expired_query_arg(cls, *arg, expired=True):
         """Add expiry_starts and expiry_ends to the query."""
         from api_library.date_time_actions.date_functions import system_arrow
-
         if expired:
             arg_add = (
                 *arg[0],
@@ -104,7 +103,7 @@ class FilterAttributes:
         return arg[0]
 
     @classmethod
-    def filter_by_all(cls, **kwargs):
+    def filter_by_all(cls,  **kwargs):
         """
         Filters all the records regardless of is_deleted, is_confirmed.
         """
@@ -152,12 +151,10 @@ class FilterAttributes:
 
         cls.__session__.rollback()
         raise HTTPException(
-            status_code=getattr(status, status_code, "HTTP_404_NOT_FOUND"),
+            status_code=getattr(status, status_code, 'HTTP_404_NOT_FOUND'),
-            detail=dumps(
+            detail=dumps({
-                {
+                "data": data,
-                    "data": data,
+                "error": error_case,
-                    "error": error_case,
+                "message": message,
-                    "message": message,
+            })
-                }
-            ),
         )

docker-compose.yml

@@ -60,6 +60,7 @@ services:
     networks:
       - network_store_services
     depends_on:
+      - wag_management_init_service
       - grafana
 
   wag_management_service_second:
@@ -73,6 +74,7 @@ services:
     networks:
       - network_store_services
     depends_on:
+      - wag_management_init_service
       - grafana
 
   wag_management_init_service:
@@ -83,7 +85,9 @@ services:
     networks:
       - network_store_services
     depends_on:
-      - wag_management_service
+      - postgres_commercial
+      - commercial_memory_service
+#      - commercial_mongo_service
 
   wag_management_test_service:
     container_name: wag_management_test_service
@@ -95,6 +99,7 @@ services:
     depends_on:
       - wag_management_init_service
 
+# Todo separate api with mail receiver services add mail_service to 2.43 LXC | Create an internal Api or Socket
   mail_service:
     container_name: mail_service
     restart: on-failure

service_app/app.py

@@ -10,9 +10,8 @@ from handlers_exception import (
     exception_handler_exception,
 )
 from prometheus_fastapi_instrumentator import Instrumentator
-# from prometheus_client import Counter, Histogram
+from prometheus_client import Counter, Histogram
 
-from .app_runner_init import create_endpoints_from_api_functions
 
 app = create_app()
 Instrumentator().instrument(app=app).expose(app=app)
@@ -24,13 +23,22 @@ app.add_middleware(
         "allow_credentials": True,
         "allow_methods": ["*"],
         "allow_headers": ["*"],
-    },
+    }
 )
 app.add_middleware(AuthHeaderMiddleware)
 
 app.add_exception_handler(HTTPException, exception_handler_http)
 app.add_exception_handler(Exception, exception_handler_exception)
-create_endpoints_from_api_functions(api_app=app)
+
+# # Define a counter metric
+# REQUESTS_COUNT = Counter(
+#     "requests_total", "Total number of requests", ["method", "endpoint", "status_code"]
+# )
+# # Define a histogram metric
+# REQUESTS_TIME = Histogram("requests_time", "Request processing time", ["method", "endpoint"])
+# api_request_summary = Histogram("api_request_summary", "Request processing time", ["method", "endpoint"])
+# api_request_counter = Counter("api_request_counter", "Request processing time", ["method", "endpoint", "http_status"])
+
 
 if __name__ == "__main__":
     uvicorn_config = {

service_app/app_runner_init.py

@@ -1,34 +0,0 @@
-from databases import EndpointRestriction
-
-
-def create_endpoints_from_api_functions(api_app):
-
-    for route in api_app.routes:
-        route_path, route_summary = (
-            str(getattr(route, "path")),
-            str(getattr(route, "name")) or "",
-        )
-        # if route_path in Config.INSECURE_PATHS:
-        #     continue
-        # print('route_path ', route_path, 'route_summary', route_summary)
-        create_dict = dict(
-            is_confirmed=True,
-            active=True,
-            deleted=False,
-            is_notification_send=True,
-        )
-        methods = [method.lower() for method in getattr(route, "methods")]
-        for route_method in methods:
-            restriction = EndpointRestriction.find_or_create(
-                **dict(
-                    endpoint_method=route_method,
-                    endpoint_name=route_path,
-                    endpoint_desc=route_summary.replace("_", " "),
-                    endpoint_function=route_summary,
-                    **create_dict,
-                )
-            )
-            if not restriction.is_found:
-                restriction.endpoint_code = f"AR{str(restriction.id).zfill(3)}"
-                restriction.save()
-    return

service_app/application/create_file.py

@@ -1,3 +1,5 @@
+
+
 def create_app():
     from fastapi import FastAPI
     from fastapi.responses import JSONResponse
@@ -7,6 +9,7 @@ def create_app():
     from api_configs import Config
     import routers
 
+
     api_app = FastAPI(title=str(Config.TITLE), default_response_class=JSONResponse)
 
     @api_app.get("/", include_in_schema=False, summary=str(Config.DESCRIPTION))

service_app/handlers_exception/__init__.py

@@ -6,4 +6,4 @@ from .api_exception_handlers.http_exception_handler import (
 __all__ = [
     "exception_handler_http",
     "exception_handler_exception",
-]
+]

service_app/handlers_exception/api_exception_handlers/http_exception_handler.py

@@ -7,23 +7,21 @@ from fastapi.responses import JSONResponse
 
 
 def exception_handler_http(request: Request, exc: HTTPException):
-    print("headers", request.headers)
+    print('headers', request.headers)
     detail = loads(exc.detail)
     return JSONResponse(
         status_code=exc.status_code,
         content={
-            "Data": detail.get("data", {}),
+            "Data": detail.get('data', {}),
-            "Error": detail.get("error_case", "UNKNOWN"),
+            "Error": detail.get('error_case', 'UNKNOWN'),
-            "Message": detail.get(
+            "Message": detail.get('message', 'An error occurred while processing the request')
-                "message", "An error occurred while processing the request"
+        }
-            ),
-        },
     )
 
 
 def exception_handler_exception(request: Request, exc: Exception):
-    print("headers", request.headers)
+    print('headers', request.headers)
     return JSONResponse(
-        status_code=status.HTTP_417_EXPECTATION_FAILED,
+        status_code=status.HTTP_417_EXPECTATION_FAILED, content={"message": exc.__str__()}
-        content={"message": exc.__str__()},
     )
+

service_app/middlewares/token_middleware.py

@@ -6,7 +6,6 @@ from starlette import status
 from starlette.exceptions import HTTPException
 from starlette.middleware.base import BaseHTTPMiddleware
 
-
 class MiddlewareLogs:
 
     @staticmethod
@@ -66,9 +65,7 @@ def prepare_response_needs(response, start_time):
 
 
 def check_if_path_secure(request, insecure_paths) -> bool:
-    return (
+    return str(getattr(getattr(request, "url", None), "path", None)) not in insecure_paths
-        str(getattr(getattr(request, "url", None), "path", None)) not in insecure_paths
-    )
 
 
 def check_if_token_is_not_valid(request, endpoint_name):

service_app/routers/__init__.py

@@ -1 +1,3 @@
+
+
 __all__ = []

service_app/routers/building/buildarea/router.py

@@ -11,10 +11,11 @@ from api_validations.validations_request import (
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 from databases import (
     BuildArea,
     Build,
+
 )
 
 

service_app/routers/building/buildsites/router.py

@@ -13,7 +13,7 @@ from api_validations.validations_request import (
 
 from databases import BuildSites
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 
 
 build_sites_route = APIRouter(prefix="/building/sites", tags=["Building Sites"])

service_app/routers/building/buildtypes/router.py

@@ -11,7 +11,7 @@ from api_validations.validations_request import (
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 from databases import BuildTypes
 
 

service_app/routers/company/employee/router.py

@@ -2,11 +2,11 @@ from fastapi.routing import APIRouter
 from fastapi.requests import Request
 
 from api_validations.validations_request import (
-    InsertEmployees,
+InsertEmployees,
-    UnBindEmployees2People,
+UnBindEmployees2People,
-    BindEmployees2People,
+BindEmployees2People,
-    PatchRecord,
+PatchRecord,
-    ListOptions,
+ListOptions,
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict

service_app/routers/events/services/router.py

@@ -2,9 +2,7 @@ from fastapi.routing import APIRouter
 from fastapi.requests import Request
 
 from api_validations.validations_request import (
-    DepartmentsPydantic,
+    DepartmentsPydantic, PatchRecord, ListOptions
-    PatchRecord,
-    ListOptions,
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict

service_app/routers/people/router.py

@@ -2,10 +2,7 @@ from fastapi.routing import APIRouter
 from fastapi.requests import Request
 
 from api_validations.validations_request import (
-    InsertPerson,
+    InsertPerson, UpdateUsers, PatchRecord, ListOptions
-    UpdateUsers,
-    PatchRecord,
-    ListOptions,
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict

service_app/routers/project_decision_book/project_decision_book/router.py

@@ -11,7 +11,7 @@ from api_validations.validations_request import (
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 from databases import BuildDecisionBookProjects
 
 

service_app/routers/project_decision_book/project_decision_book_person/router.py

@@ -4,14 +4,11 @@ from fastapi.responses import JSONResponse
 from fastapi.requests import Request
 
 from api_validations.validations_request import (
-    InsertDecisionBook,
+    InsertDecisionBook, UpdateDecisionBook, PatchRecord, ListOptions
-    UpdateDecisionBook,
-    PatchRecord,
-    ListOptions,
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
-from api_validations.core_response import AlchemyJsonResponse
+from api_validations.core_response import return_json_response_from_alchemy
 from databases import BuildDecisionBook, Build
 
 

service_app/routers/rules/router.py

@@ -1,10 +1,7 @@
 from fastapi.routing import APIRouter
 from fastapi.requests import Request
 
-from api_validations.validations_request import (
+from api_validations.validations_request import UpdateEndpointAccessList, InsertEndpointAccess
-    UpdateEndpointAccessList,
-    InsertEndpointAccess,
-)
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict
 

service_app/routers/users/router.py

@@ -2,10 +2,7 @@ from fastapi.routing import APIRouter
 from fastapi.requests import Request
 
 from api_validations.validations_request import (
-    InsertUsers,
+    InsertUsers, UpdateUsers, PatchRecord, ListOptions
-    UpdateUsers,
-    PatchRecord,
-    ListOptions,
 )
 
 from api_services.redis.auth_actions.token import parse_token_object_to_dict

service_app_init/initialize_app/event_initator.py

@@ -1,17 +1,6 @@
-from databases import (
-    Events,
-    Services,
-    Service2Events,
-    Employees,
-    Staff,
-)
-from api_events.events.events.events_bind_services import (
-    ServiceBindEmployeeEventMethods,
-)
-
-
 def create_all_events_from_actions():
-    import api_events.events as events
+    import api_events
+    from databases.sql_models import Events
 
     active_confirmed = dict(
         created_by="System",
@@ -67,7 +56,8 @@ def create_all_events_from_actions():
 
 
 def add_events_all_services_and_occupant_types():
-    import api_events.tasks2events as tasks2events
+    from database_sql_models import Services, Service2Events
+    import tasks2events
 
     active_confirmed = dict(
         created_by="System",
@@ -100,6 +90,8 @@ def add_events_all_services_and_occupant_types():
 
 
 def add_events_to_system_super_user():
+    from events.events_bind_services import ServiceBindEmployeeEventMethods
+    from database_sql_models import Services, Employees, Staff
 
     add_service = Services.find_one(service_code="SRE-SUE")
     if not add_service:
@@ -117,3 +109,31 @@ def add_events_to_system_super_user():
         service_id=add_service.id,
         employee_id=add_employee.id,
     )
+
+    # super_user_service = Services.find_or_create(service_code="SRE-SU")
+    # if not super_user_service:
+    #     raise Exception("Super user is service not found")
+    #
+    # user_default_service = Services.find_or_create(service_code="AUTH")
+    # if not user_default_service:
+    #     raise Exception("AUTH service is not found")
+    #
+    # for item in SuperUserEventBlock():
+    #     event_id, event_uu_id = item
+    #     Service2Events.find_or_create(
+    #         service_id=super_user_service.id,
+    #         service_uu_id=str(super_user_service.uu_id),
+    #         event_id=event_id,
+    #         event_uu_id=event_uu_id,
+    #         **active_confirmed,
+    #     )
+    #
+    # for event_block in AuthDefaultEventBlock():
+    #     event_id, event_uu_id = event_block
+    #     Service2Events.find_or_create(
+    #         service_id=user_default_service.id,
+    #         service_uu_id=str(user_default_service.uu_id),
+    #         event_id=event_id,
+    #         event_uu_id=event_uu_id,
+    #         **active_confirmed,
+    #     )

service_app_init/initialize_app/initialize_default_department.py

@@ -3,10 +3,11 @@ from databases import MongoQueryIdentity, Event2Employee, OccupantTypes
 
 
 def create_occupant_types_defaults():
+
     """
-    occupant_category = mapped_column(String, server_default="")
+        occupant_category = mapped_column(String, server_default="")
-    occupant_category_type = mapped_column(String, server_default="")
+        occupant_category_type = mapped_column(String, server_default="")
-    occupant_is_unique = mapped_column(Boolean, server_default="0")
+        occupant_is_unique = mapped_column(Boolean, server_default="0")
     """
     list_occupant_types = [
         {
@@ -145,7 +146,7 @@ def create_occupant_types_defaults():
 
 def create_application_defaults():
 
-    from databases import (
+    from database_sql_models import (
         Companies,
         Departments,
         Duty,

service_app_init/initialize_app/initialize_identity_address_defaults.py

@@ -1,13 +1,6 @@
 from json import loads
 from os import path
-from databases import (
+
-    AddressCountry,
-    AddressCity,
-    AddressDistrict,
-    AddressLocality,
-    AddressNeighborhood,
-    AddressState,
-)
 
 path_to_folder = "initialize_app/default_inits"
 list_of_snippets = [
@@ -20,6 +13,9 @@ list_of_snippets = [
 
 
 def create_country_defaults(path_to_joined_folder, confirmed_by_system):
+    from database_sql_models import (
+        AddressCountry,
+    )
 
     with open(path_to_joined_folder("countries.json"), "r") as file:
         countries = loads(file.read())
@@ -38,6 +34,9 @@ def create_country_defaults(path_to_joined_folder, confirmed_by_system):
 
 
 def create_cities_defaults(path_to_joined_folder, confirmed_by_system, state_id):
+    from database_sql_models import (
+        AddressCity,
+    )
 
     with open(path_to_joined_folder("cities.json"), "r") as file:
         cities = loads(file.read())
@@ -58,6 +57,10 @@ def create_cities_defaults(path_to_joined_folder, confirmed_by_system, state_id)
 
 
 def create_district_defaults(path_to_joined_folder, confirmed_by_system):
+    from database_sql_models import (
+        AddressCity,
+        AddressDistrict,
+    )
 
     with open(path_to_joined_folder("district.json"), "r") as file:
         districts = loads(file.read())
@@ -81,6 +84,10 @@ def create_district_defaults(path_to_joined_folder, confirmed_by_system):
 
 
 def create_locality_defaults(path_to_joined_folder, confirmed_by_system):
+    from database_sql_models import (
+        AddressDistrict,
+        AddressLocality,
+    )
 
     with open(path_to_joined_folder("locality.json"), "r") as file:
         localities = loads(file.read())
@@ -106,6 +113,11 @@ def create_locality_defaults(path_to_joined_folder, confirmed_by_system):
 
 
 def create_neighborhood_defaults(path_to_joined_folder, confirmed_by_system):
+    from database_sql_models import (
+        AddressLocality,
+        AddressNeighborhood,
+        AddressDistrict,
+    )
 
     with open(path_to_joined_folder("neighborhood.json"), "r") as file:
         neighborhoods = loads(file.read())
@@ -138,6 +150,10 @@ def create_neighborhood_defaults(path_to_joined_folder, confirmed_by_system):
 
 
 def create_identity_address_defaults():
+    from database_sql_models import (
+        AddressCountry,
+        AddressState,
+    )
 
     print("Creating address defaults ------------------")
 

service_app_init/initialize_app/initiator.py

@@ -1,11 +1,7 @@
-from databases import (
-    BuildTypes,
-    ApiEnumDropdown,
-)
-
-
 def init_api_enums_build_types():
-    from api_validations.validations_request import InsertBuildTypes
+    from database_sql_models import BuildTypes
+    from database_sql_models.others.enums import ApiEnumDropdown
+    from validations import InsertBuildTypes
 
     insert_types = [
         {

service_app_init/initialize_app/modules_and_services_init.py

@@ -1,14 +1,49 @@
 import typing
 
-from databases import (
+from database_sql_models import (
     Modules,
     Duty,
     Services,
     Service2Events,
     OccupantTypes,
+    EndpointRestriction,
 )
 
 
+def create_endpoints_from_api_functions():
+    from app import app as api_app
+
+    for route in api_app.routes:
+        route_path, route_summary = (
+            str(getattr(route, "path")),
+            str(getattr(route, "name")) or "",
+        )
+        # if route_path in Config.INSECURE_PATHS:
+        #     continue
+        # print('route_path ', route_path, 'route_summary', route_summary)
+        create_dict = dict(
+            is_confirmed=True,
+            active=True,
+            deleted=False,
+            is_notification_send=True,
+        )
+        methods = [method.lower() for method in getattr(route, "methods")]
+        for route_method in methods:
+            restriction = EndpointRestriction.find_or_create(
+                **dict(
+                    endpoint_method=route_method,
+                    endpoint_name=route_path,
+                    endpoint_desc=route_summary.replace("_", " "),
+                    endpoint_function=route_summary,
+                    **create_dict,
+                )
+            )
+            if not restriction.is_found:
+                restriction.endpoint_code = f"AR{str(restriction.id).zfill(3)}"
+                restriction.save()
+    return
+
+
 def create_services_building(module_dict: dict):
     """
     4. Service [Bina]           Yönetim             - OPTIONAL

service_app_init/runner.py

@@ -1,3 +1,5 @@
+
+
 def do_alembic():
     from sqlalchemy import text
     from alembic_generate import generate_alembic_with_session
@@ -55,7 +57,7 @@ def create_application_defaults_func(create_address=False):
         phone_code="90",
         country_id=country.id,
         country_uu_id=str(country.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     city = AddressCity.find_or_create(
         city_name="ANKARA",
@@ -63,14 +65,14 @@ def create_application_defaults_func(create_address=False):
         licence_plate="06",
         state_id=state.id,
         state_uu_id=str(state.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     district = AddressDistrict.find_or_create(
         district_name="ÇANKAYA",
         district_code="1231",
         city_id=city.id,
         city_uu_id=str(city.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     locality = AddressLocality.find_or_create(
         locality_name="MERKEZ",
@@ -79,7 +81,7 @@ def create_application_defaults_func(create_address=False):
         type_description=None,
         district_id=district.id,
         district_uu_id=str(district.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     neighborhood = AddressNeighborhood.find_or_create(
         neighborhood_name="AYRANCI MAHALLESİ",
@@ -88,7 +90,7 @@ def create_application_defaults_func(create_address=False):
         type_description="MAHALLESİ",
         locality_id=locality.id,
         locality_uu_id=str(locality.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     street = AddressStreet.find_or_create(
         street_name="REŞAT NURİ CADDESİ",
@@ -97,7 +99,7 @@ def create_application_defaults_func(create_address=False):
         street_code="52270",
         neighborhood_id=neighborhood.id,
         neighborhood_uu_id=str(neighborhood.uu_id),
-        **confirmed_dict,
+        **confirmed_dict
     )
     return
 
@@ -108,3 +110,4 @@ if __name__ == "__main__":
     if init_alembic_address:
         do_alembic()
         create_application_defaults_func(create_address=False)
+

service_app_mail/app_mail_sender.py

@@ -3,7 +3,7 @@ from api_library.date_time_actions.date_functions import client_arrow
 
 
 def send_mail_to_users_that_have_received_email_from_banks():
-    from databases import AccountRecords
+    from databases.sql_models import AccountRecords
 
     print("Service is booting up")
     print("Sending mail to users that have received email from banks")

service_app_test/runner.py

@@ -1,2 +1,4 @@
+
+
 if __name__ == "__main__":
     print("service_app_test is running")

service_app_test/test_application/evyos/decision_book_items.py

@@ -3,18 +3,16 @@ from test_application.evyos.datas.get_occupants_codes import get_occupants_types
 from test_application.evyos.datas.get_type_codes import get_type_codes_key_and_class
 
 
-decision_book_items_dict = (
+decision_book_items_dict = lambda token, item_comment, info_type_uu_id, unit_price, is_fixed, st, ed: {
-    lambda token, item_comment, info_type_uu_id, unit_price, is_fixed, st, ed: {
+    "token": token,
-        "token": token,
+    "item_comment": f"Test {item_comment}",
-        "item_comment": f"Test {item_comment}",
+    "info_type_uu_id": info_type_uu_id,
-        "info_type_uu_id": info_type_uu_id,
+    "unit_price": unit_price,
-        "unit_price": unit_price,
+    "unit_price_is_fixed": is_fixed,
-        "unit_price_is_fixed": is_fixed,
+    "debit_start_date": st,
-        "debit_start_date": st,
+    "debit_end_date":  ed,
-        "debit_end_date": ed,
+    **active_and_confirmed,
-        **active_and_confirmed,
+}
-    }
-)
 
 
 def create_decision_book_items(decision_book_items):
@@ -72,12 +70,8 @@ def collect_invitation_to_building_residents(
 
 
 def create_decision_book_items_with_occupant_user(
-    writers_token: str,
+        writers_token: str, unit_price: float, is_fixed: bool, info_type_uu_id: str,
-    unit_price: float,
+        start_date: str = None, end_date: str = None
-    is_fixed: bool,
-    info_type_uu_id: str,
-    start_date: str = None,
-    end_date: str = None,
 ):
     print("create_decision_book_items_with_occupant_user : ", writers_token)
     list_of_items = [
@@ -88,7 +82,7 @@ def create_decision_book_items_with_occupant_user(
             unit_price=unit_price,
             is_fixed=is_fixed,
             st=start_date,
-            ed=end_date,
+            ed=end_date
         ),
     ]
     for item in list_of_items:
@@ -98,21 +92,14 @@ def create_decision_book_items_with_occupant_user(
 
 
 def run_decision_book_items(
-    writers_token, unit_price, info_type_uu_id, is_fixed, start_date=None, end_date=None
+        writers_token, unit_price, info_type_uu_id, is_fixed, start_date=None, end_date=None
 ):
     if start_date and end_date:
         create_decision_book_items_with_occupant_user(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed, info_type_uu_id=info_type_uu_id,
-            unit_price=unit_price,
+            start_date=start_date, end_date=end_date
-            is_fixed=is_fixed,
-            info_type_uu_id=info_type_uu_id,
-            start_date=start_date,
-            end_date=end_date,
         )
     else:
         create_decision_book_items_with_occupant_user(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed, info_type_uu_id=info_type_uu_id,
-            unit_price=unit_price,
-            is_fixed=is_fixed,
-            info_type_uu_id=info_type_uu_id,
         )

service_app_test/test_application/evyos/runner.py

@@ -20,7 +20,7 @@ login_creds_employee = {
     "access_key": "karatay.berkay.sup@evyos.com.tr",
     "password": "string",
     "remember_me": False,
-    "password_token": "",
+    "password_token": ""
 }
 access_key_president = "bmanco@example.net"
 login_creds_occupant = {
@@ -28,7 +28,7 @@ login_creds_occupant = {
     "access_key": access_key_president,
     "password": "string",
     "remember_me": False,
-    "password_token": "o_2Y_yXS-cl6MxLbzLrXQetXTlDLD3UBDTQNa_mBMyzSOVIgx3LGbnufLRJjd4g6BWFbwVgJIUxbK-Pi0R5dwxfVJKyoEeDdej40uRHSsElKR16nvnqgFB_BJ4nmyN0KSunZHra5NqHJor17EGExOSmlttZV5dC7vFsrc-GUkg",
+    "password_token": "o_2Y_yXS-cl6MxLbzLrXQetXTlDLD3UBDTQNa_mBMyzSOVIgx3LGbnufLRJjd4g6BWFbwVgJIUxbK-Pi0R5dwxfVJKyoEeDdej40uRHSsElKR16nvnqgFB_BJ4nmyN0KSunZHra5NqHJor17EGExOSmlttZV5dC7vFsrc-GUkg"
 }
 wrt_creds_occupant = {
     "domain": "evyos.com.tr",
@@ -43,10 +43,7 @@ add_with_occupant = True
 assign_people_to_create_item = 3
 
 # selection_list = None
-selection_list = [
+selection_list = ["7e370616-7bcf-469f-b9a2-c0da55463939", "c2d385d8-b772-4ecd-be89-8c468738654a"]
-    "7e370616-7bcf-469f-b9a2-c0da55463939",
-    "c2d385d8-b772-4ecd-be89-8c468738654a",
-]
 # selection_list = None
 manager_token = ""
 writers_token = manager_token
@@ -112,10 +109,8 @@ if add_with_occupant:
         )["data"]["uu_id"]
         unit_price = 15.90
         run_decision_book_items(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed_price,
-            unit_price=unit_price,
+            info_type_uu_id=info_type_d_uu_id
-            is_fixed=is_fixed_price,
-            info_type_uu_id=info_type_d_uu_id,
         )
         is_fixed_price = True
 
@@ -125,12 +120,8 @@ if add_with_occupant:
         start_date, end_date = "2024-11-01", "2025-02-01"
         unit_price = 850
         run_decision_book_items(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed_price,
-            unit_price=unit_price,
+            info_type_uu_id=info_type_a_uu_id, start_date=start_date, end_date=end_date
-            is_fixed=is_fixed_price,
-            info_type_uu_id=info_type_a_uu_id,
-            start_date=start_date,
-            end_date=end_date,
         )
 
         info_type_a_uu_id = get_type_codes_key_and_class(
@@ -138,12 +129,8 @@ if add_with_occupant:
         )["data"]["uu_id"]
         unit_price = 5000
         run_decision_book_items(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed_price,
-            unit_price=unit_price,
+            info_type_uu_id=info_type_a_uu_id, start_date=start_date, end_date=end_date
-            is_fixed=is_fixed_price,
-            info_type_uu_id=info_type_a_uu_id,
-            start_date=start_date,
-            end_date=end_date,
         )
 
         info_type_a_uu_id = get_type_codes_key_and_class(
@@ -151,12 +138,8 @@ if add_with_occupant:
         )["data"]["uu_id"]
         unit_price = 2000
         run_decision_book_items(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed_price,
-            unit_price=unit_price,
+            info_type_uu_id=info_type_a_uu_id, start_date=start_date, end_date=end_date
-            is_fixed=is_fixed_price,
-            info_type_uu_id=info_type_a_uu_id,
-            start_date=start_date,
-            end_date=end_date,
         )
 
         info_type_a_uu_id = get_type_codes_key_and_class(
@@ -164,10 +147,7 @@ if add_with_occupant:
         )["data"]["uu_id"]
         unit_price = 750
         run_decision_book_items(
-            writers_token=writers_token,
+            writers_token=writers_token, unit_price=unit_price, is_fixed=is_fixed_price,
-            unit_price=unit_price,
+            info_type_uu_id=info_type_a_uu_id, start_date=start_date, end_date=end_date
-            is_fixed=is_fixed_price,
-            info_type_uu_id=info_type_a_uu_id,
-            start_date=start_date,
-            end_date=end_date,
         )
+