updated Identity and managment service

ApiServices/IdentityService/Endpoints/user/route.py

@@ -1,11 +1,13 @@
 import uuid
 
-from fastapi import APIRouter, Request, Response, Header
+from fastapi import APIRouter, Header
+from typing import Any
 
 from ApiDefaults.config import api_config
 from Events.user.cluster import UserRouterCluster
 from ApiControllers.providers.token_provider import TokenProvider
-
+from ApiControllers.abstracts.default_validations import CommonHeaders
+from Controllers.Postgres.pagination import PaginateOnly
 
 user_route = APIRouter(prefix="/user", tags=["User"])
 
@@ -13,103 +15,58 @@ user_route = APIRouter(prefix="/user", tags=["User"])
 @user_route.post(
     path="/list",
     description="List users endpoint",
-    operation_id="5bc09312-d3f2-4f47-baba-17c928706da8",
+    operation_id="1aca3094-fe80-4e0f-a460-1a506419082a",
 )
 def user_list_route(
-    request: Request,
-    response: Response,
-    language: str = Header(None, alias="language"),
-    domain: str = Header(None, alias="domain"),
-    tz: str = Header(None, alias="timezone"),
+    data: PaginateOnly,
+    headers: CommonHeaders,
 ):
     """
     List users endpoint
     """
-    endpoint_code = "5bc09312-d3f2-4f47-baba-17c928706da8"
-    token = request.headers.get(api_config.ACCESS_TOKEN_TAG, None)
-    token_object = TokenProvider.get_dict_from_redis(token=token)
-    event_key = TokenProvider.retrieve_event_codes(
-        endpoint_code=endpoint_code, token=token_object
-    )
-    headers = {
-        "language": language or "",
-        "domain": domain or "",
-        "eys-ext": f"{str(uuid.uuid4())}",
-        "tz": tz or "GMT+3",
-        "token": token,
-    }
-    event_cluster_matched = UserRouterCluster.get_event_cluster("UserList").match_event(
-        event_key=event_key
-    )
-    response.headers["X-Header"] = "Test Header GET"
-    if runner_callable := event_cluster_matched.event_callable():
-        return runner_callable
-    raise ValueError("Event key not found or multiple matches found")
+    token_object = TokenProvider.get_dict_from_redis(token=headers.token)
+    event_founder_dict = dict(endpoint_code=headers.operation_id, token=token_object)
+    event_key = TokenProvider.retrieve_event_codes(**event_founder_dict)
+    FoundCluster = UserRouterCluster.get_event_cluster("UserList")
+    event_cluster_matched = FoundCluster.match_event(event_key=event_key)
+    return event_cluster_matched.event_callable(data=data)
 
 
 @user_route.post(
     path="/create",
     description="Create users endpoint",
-    operation_id="08d4b572-1584-47bb-aa42-8d068e5514e7",
+    operation_id="9686211f-4260-485d-8076-186c22c053aa",
 )
 def user_create_route(
-    request: Request,
-    response: Response,
-    language: str = Header(None, alias="language"),
-    domain: str = Header(None, alias="domain"),
-    tz: str = Header(None, alias="timezone"),
+    data: Any,
+    headers: CommonHeaders,
 ):
     """
     Create users endpoint
     """
-    endpoint_code = "08d4b572-1584-47bb-aa42-8d068e5514e7"
-    token = request.headers.get(api_config.ACCESS_TOKEN_TAG, None)
-    token_object = TokenProvider.get_dict_from_redis(token=token)
-    event_key = TokenProvider.retrieve_event_codes(
-        endpoint_code=endpoint_code, token=token_object
-    )
-    headers = {
-        "language": language or "",
-        "domain": domain or "",
-        "eys-ext": f"{str(uuid.uuid4())}",
-        "tz": tz or "GMT+3",
-        "token": token,
-    }
-    event_cluster_matched = UserRouterCluster.get_event_cluster(
-        "UserCreate"
-    ).match_event(event_key=event_key)
-    response.headers["X-Header"] = "Test Header POST"
-    if runner_callable := event_cluster_matched.event_callable():
-        return runner_callable
-    raise ValueError("Event key not found or multiple matches found")
+    token_object = TokenProvider.get_dict_from_redis(token=headers.token)
+    event_founder_dict = dict(endpoint_code=headers.operation_id, token=token_object)
+    event_key = TokenProvider.retrieve_event_codes(**event_founder_dict)
+    FoundCluster = UserRouterCluster.get_event_cluster("UserCreate")
+    event_cluster_matched = FoundCluster.match_event(event_key=event_key)
+    return event_cluster_matched.event_callable(data=data)
 
 
 @user_route.post(
     path="/update",
     description="Update users endpoint",
-    operation_id="b641236a-928d-4f19-a1d2-5edf611d1e56",
+    operation_id="268e887b-5ff5-4f99-b1be-7e127e28a198",
 )
-def user_update_route(request: Request, response: Response):
+def user_update_route(
+    data: Any,
+    headers: CommonHeaders,
+):
     """
     Update users endpoint
     """
-    endpoint_code = "b641236a-928d-4f19-a1d2-5edf611d1e56"
-    token = request.headers.get(api_config.ACCESS_TOKEN_TAG, None)
-    token_object = TokenProvider.get_dict_from_redis(token=token)
-    event_key = TokenProvider.retrieve_event_codes(
-        endpoint_code=endpoint_code, token=token_object
-    )
-    headers = {
-        "language": language or "",
-        "domain": domain or "",
-        "eys-ext": f"{str(uuid.uuid4())}",
-        "tz": tz or "GMT+3",
-        "token": token,
-    }
-    event_cluster_matched = UserRouterCluster.get_event_cluster(
-        "UserUpdate"
-    ).match_event(event_key=event_key)
-    response.headers["X-Header"] = "Test Header POST"
-    if runner_callable := event_cluster_matched.event_callable():
-        return runner_callable
-    raise ValueError("Event key not found or multiple matches found")
+    token_object = TokenProvider.get_dict_from_redis(token=headers.token)
+    event_founder_dict = dict(endpoint_code=headers.operation_id, token=token_object)
+    event_key = TokenProvider.retrieve_event_codes(**event_founder_dict)
+    FoundCluster = UserRouterCluster.get_event_cluster("UserUpdate")
+    event_cluster_matched = FoundCluster.match_event(event_key=event_key)
+    return event_cluster_matched.event_callable(data=data)

ApiServices/IdentityService/Events/user/cluster.py

@@ -8,17 +8,17 @@ from .supers_events import (
 UserRouterCluster = RouterCluster(name="UserRouterCluster")
 
 UserEventClusterList = EventCluster(
-    name="UserList", endpoint_uu_id="5bc09312-d3f2-4f47-baba-17c928706da8"
+    name="UserList", endpoint_uu_id="1aca3094-fe80-4e0f-a460-1a506419082a"
 )
 UserEventClusterList.add_event(SuperUsersListEvent)
 
 UserEventClusterCreate = EventCluster(
-    name="UserCreate", endpoint_uu_id="08d4b572-1584-47bb-aa42-8d068e5514e7"
+    name="UserCreate", endpoint_uu_id="9686211f-4260-485d-8076-186c22c053aa"
 )
 UserEventClusterCreate.add_event(SuperUsersCreateEvent)
 
 UserEventClusterUpdate = EventCluster(
-    name="UserUpdate", endpoint_uu_id="b641236a-928d-4f19-a1d2-5edf611d1e56"
+    name="UserUpdate", endpoint_uu_id="268e887b-5ff5-4f99-b1be-7e127e28a198"
 )
 UserEventClusterUpdate.add_event(SuperUsersUpdateEvent)