alchemy functions updated

api_events/events/building/building_build.py

@@ -41,7 +41,7 @@ class BuildListEventMethods(MethodToEvent):
         if isinstance(token_dict, OccupantTokenObject):
             Build.pre_query = Build.filter_all(
                 Build.id == token_dict.selected_occupant.build_id,
-                Build.active == True,
+                *Build.valid_record_args(Build),
             ).query
         elif isinstance(token_dict, EmployeeTokenObject):
             Build.pre_query = Build.select_action(
@@ -50,8 +50,8 @@ class BuildListEventMethods(MethodToEvent):
         Build.filter_attr = list_options
         records = Build.filter_all(
             *Build.get_smart_query(smart_query=list_options.query),
-            Build.active == True,
-        )
+            *Build.valid_record_args(Build),
+        ).data
         return AlchemyJsonResponse(
             completed=True,
             message="Building Records are listed",
@@ -82,48 +82,44 @@ class BuildCreateEventMethods(MethodToEvent):
             )
 
         created_build = Build.create_action(data=data, token=token_dict)
-        if not created_build.is_found:
-            build_type = BuildTypes.filter_by_one(type_code="APT_YNT", *BuildTypes.valid_record_dict).data
-            if not build_type:
-                raise HTTPException(
-                    status_code=status.HTTP_404_NOT_FOUND,
-                    detail="Build type APT_YNT is not found. Please contact with your system administrator.",
-                )
-            api_enum = ApiEnumDropdown.filter_by_one(
-                enum_class="Directions", key="NN"
-            ).data
-            if not api_enum:
-                raise HTTPException(
-                    status_code=status.HTTP_404_NOT_FOUND,
-                    detail="Api Enum NN is not found. Please contact with your system administrator.",
-                )
-            build_parts = dict(
-                address_gov_code=f"{data.gov_address_code}-M",
-                build_id=int(created_build.id),
-                build_uu_id=str(created_build.uu_id),
-                part_no="0",
-                part_type_id=int(build_type.id),
-                part_type_uu_id=str(build_type.uu_id),
-                part_direction_id=int(api_enum.id),
-                part_direction_uu_id=str(api_enum.uu_id),
-                part_code="MAN-ROOM",
-                human_livable=False,
-                is_confirmed=True,
+
+        build_type = BuildTypes.filter_by_one(
+            type_code="APT_YNT", *BuildTypes.valid_record_dict
+        ).data
+        if not build_type:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Build type APT_YNT is not found. Please contact with your system administrator.",
             )
-            man_build_part = BuildParts.find_or_create(**build_parts)
-            created_build.update(management_room_id=man_build_part.id)
-            BuildParts.save()
-            return JSONResponse(
-                content={
-                    "completed": True,
-                    "message": "Create Build record completed. This build is assigned to you.",
-                    "data": created_build.get_dict(),
-                },
-                status_code=status.HTTP_200_OK,
+        api_enum = ApiEnumDropdown.filter_by_one(enum_class="Directions", key="NN").data
+        if not api_enum:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Api Enum NN is not found. Please contact with your system administrator.",
             )
-        raise HTTPException(
-            status_code=status.HTTP_406_NOT_ACCEPTABLE,
-            detail=f"Build record create not successful for Employee UUID : {token_dict.selected_company.employee_uu_id}",
+        build_parts = dict(
+            address_gov_code=f"{data.gov_address_code}-M",
+            build_id=int(created_build.id),
+            build_uu_id=str(created_build.uu_id),
+            part_no="0",
+            part_type_id=int(build_type.id),
+            part_type_uu_id=str(build_type.uu_id),
+            part_direction_id=int(api_enum.id),
+            part_direction_uu_id=str(api_enum.uu_id),
+            part_code="MAN-ROOM",
+            human_livable=False,
+            is_confirmed=True,
+        )
+        man_build_part = BuildParts.find_or_create(**build_parts)
+        created_build.update(management_room_id=man_build_part.id)
+        BuildParts.save()
+        return JSONResponse(
+            content={
+                "completed": True,
+                "message": "Create Build record completed. This build is assigned to you.",
+                "data": created_build.get_dict(),
+            },
+            status_code=status.HTTP_200_OK,
         )
 
     @classmethod
@@ -132,8 +128,8 @@ class BuildCreateEventMethods(MethodToEvent):
     ):
         records = Addresses.list_via_employee(
             token_dict=token_dict, filter_expr=[Addresses.uu_id == data.address_uu_id]
-        )
-        if not records.data:
+        ).data
+        if not records:
             raise HTTPException(
                 status_code=404,
                 detail=f"This address {data.address_uu_id} is not found in the user's address list.",
@@ -180,20 +176,23 @@ class BuildUpdateEventMethods(MethodToEvent):
         Build.pre_query = Build.select_action(
             employee_id=token_dict.selected_company.employee_id
         )
-        if Build.filter_all(Build.person_id == token_dict.person_id):
+        if Build.filter_all(
+            Build.person_id == token_dict.person_id,
+            *Build.valid_record_args(Build),
+        ).data:
             Build.pre_query = None
-            if updated_build := Build.update_action(
+            updated_build = Build.update_action(
                 data=data, token=token_dict, build_uu_id=build_uu_id
-            ):
-                Build.save()
-                return JSONResponse(
-                    content={
-                        "completed": True,
-                        "message": "Update Build record",
-                        "data": updated_build,
-                    },
-                    status_code=status.HTTP_200_OK,
-                )
+            )
+            Build.save()
+            return JSONResponse(
+                content={
+                    "completed": True,
+                    "message": "Update Build record",
+                    "data": updated_build,
+                },
+                status_code=status.HTTP_200_OK,
+            )
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail=f"This user can not modify {build_uu_id} - building.",