From af82f74eb6b8e743dbebfba0ac83deb5aa74afff Mon Sep 17 00:00:00 2001
From: berkay <karatay.berkay@gmail.com>
Date: Thu, 30 Jan 2025 17:21:25 +0300
Subject: [PATCH] updated list options and response validatore tested

---
 .idea/workspace.xml                           |  6 +--
 .../Middleware/token_event_middleware.py      |  2 +-
 .../events/account/function_handlers.py       | 41 ++++---------------
 .../template/template/function_handlers.py    |  4 +-
 4 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index db5868d..d98707d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,11 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="b5202e0c-6ddf-4a56-a13a-e18798c4c7cf" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/account_records.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/account_records.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/api_events.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/api_events.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ApiLayers/Middleware/token_event_middleware.py" beforeDir="false" afterPath="$PROJECT_DIR$/ApiLayers/Middleware/token_event_middleware.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/function_handlers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/function_handlers.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/base_request_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/base_request_model.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Services/PostgresDb/Models/pagination.py" beforeDir="false" afterPath="$PROJECT_DIR$/Services/PostgresDb/Models/pagination.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Events/AllEvents/template/template/function_handlers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/template/template/function_handlers.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/ApiLayers/Middleware/token_event_middleware.py b/ApiLayers/Middleware/token_event_middleware.py
index dbf0d57..f24cd56 100644
--- a/ApiLayers/Middleware/token_event_middleware.py
+++ b/ApiLayers/Middleware/token_event_middleware.py
@@ -102,7 +102,7 @@ class TokenEventMiddleware:
             )
 
         # Intersect function codes with user accers objects available event codes
-        reachable_event_codes = ["36a165fe-a2f3-437b-80ee-1ee44670fe70"]
+        # reachable_event_codes = ["36a165fe-a2f3-437b-80ee-1ee44670fe70"]
         intersected_code = list(
             set(function_code_list_of_event) & set(reachable_event_codes)
         )
diff --git a/Events/AllEvents/events/account/function_handlers.py b/Events/AllEvents/events/account/function_handlers.py
index dbd4f48..4f00439 100644
--- a/Events/AllEvents/events/account/function_handlers.py
+++ b/Events/AllEvents/events/account/function_handlers.py
@@ -44,52 +44,29 @@ class AccountListEventMethods(BaseRouteModel):
      }
      """
 
-
     @classmethod
     def account_records_list(cls, data: Optional[Union[dict, ListOptions]]) -> PaginationResult:
-        from ApiLayers.Schemas import AddressNeighborhood
         list_options_base = ListOptionsBase(
-            table=AddressNeighborhood, list_options=data, model_query=None,
+            table=AccountRecords, list_options=data, model_query=None,
         )
         db_session, query_options = list_options_base.init_list_options()
         if cls.context_retriever.token.is_occupant:
-            AddressNeighborhood.pre_query = AddressNeighborhood.filter_all(
-                AddressNeighborhood.neighborhood_code.icontains("10"),
+            AccountRecords.pre_query = AccountRecords.filter_all(
+                AccountRecords.company_id
+                == cls.context_retriever.token.selected_occupant.responsible_company_id,
                 db=db_session,
             ).query
         elif cls.context_retriever.token.is_employee:
-            AddressNeighborhood.pre_query = AddressNeighborhood.filter_all(
-                AddressNeighborhood.neighborhood_code.icontains("9"),
+            AccountRecords.pre_query = AccountRecords.filter_all(
+                AccountRecords.company_id ==
+                cls.context_retriever.token.selected_company.company_id,
                 db=db_session,
             ).query
-        records = AddressNeighborhood.filter_all(*query_options.convert(), db=db_session)
+        records = AccountRecords.filter_all(*query_options.convert(), db=db_session)
         return list_options_base.paginated_result(
-            records=records, response_model=cls.context_retriever.RESPONSE_VALIDATOR
+            records=records, response_model=getattr(cls.context_retriever, 'RESPONSE_VALIDATOR', None)
         )
 
-    # @classmethod
-    # def account_records_list(cls, data: Optional[Union[dict, ListOptions]]) -> PaginationResult:
-    #     list_options_base = ListOptionsBase(
-    #         table=AccountRecords, list_options=data, model_query=None,
-    #     )
-    #     db_session, query_options = list_options_base.init_list_options()
-    #     if cls.context_retriever.token.is_occupant:
-    #         AccountRecords.pre_query = AccountRecords.filter_all(
-    #             AccountRecords.company_id
-    #             == cls.context_retriever.token.selected_occupant.responsible_company_id,
-    #             db=db_session,
-    #         ).query
-    #     elif cls.context_retriever.token.is_employee:
-    #         AccountRecords.pre_query = AccountRecords.filter_all(
-    #             AccountRecords.company_id ==
-    #             cls.context_retriever.token.selected_company.company_id,
-    #             db=db_session,
-    #         ).query
-    #     records = AccountRecords.filter_all(*query_options.convert(), db=db_session)
-    #     return list_options_base.paginated_result(
-    #         records=records, response_model=cls.context_retriever.RESPONSE_VALIDATOR
-    #     )
-
     # @classmethod
     # def account_records_list_flt_res(cls, list_options: ListOptions) -> PaginationResult:
     #     list_options_base = ListOptionsBase(
diff --git a/Events/AllEvents/template/template/function_handlers.py b/Events/AllEvents/template/template/function_handlers.py
index 7f783bb..4c8fbcd 100644
--- a/Events/AllEvents/template/template/function_handlers.py
+++ b/Events/AllEvents/template/template/function_handlers.py
@@ -65,4 +65,6 @@ class TemplateFunctions(BaseRouteModel):
                 db=db_session,
             ).query
         records = AddressNeighborhood.filter_all(*query_options.convert(), db=db_session)
-        return list_options_base.paginated_result(records=records)
+        return list_options_base.paginated_result(
+            records=records, response_model=getattr(cls.context_retriever, 'RESPONSE_VALIDATOR', None)
+        )
\ No newline at end of file