events auth repair

ApiEvents/EventServiceApi/account/__init__.py

@@ -0,0 +1,9 @@
+"""
+Account records package initialization.
+"""
+
+from .endpoints import ACCOUNT_RECORDS_CONFIG
+
+__all__ = [
+    "ACCOUNT_RECORDS_CONFIG",
+]

ApiEvents/EventServiceApi/account/account_records.py

@@ -1,24 +1,22 @@
-import typing
+"""
+Account records service implementation.
+"""
 
-from ApiEvents.abstract_class import (
-    MethodToEvent,
-    RouteFactoryConfig,
-    EndpointFactoryConfig,
-    endpoint_wrapper,
-)
-from ApiEvents.base_request_model import BaseRequestModel, DictRequestModel
-
-from typing import TYPE_CHECKING, Dict, Any
-from fastapi import Request, Path, Body, Depends, APIRouter
-from pydantic import BaseModel, Field
-
-if TYPE_CHECKING:
-    from fastapi import Request
+from typing import Dict, Any, Union
+from pydantic import Field
 
+from ApiEvents.abstract_class import MethodToEvent, endpoint_wrapper
+from ApiEvents.base_request_model import DictRequestModel
 from ApiValidations.Custom.token_objects import (
     OccupantTokenObject,
     EmployeeTokenObject,
 )
+from ApiLibrary import system_arrow
+from ApiValidations.Request.account_records import (
+    InsertAccountRecord,
+    UpdateAccountRecord,
+)
+from ApiValidations.Request.base_validations import ListOptions
 from Schemas import (
     BuildLivingSpace,
     AccountRecords,
@@ -26,49 +24,16 @@ from Schemas import (
     BuildDecisionBookPayments,
     ApiEnumDropdown,
 )
-from ApiLibrary import system_arrow
-from ApiValidations.Request import (
-    InsertAccountRecord,
-    UpdateAccountRecord,
-    ListOptions,
-)
 from Services.PostgresDb.Models.alchemy_response import (
     AlchemyJsonResponse,
     DictJsonResponse,
 )
 from ApiValidations.Response import AccountRecordResponse
-
-
-class AddressUpdateRequest(BaseModel):
-    """Request model for address update."""
-
-    data: Dict[str, Any] = Field(..., description="Updated address data")
-
-
-class AddressUpdateResponse(BaseModel):
-    """Response model for address update."""
-
-    address_uu_id: str = Field(..., description="UUID of the updated address")
-    data: Dict[str, Any] = Field(..., description="Updated address data")
-    function_code: str = Field(..., description="Function code for the endpoint")
-
-
-class InsertAccountRecordRequestModel(BaseRequestModel[InsertAccountRecord]):
-    """Request model for inserting account records."""
-
-    pass
-
-
-class UpdateAccountRecordRequestModel(BaseRequestModel[UpdateAccountRecord]):
-    """Request model for updating account records."""
-
-    pass
-
-
-class ListOptionsRequestModel(BaseRequestModel[ListOptions]):
-    """Request model for list options."""
-
-    pass
+from .models import (
+    InsertAccountRecordRequestModel,
+    UpdateAccountRecordRequestModel,
+    ListOptionsRequestModel,
+)
 
 
 class AccountRecordsListEventMethods(MethodToEvent):
@@ -90,7 +55,7 @@ class AccountRecordsListEventMethods(MethodToEvent):
     def account_records_list(
         cls,
         list_options: ListOptionsRequestModel,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         db_session = AccountRecords.new_session()
         if isinstance(token_dict, OccupantTokenObject):
@@ -119,7 +84,7 @@ class AccountRecordsListEventMethods(MethodToEvent):
     def account_records_list_flt_res(
         cls,
         list_options: ListOptionsRequestModel,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         db_session = AccountRecords.new_session()
         if not isinstance(token_dict, OccupantTokenObject):
@@ -269,7 +234,7 @@ class AccountRecordsCreateEventMethods(MethodToEvent):
     def account_records_create(
         cls,
         data: InsertAccountRecordRequestModel,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         data_dict = data.excluded_dump()
         if isinstance(token_dict, OccupantTokenObject):
@@ -358,7 +323,7 @@ class AccountRecordsUpdateEventMethods(MethodToEvent):
         cls,
         build_uu_id: str,
         data: UpdateAccountRecordRequestModel,
-        token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject],
+        token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         if isinstance(token_dict, OccupantTokenObject):
             pass
@@ -373,123 +338,3 @@ class AccountRecordsUpdateEventMethods(MethodToEvent):
             cls_object=AccountRecords,
             response_model=UpdateAccountRecord,
         )
-
-
-@endpoint_wrapper("/account/records/address/list")
-async def address_list(request: "Request", data: ListOptionsRequestModel):
-    """Handle address list endpoint."""
-    return {
-        "data": data,
-        "request": str(request.headers),
-        "request_url": str(request.url),
-        "request_base_url": str(request.base_url),
-    }
-
-
-@endpoint_wrapper("/account/records/address/create")
-async def address_create(request: "Request", data: DictRequestModel):
-    """Handle address creation endpoint."""
-    return {
-        "data": data,
-        "request": str(request.headers),
-        "request_url": str(request.url),
-        "request_base_url": str(request.base_url),
-    }
-
-
-@endpoint_wrapper("/account/records/address/search")
-async def address_search(request: "Request", data: DictRequestModel):
-    """Handle address search endpoint."""
-    return {"data": data}
-
-
-router = APIRouter()
-
-
-@endpoint_wrapper("/account/records/address/{address_uu_id}")
-async def address_update(
-    request: Request,
-    address_uu_id: str = Path(..., description="UUID of the address to update"),
-    request_data: DictRequestModel = Body(..., description="Request body"),
-):
-    """
-    Handle address update endpoint.
-
-    Args:
-        request: FastAPI request object
-        address_uu_id: UUID of the address to update
-        request_data: Request body containing updated address data
-
-    Returns:
-        DictJsonResponse: Response containing updated address info
-    """
-    return DictJsonResponse(
-        data={
-            "address_uu_id": address_uu_id,
-            "data": request_data.root,
-            "request": str(request.headers),
-            "request_url": str(request.url),
-            "request_base_url": str(request.base_url),
-        }
-    )
-
-
-prefix = "/account/records"
-
-# Account Records Router Configuration
-ACCOUNT_RECORDS_CONFIG = RouteFactoryConfig(
-    name="account_records",
-    prefix=prefix,
-    tags=["Account Records"],
-    include_in_schema=True,
-    endpoints=[
-        EndpointFactoryConfig(
-            url_prefix=prefix,
-            url_endpoint="/address/list",
-            url_of_endpoint="/account/records/address/list",
-            endpoint="/address/list",
-            method="POST",
-            summary="List Active/Delete/Confirm Address",
-            description="List Active/Delete/Confirm Address",
-            is_auth_required=True,
-            is_event_required=True,
-            endpoint_function=address_list,
-        ),
-        EndpointFactoryConfig(
-            url_prefix=prefix,
-            url_endpoint="/address/create",
-            url_of_endpoint="/account/records/address/create",
-            endpoint="/address/create",
-            method="POST",
-            summary="Create Address with given auth levels",
-            description="Create Address with given auth levels",
-            is_auth_required=False,
-            is_event_required=False,
-            endpoint_function=address_create,
-        ),
-        EndpointFactoryConfig(
-            url_prefix=prefix,
-            url_endpoint="/address/search",
-            url_of_endpoint="/account/records/address/search",
-            endpoint="/address/search",
-            method="POST",
-            summary="Search Address with given auth levels",
-            description="Search Address with given auth levels",
-            is_auth_required=True,
-            is_event_required=True,
-            endpoint_function=address_search,
-        ),
-        EndpointFactoryConfig(
-            url_prefix=prefix,
-            url_endpoint="/address/{address_uu_id}",
-            url_of_endpoint="/account/records/address/{address_uu_id}",
-            endpoint="/address/{address_uu_id}",
-            method="PUT",
-            summary="Update Address with given auth levels",
-            description="Update Address with given auth levels",
-            is_auth_required=True,
-            is_event_required=True,
-            endpoint_function=address_update,
-        ),
-    ],
-).as_dict()

ApiEvents/EventServiceApi/account/endpoints.py

@@ -0,0 +1,129 @@
+"""
+Account records endpoint configurations.
+
+"""
+
+from ApiEvents.abstract_class import RouteFactoryConfig, EndpointFactoryConfig, endpoint_wrapper
+from ApiEvents.base_request_model import DictRequestModel
+
+
+from Services.PostgresDb.Models.alchemy_response import DictJsonResponse
+from fastapi import Request, Path, Body
+
+from .models import ListOptionsRequestModel
+
+
+@endpoint_wrapper("/account/records/address/list")
+async def address_list(request: "Request", data: ListOptionsRequestModel):
+    """Handle address list endpoint."""
+    return {
+        "data": data,
+        "request": str(request.headers),
+        "request_url": str(request.url),
+        "request_base_url": str(request.base_url),
+    }
+
+
+@endpoint_wrapper("/account/records/address/create")
+async def address_create(request: "Request", data: DictRequestModel):
+    """Handle address creation endpoint."""
+    return {
+        "data": data,
+        "request": str(request.headers),
+        "request_url": str(request.url),
+        "request_base_url": str(request.base_url),
+    }
+
+
+@endpoint_wrapper("/account/records/address/search")
+async def address_search(request: "Request", data: DictRequestModel):
+    """Handle address search endpoint."""
+    return {"data": data}
+
+
+@endpoint_wrapper("/account/records/address/{address_uu_id}")
+async def address_update(
+    request: Request,
+    address_uu_id: str = Path(..., description="UUID of the address to update"),
+    request_data: DictRequestModel = Body(..., description="Request body"),
+):
+    """
+    Handle address update endpoint.
+
+    Args:
+        request: FastAPI request object
+        address_uu_id: UUID of the address to update
+        request_data: Request body containing updated address data
+
+    Returns:
+        DictJsonResponse: Response containing updated address info
+    """
+    return DictJsonResponse(
+        data={
+            "address_uu_id": address_uu_id,
+            "data": request_data.root,
+            "request": str(request.headers),
+            "request_url": str(request.url),
+            "request_base_url": str(request.base_url),
+        }
+    )
+
+prefix = "/account/records"
+
+# Account Records Router Configuration
+ACCOUNT_RECORDS_CONFIG = RouteFactoryConfig(
+    name="account_records",
+    prefix=prefix,
+    tags=["Account Records"],
+    include_in_schema=True,
+    endpoints=[
+        EndpointFactoryConfig(
+            url_prefix=prefix,
+            url_endpoint="/address/list",
+            url_of_endpoint="/account/records/address/list",
+            endpoint="/address/list",
+            method="POST",
+            summary="List Active/Delete/Confirm Address",
+            description="List Active/Delete/Confirm Address",
+            is_auth_required=True,
+            is_event_required=True,
+            endpoint_function=address_list,
+        ),
+        EndpointFactoryConfig(
+            url_prefix=prefix,
+            url_endpoint="/address/create",
+            url_of_endpoint="/account/records/address/create",
+            endpoint="/address/create",
+            method="POST",
+            summary="Create Address with given auth levels",
+            description="Create Address with given auth levels",
+            is_auth_required=False,
+            is_event_required=False,
+            endpoint_function=address_create,
+        ),
+        EndpointFactoryConfig(
+            url_prefix=prefix,
+            url_endpoint="/address/search",
+            url_of_endpoint="/account/records/address/search",
+            endpoint="/address/search",
+            method="POST",
+            summary="Search Address with given auth levels",
+            description="Search Address with given auth levels",
+            is_auth_required=True,
+            is_event_required=True,
+            endpoint_function=address_search,
+        ),
+        EndpointFactoryConfig(
+            url_prefix=prefix,
+            url_endpoint="/address/{address_uu_id}",
+            url_of_endpoint="/account/records/address/{address_uu_id}",
+            endpoint="/address/{address_uu_id}",
+            method="PUT",
+            summary="Update Address with given auth levels",
+            description="Update Address with given auth levels",
+            is_auth_required=True,
+            is_event_required=True,
+            endpoint_function=address_update,
+        ),
+    ],
+).as_dict()

ApiEvents/EventServiceApi/account/models.py

@@ -0,0 +1,49 @@
+"""
+Account records request and response models.
+"""
+
+from typing import TYPE_CHECKING, Dict, Any
+from pydantic import BaseModel, Field, RootModel
+from ApiEvents.base_request_model import BaseRequestModel
+
+if TYPE_CHECKING:
+    from ApiValidations.Request import (
+        InsertAccountRecord,
+        UpdateAccountRecord,
+        ListOptions,
+    )
+
+
+class AddressUpdateRequest(RootModel[Dict[str, Any]]):
+    """Request model for address update."""
+    model_config = {
+        "json_schema_extra": {
+            "example": {
+                "street": "123 Main St",
+                "city": "Example City",
+                "country": "Example Country"
+            }
+        }
+    }
+
+
+class AddressUpdateResponse(BaseModel):
+    """Response model for address update."""
+    address_uu_id: str = Field(..., description="UUID of the updated address")
+    data: Dict[str, Any] = Field(..., description="Updated address data")
+    function_code: str = Field(..., description="Function code for the endpoint")
+
+
+class InsertAccountRecordRequestModel(BaseRequestModel["InsertAccountRecord"]):
+    """Request model for inserting account records."""
+    pass
+
+
+class UpdateAccountRecordRequestModel(BaseRequestModel["UpdateAccountRecord"]):
+    """Request model for updating account records."""
+    pass
+
+
+class ListOptionsRequestModel(BaseRequestModel["ListOptions"]):
+    """Request model for list options."""
+    pass

ApiEvents/EventServiceApi/route_configs.py

@@ -6,7 +6,7 @@ to be used by the dynamic route creation system.
 """
 
 from typing import Dict, List, Any
-from .account.account_records import ACCOUNT_RECORDS_CONFIG
+from .account.endpoints import ACCOUNT_RECORDS_CONFIG
 
 
 # Registry of all route configurations