update routes

http-api/routes/users/__init__.py

@@ -8,15 +8,12 @@ from aws_lambda_powertools.event_handler.exceptions import (
 )
 from elasticsearch import Elasticsearch
 from layercake.dynamodb import (
-    ComposeKey,
     DynamoDBCollection,
     DynamoDBPersistenceLayer,
     KeyPair,
     MissingError,
-    PartitionKey,
-    PrefixKey,
 )
-from pydantic import UUID4, BaseModel, EmailStr, StringConstraints
+from pydantic import UUID4, BaseModel, StringConstraints
 
 import cognito
 import elastic
@@ -25,10 +22,16 @@ from boto3clients import dynamodb_client, idp_client
 from middlewares import AuditLogMiddleware
 from models import User
 from settings import ELASTIC_CONN, USER_POOOL_ID, USER_TABLE
-from user import add_email, del_email, set_email_as_primary
+
+from .emails import router as emails
+from .logs import router as logs
+from .orgs import router as orgs
+
+__all__ = ['logs', 'emails', 'orgs']
 
 
-class BadRequestError(MissingError, PowertoolsBadRequestError): ...
+class BadRequestError(MissingError, PowertoolsBadRequestError):
+    pass
 
 
 router = Router()
@@ -104,108 +107,3 @@ def get_idp(sub: str):
         user_pool_id=USER_POOOL_ID,
         idp_client=idp_client,
     )
-
-
-@router.get(
-    '/<id>/emails',
-    compress=True,
-    tags=['User'],
-    summary='Get user emails',
-)
-def get_emails(id: str):
-    return user_collect.query(
-        KeyPair(id, PrefixKey('emails')),
-        start_key=router.current_event.get_query_string_value('start_key', None),
-    )
-
-
-class Email(BaseModel):
-    email: EmailStr
-
-
-@router.post(
-    '/<id>/emails',
-    compress=True,
-    tags=['User'],
-    summary='Add user email',
-    middlewares=[AuditLogMiddleware('EMAIL_ADD', user_collect, ('email',))],
-)
-def post_email(id: str, payload: Email):
-    add_email(id, payload.email, persistence_layer=user_layer)
-    return JSONResponse(
-        body=payload,
-        status_code=HTTPStatus.CREATED,
-    )
-
-
-class EmailAsPrimary(BaseModel):
-    new_email: EmailStr
-    old_email: EmailStr
-    email_verified: bool = False
-
-
-@router.patch(
-    '/<id>/emails',
-    compress=True,
-    tags=['User'],
-    summary='Add user email as primary',
-    middlewares=[
-        AuditLogMiddleware(
-            'EMAIL_CHANGE',
-            user_collect,
-            (
-                'new_email',
-                'old_email',
-            ),
-        )
-    ],
-)
-def patch_email(id: str, payload: EmailAsPrimary):
-    set_email_as_primary(
-        id,
-        payload.new_email,
-        payload.old_email,
-        email_verified=payload.email_verified,
-        persistence_layer=user_layer,
-    )
-    return JSONResponse(body=payload, status_code=HTTPStatus.OK)
-
-
-@router.delete(
-    '/<id>/emails',
-    compress=True,
-    tags=['User'],
-    summary='Delete user email',
-    middlewares=[AuditLogMiddleware('EMAIL_DEL', user_collect, ('email',))],
-)
-def delete_email(id: str, payload: Email):
-    assert del_email(id, payload.email, persistence_layer=user_layer)
-    return payload
-
-
-@router.get(
-    '/<id>/logs',
-    compress=True,
-    tags=['User'],
-    summary='Get user logs',
-)
-def get_logs(id: str):
-    return user_collect.query(
-        # Post-migration: uncomment to enable PartitionKey with a composite key (id with `logs` prefix).
-        # PartitionKey(ComposeKey(id, 'logs')),
-        PartitionKey(ComposeKey(id, 'log', delimiter=':')),
-        start_key=router.current_event.get_query_string_value('start_key', None),
-    )
-
-
-@router.get(
-    '/<id>/orgs',
-    compress=True,
-    tags=['User'],
-    summary='Get user orgs',
-)
-def get_orgs(id: str):
-    return user_collect.query(
-        KeyPair(id, PrefixKey('orgs')),
-        start_key=router.current_event.get_query_string_value('start_key', None),
-    )