diff --git a/src/_module_template/router.py b/src/_module_template/router.py index fee6990..f5fb723 100644 --- a/src/_module_template/router.py +++ b/src/_module_template/router.py @@ -81,12 +81,12 @@ async def stop_timer(request: Request, ident: str): async def test_hub_access( headers: header_dependency, client: http_client_dependency, - org_name: Annotated[str, Query()], + org_id: Annotated[int, Query()], resource_name: Annotated[str, Query()] = "example_resource", action: Annotated[str, Query()] = "read", instance: Optional[Annotated[str, Query()]] = None, ): - rn = generate_resource_name(resource=resource_name, org=org_name, instance=instance) + rn = generate_resource_name(resource=resource_name, org=org_id, instance=instance) request_body = { "rn": rn.model_dump(), diff --git a/src/schemas.py b/src/schemas.py index 484031b..09fae42 100644 --- a/src/schemas.py +++ b/src/schemas.py @@ -16,6 +16,6 @@ class CustomBaseModel(BaseModel): class ResourceName(CustomBaseModel): service: str - organisation: str + organisation_id: int resource: str instance: Optional[str] = None diff --git a/src/utils.py b/src/utils.py index 9ca2cc3..d5bfa70 100644 --- a/src/utils.py +++ b/src/utils.py @@ -20,11 +20,11 @@ def create_timer(func: Callable, interval: int, stop_event: threading.Event): def generate_resource_name( - org: str, resource: str, instance: Optional[str] = None + org: int, resource: str, instance: Optional[str] = None ) -> ResourceName: rn = ResourceName( service=settings.SERVICE_NAME, - organisation=org, + organisation_id=org, resource=resource, instance=instance, )