alchemy functions updated

api_events/events/building/building_build_parts.py

@@ -35,10 +35,12 @@ class BuildingBuildPartsListEventMethods(MethodToEvent):
         )
         build_list_ids = [build.id for build in build_list_query.all()]
         BuildParts.pre_query = BuildParts.query.filter(
-            BuildParts.build_id.in_(build_list_ids)
+            BuildParts.build_id.in_(build_list_ids),
+            *BuildParts.valid_record_args(BuildParts),
         )
         records = BuildParts.filter_active(
-            *BuildParts.get_smart_query(list_options.query)
+            *BuildParts.get_smart_query(list_options.query),
+            *BuildParts.valid_record_args(BuildParts),
         )
         return AlchemyJsonResponse(
             completed=True,
@@ -61,15 +63,6 @@ class BuildingBuildPartsCreateEventMethods(MethodToEvent):
         token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         created_build = BuildParts.create_action(data=data, token=token_dict)
-        if not created_build:
-            return JSONResponse(
-                content={
-                    "completed": False,
-                    "message": "Create Build Parts is not completed",
-                    "data": {},
-                },
-                status_code=status.HTTP_406_NOT_ACCEPTABLE,
-            )
         created_build.save()
         return JSONResponse(
             content={
@@ -94,21 +87,13 @@ class BuildingBuildPartsUpdateEventMethods(MethodToEvent):
         data: InsertBuildParts,
         token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
-        if updated_build := BuildParts.update_action(data=data, token=token_dict):
-            updated_build.save()
-            return JSONResponse(
-                content={
-                    "completed": True,
-                    "message": "Update Build Parts record",
-                    "data": updated_build,
-                },
-                status_code=status.HTTP_200_OK,
-            )
+        updated_build = BuildParts.update_action(data=data, token=token_dict)
+        updated_build.save()
         return JSONResponse(
             content={
                 "completed": True,
                 "message": "Update Build Parts record",
-                "data": {},
+                "data": updated_build,
             },
             status_code=status.HTTP_200_OK,
         )
@@ -123,7 +108,10 @@ class BuildingBuildPartsPatchEventMethods(MethodToEvent):
 
     @classmethod
     def building_build_parts_patch(cls, data, token_dict):
-        find_one_build = BuildParts.filter_one(BuildParts.uu_id == data.uu_id).data
+        find_one_build = BuildParts.filter_one(
+            BuildParts.uu_id == data.uu_id,
+            *BuildParts.valid_record_args(BuildParts),
+        ).data
         access_authorized_build = BuildParts.select_action(
             duty_id=token_dict.selected_company.duty_id,
             filter_expr=[BuildParts.id == find_one_build.id],