alchemy functions updated

service_app_init/initialize_app/event_initator.py

@@ -10,17 +10,18 @@ from api_events.events.events.events_bind_services import (
 )
 
 
+active_confirmed = dict(
+    created_by="System",
+    confirmed_by="System",
+    is_confirmed=True,
+    active=True,
+    deleted=False,
+    is_notification_send=True,
+)
+
 def create_all_events_from_actions():
     import api_events.events as events
 
-    active_confirmed = dict(
-        created_by="System",
-        confirmed_by="System",
-        is_confirmed=True,
-        active=True,
-        deleted=False,
-        is_notification_send=True,
-    )
     an_empty_list, duplicate_list = [], []
 
     for event in events.__all__:
@@ -34,14 +35,14 @@ def create_all_events_from_actions():
 
             if endpoint_match := event_selected.action_match:
                 if event_selected_function:
-                    selected_event = Events.find_one(
-                        event_type=event_selected.event_type,
-                        function_class=event,
-                        function_code=event_selected_key,
-                        endpoint_id=endpoint_match.id,
-                        endpoint_uu_id=str(endpoint_match.uu_id),
-                        **active_confirmed,
-                    )
+                    selected_event = Events.filter_one(
+                        Events.event_type==event_selected.event_type,
+                        Events.function_class==event,
+                        Events.function_code==event_selected_key,
+                        Events.endpoint_id==endpoint_match.id,
+                        Events.endpoint_uu_id==str(endpoint_match.uu_id),
+                        *Events.valid_record_args(Events)
+                    ).data
                     if not selected_event:
                         created_event = Events.create(
                             event_type=event_selected.event_type,
@@ -49,7 +50,7 @@ def create_all_events_from_actions():
                             function_code=event_selected_key,
                             endpoint_id=endpoint_match.id,
                             endpoint_uu_id=str(endpoint_match.uu_id),
-                            **active_confirmed,
+                            **active_confirmed
                         )
                         print(f"Event created: {created_event.uu_id}")
 
@@ -69,19 +70,13 @@ def create_all_events_from_actions():
 def add_events_all_services_and_occupant_types():
     import api_events.tasks2events as tasks2events
 
-    active_confirmed = dict(
-        created_by="System",
-        confirmed_by="System",
-        is_confirmed=True,
-        active=True,
-        deleted=False,
-        is_notification_send=True,
-    )
+
     for event_block in tasks2events.__all__:
         event_block_class = getattr(tasks2events, event_block)
-        service_selected = Services.find_one(
-            service_code=getattr(event_block_class, "service_code", None),
-        )
+        service_selected = Services.filter_one(
+            Services.service_code==getattr(event_block_class, "service_code", None),
+            *Services.valid_record_args(Services)
+        ).data
         if not service_selected:
             raise Exception(f"{event_block_class.service_code} service is not found")
 
@@ -95,21 +90,21 @@ def add_events_all_services_and_occupant_types():
                 service_uu_id=str(service_selected.uu_id),
                 event_id=event_id,
                 event_uu_id=event_uu_id,
-                **active_confirmed,
+                **active_confirmed
             )
 
 
 def add_events_to_system_super_user():
 
-    add_service = Services.find_one(service_code="SRE-SUE")
+    add_service = Services.filter_by_one(service_code="SRE-SUE", **Services.valid_record_dict)
     if not add_service:
         raise Exception("Service not found")
 
-    find_staff = Staff.find_one(staff_code="SUE")
+    find_staff = Staff.filter_by_one(staff_code="SUE", **Staff.valid_record_dict)
     if not find_staff:
         raise Exception("Super User not found")
 
-    add_employee = Employees.find_one(staff_id=find_staff.id)
+    add_employee = Employees.filter_by_one(staff_id=find_staff.id, **Employees.valid_record_dict)
     if not add_employee:
         raise Exception("Super User Employee not found")
 

service_app_init/initialize_app/initialize_default_department.py

@@ -180,9 +180,9 @@ def create_application_defaults():
     Duties.init_a_company_default_duties(
         company_id=company_management.id, company_uu_id=str(company_management.uu_id)
     )
-    bulk_duty = Duty.find_one(
+    bulk_duty = Duty.filter_by_one(
         duty_code="BULK",
-    )
+    ).data
 
     RelationshipDutyCompany.find_or_create(
         duties_id=bulk_duty.id,
@@ -195,14 +195,13 @@ def create_application_defaults():
         is_notification_send=True,
     )
 
-    it_dept = Departments.find_one(
+    it_dept = Departments.filter_by_one(
         department_name="IT Department",
         department_code="ITD001",
         company_id=company_management.id,
         company_uu_id=str(company_management.uu_id),
-        **dict(
-            is_confirmed=True, active=True, deleted=False, is_notification_send=True
-        ),
+        **Departments.valid_record_dict,
+        is_confirmed=True,
     )
 
     Duty.find_or_create(