validations and dockerfiles are updated

api_events/events/company/company_company.py

@@ -12,9 +12,11 @@ from api_validations.validations_request import (
     PatchRecord,
 )
 
+from api_validations.validations_response.company_responses import CompanyListResponse
+
 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 ApiServices.api_handlers import AlchemyJsonResponse
 
 
 class CompanyListEventMethods(MethodToEvent):
@@ -23,7 +25,7 @@ class CompanyListEventMethods(MethodToEvent):
     __event_keys__ = {
         "f6900cb5-ac5b-478e-8e7c-fa87e65cd2e5": "company_list",
     }
-    __event_validation__ = {"f6900cb5-ac5b-478e-8e7c-fa87e65cd2e5": None}
+    __event_validation__ = {"f6900cb5-ac5b-478e-8e7c-fa87e65cd2e5": CompanyListResponse}
 
     @classmethod
     def company_list(
@@ -46,8 +48,11 @@ class CompanyListEventMethods(MethodToEvent):
         records = Companies.filter_all()
         return AlchemyJsonResponse(
             completed=True,
-            message="Building Living Spaces are listed successfully",
+            message="Companies listed successfully",
             result=records,
+            cls_object=Companies,
+            filter_attributes=list_options,
+            response_model=CompanyListResponse
         )
 
 
@@ -65,18 +70,15 @@ class CompanyCreateEventMethods(MethodToEvent):
         data: InsertCompany,
         token_dict: EmployeeTokenObject,
     ):
-        created_company = Companies.create_action(data=data, token=token_dict)
+        created_company = Companies.insert_one(data).data
         created_company.update(
             related_company=token_dict.selected_company.company_uu_id
         )
         created_company.save()
-        return JSONResponse(
-            content={
-                "completed": True,
-                "message": "Create Company record",
-                "data": created_company.get_dict(),
-            },
-            status_code=status.HTTP_200_OK,
+        return AlchemyJsonResponse(
+            completed=True,
+            message="Company created successfully",
+            result=created_company.get_dict(),
         )
 
 
@@ -100,27 +102,19 @@ class CompanyUpdateEventMethods(MethodToEvent):
                 token_dict.selected_company.duty_id,
             ],
         )
-        find_one_company = Companies.filter_one(
-            Companies.uu_id == company_uu_id,
-        ).data
-        if not find_one_company:
-            return JSONResponse(
-                content={
-                    "completed": True,
-                    "message": "Update Company record",
-                    "data": {},
-                },
-                status_code=200,
+        company = Companies.update_one(company_uu_id, data).data
+        if not company:
+            return AlchemyJsonResponse(
+                completed=False,
+                message="Company not found",
+                result={},
+                status_code="HTTP_404_NOT_FOUND"
             )
-        updated_company = find_one_company.update(**data.excluded_dump())
-        Companies.save()
-        return JSONResponse(
-            content={
-                "completed": True,
-                "message": "Update Company record",
-                "data": updated_company,
-            },
-            status_code=200,
+        company.save()
+        return AlchemyJsonResponse(
+            completed=True,
+            message="Company updated successfully",
+            result=company.get_dict(),
         )
 
 
@@ -136,42 +130,25 @@ class CompanyPatchEventMethods(MethodToEvent):
     def company_patch(
         cls, company_uu_id: str, data: PatchRecord, token_dict: EmployeeTokenObject
     ):
-        find_one_company = Companies.filter_one(
-            Companies.uu_id == company_uu_id,
-        ).data
-        access_authorized_company = Companies.select_action(
+        Companies.pre_query = Companies.select_action(
             duty_id_list=[
                 token_dict.selected_company.bulk_duties_id,
                 token_dict.selected_company.duty_id,
             ],
         )
-        if access_authorized_company.count:
-            action = data.excluded_dump()
-            find_one_company.active = bool(
-                action.get("active", find_one_company.active)
+        company = Companies.patch_one(company_uu_id, data).data
+        if not company:
+            return AlchemyJsonResponse(
+                completed=False,
+                message="Company not found",
+                result={},
+                status_code="HTTP_404_NOT_FOUND"
             )
-            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={
-                    "completed": True,
-                    "message": "Patch Company record completed",
-                    "data": find_one_company.get_dict(),
-                },
-                status_code=status.HTTP_200_OK,
-            )
-        return JSONResponse(
-            content={
-                "completed": False,
-                "message": "Patch Company record failed",
-                "data": {},
-            },
-            status_code=status.HTTP_200_OK,
+        company.save()
+        return AlchemyJsonResponse(
+            completed=True,
+            message="Company patched successfully",
+            result=company.get_dict(),
         )
 
 

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
-from api_validations.core_response import AlchemyJsonResponse
+from ApiServices.api_handlers import AlchemyJsonResponse
 
 
 class DepartmentListEventMethods(MethodToEvent):

api_events/events/company/company_duties.py

@@ -1,7 +1,7 @@
 from fastapi import status
 from fastapi.responses import JSONResponse
 
-from api_validations.core_response import AlchemyJsonResponse
+from ApiServices.api_handlers import AlchemyJsonResponse
 from api_validations.validations_request import (
     InsertDuties,
     UpdateDuties,

api_events/events/company/company_duty.py

@@ -10,8 +10,8 @@ from api_validations.validations_request import (
 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_objects.auth.token_objects import EmployeeTokenObject
+from ApiServices.api_handlers import AlchemyJsonResponse
 
 
 class DutyListEventMethods(MethodToEvent):

api_events/events/company/company_employee.py

@@ -12,8 +12,8 @@ from api_validations.validations_request import (
 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_objects.auth.token_objects import EmployeeTokenObject
+from ApiServices.api_handlers import AlchemyJsonResponse
 
 
 class EmployeeListEventMethods(MethodToEvent):

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
-from api_validations.core_response import AlchemyJsonResponse
+from ApiServices.api_handlers import AlchemyJsonResponse
 
 
 class StaffListEventMethods(MethodToEvent):