events updated

api_events/events/identity/users.py

@@ -34,10 +34,13 @@ class UserListEventMethods(MethodToEvent):
         list_options: ListOptions,
         token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
     ):
-        # Users.pre_query = Users.select_action(duty_id_list=[
-        #     token_dict.selected_company.duty_id,
-        #     token_dict.selected_company.bulk_duties_id
-        # ])
+        if isinstance(token_dict, OccupantTokenObject):
+            raise Users.raise_http_exception(
+                status_code="HTTP_403_FORBIDDEN",
+                message="Occupant object can not list users",
+                error_case="NOTAUTHORIZED",
+                data={},
+            )
         if "user_uu_id_list" in list_options.query:
             people_ids = list_options.query.pop("user_uu_id_list")
             people_id_list = (
@@ -46,11 +49,11 @@ class UserListEventMethods(MethodToEvent):
                     Users.uu_id.in_(people_ids), *Users.valid_record_args(Users)
                 ).data
             )
-            People.filter_attr = list_options
-            records = People.filter_all(
-                People.id.in_(people_id_list),
-                *People.valid_record_args(People),
-            ).data
+            Users.filter_attr = list_options
+            records = Users.filter_all(
+                Users.person_id.in_(people_id_list),
+                *Users.valid_record_args(Users),
+            )
             return AlchemyJsonResponse(
                 completed=True,
                 message="Users are listed successfully",
@@ -59,7 +62,7 @@ class UserListEventMethods(MethodToEvent):
         Users.filter_attr = list_options
         records = Users.filter_all(
             *Users.valid_record_args(Users),
-        ).data
+        )
         return AlchemyJsonResponse(
             completed=True,
             message="Users are listed successfully",