zrb 1.0.0b8__py3-none-any.whl → 1.0.0b9__py3-none-any.whl

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/migration/versions/3093c7336477_add_auth_tables.py

@@ -22,7 +22,7 @@ depends_on: Union[str, Sequence[str], None] = None
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "permission",
+        "permissions",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=True),
         sa.Column("created_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
@@ -32,22 +32,22 @@ def upgrade() -> None:
         sa.Column("description", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f("ix_permission_name"), "permission", ["name"], unique=True)
+    op.create_index(op.f("ix_permission_name"), "permissions", ["name"], unique=True)
     op.create_index(
-        op.f("ix_permission_created_at"), "permission", ["created_at"], unique=False
+        op.f("ix_permission_created_at"), "permissions", ["created_at"], unique=False
     )
     op.create_index(
-        op.f("ix_permission_created_by"), "permission", ["created_by"], unique=False
+        op.f("ix_permission_created_by"), "permissions", ["created_by"], unique=False
     )
     op.create_index(
-        op.f("ix_permission_updated_at"), "permission", ["updated_at"], unique=False
+        op.f("ix_permission_updated_at"), "permissions", ["updated_at"], unique=False
     )
     op.create_index(
-        op.f("ix_permission_updated_by"), "permission", ["updated_by"], unique=False
+        op.f("ix_permission_updated_by"), "permissions", ["updated_by"], unique=False
     )
 
     op.create_table(
-        "role",
+        "roles",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=True),
         sa.Column("created_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
@@ -57,14 +57,14 @@ def upgrade() -> None:
         sa.Column("description", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f("ix_role_name"), "role", ["name"], unique=True)
-    op.create_index(op.f("ix_role_created_at"), "role", ["created_at"], unique=False)
-    op.create_index(op.f("ix_role_created_by"), "role", ["created_by"], unique=False)
-    op.create_index(op.f("ix_role_updated_at"), "role", ["updated_at"], unique=False)
-    op.create_index(op.f("ix_role_updated_by"), "role", ["updated_by"], unique=False)
+    op.create_index(op.f("ix_role_name"), "roles", ["name"], unique=True)
+    op.create_index(op.f("ix_role_created_at"), "roles", ["created_at"], unique=False)
+    op.create_index(op.f("ix_role_created_by"), "roles", ["created_by"], unique=False)
+    op.create_index(op.f("ix_role_updated_at"), "roles", ["updated_at"], unique=False)
+    op.create_index(op.f("ix_role_updated_by"), "roles", ["updated_by"], unique=False)
 
     op.create_table(
-        "rolepermission",
+        "role_permissions",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("role_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("permission_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
@@ -73,34 +73,39 @@ def upgrade() -> None:
         sa.PrimaryKeyConstraint("id"),
     )
     op.create_index(
-        op.f("ix_rolepermission_permission_id"),
-        "rolepermission",
+        op.f("ix_role_permissions_permission_id"),
+        "role_permissions",
         ["permission_id"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_rolepermission_role_id"), "rolepermission", ["role_id"], unique=False
+        op.f("ix_role_permissions_role_id"),
+        "role_permissions",
+        ["role_id"],
+        unique=False,
     )
 
     op.create_table(
-        "user",
+        "users",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("username", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("password", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("active", sa.Boolean(), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=False),
         sa.Column("created_by", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("updated_at", sa.DateTime(), nullable=True),
         sa.Column("updated_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f("ix_user_username"), "user", ["username"], unique=True)
-    op.create_index(op.f("ix_user_created_at"), "user", ["created_at"], unique=False)
-    op.create_index(op.f("ix_user_created_by"), "user", ["created_by"], unique=False)
-    op.create_index(op.f("ix_user_updated_at"), "user", ["updated_at"], unique=False)
-    op.create_index(op.f("ix_user_updated_by"), "user", ["updated_by"], unique=False)
+    op.create_index(op.f("ix_user_username"), "users", ["username"], unique=True)
+    op.create_index(op.f("ix_user_active"), "users", ["active"], unique=False)
+    op.create_index(op.f("ix_user_created_at"), "users", ["created_at"], unique=False)
+    op.create_index(op.f("ix_user_created_by"), "users", ["created_by"], unique=False)
+    op.create_index(op.f("ix_user_updated_at"), "users", ["updated_at"], unique=False)
+    op.create_index(op.f("ix_user_updated_by"), "users", ["updated_by"], unique=False)
 
     op.create_table(
-        "userrole",
+        "user_roles",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("user_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("role_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
@@ -108,53 +113,90 @@ def upgrade() -> None:
         sa.Column("created_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f("ix_userrole_role_id"), "userrole", ["role_id"], unique=False)
-    op.create_index(op.f("ix_userrole_user_id"), "userrole", ["user_id"], unique=False)
+    op.create_index(
+        op.f("ix_user_roles_role_id"), "user_roles", ["role_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_user_roles_user_id"), "user_roles", ["user_id"], unique=False
+    )
 
     op.create_table(
-        "session",
+        "user_sessions",
         sa.Column("id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("user_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-        sa.Column("token", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("access_token", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("refresh_token", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("access_token_expired_at", sa.DateTime(), nullable=False),
+        sa.Column("refresh_token_expired_at", sa.DateTime(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f("ix_session_user_id"), "session", ["user_id"], unique=False)
-    op.create_index(op.f("ix_session_token"), "session", ["token"], unique=True)
+    op.create_index(
+        op.f("ix_user_session_user_id"), "user_sessions", ["user_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_user_session_token"), "user_sessions", ["access_token"], unique=True
+    )
+    op.create_index(
+        op.f("ix_user_session_refresh_token"),
+        "user_sessions",
+        ["refresh_token"],
+        unique=True,
+    )
+    op.create_index(
+        op.f("ix_user_session_access_token_expired_at"),
+        "user_sessions",
+        ["access_token_expired_at"],
+    )
+    op.create_index(
+        op.f("ix_user_session_refresh_token_expired_at"),
+        "user_sessions",
+        ["refresh_token_expired_at"],
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f("ix_session_token"), table_name="session")
-    op.drop_index(op.f("ix_session_user_id"), table_name="session")
-    op.drop_table("session")
-
-    op.drop_index(op.f("ix_userrole_user_id"), table_name="userrole")
-    op.drop_index(op.f("ix_userrole_role_id"), table_name="userrole")
-    op.drop_table("userrole")
-
-    op.drop_index(op.f("ix_user_username"), table_name="user")
-    op.drop_index(op.f("ix_user_updated_by"), table_name="user")
-    op.drop_index(op.f("ix_user_updated_at"), table_name="user")
-    op.drop_index(op.f("ix_user_created_by"), table_name="user")
-    op.drop_index(op.f("ix_user_created_at"), table_name="user")
-    op.drop_table("user")
-
-    op.drop_index(op.f("ix_rolepermission_role_id"), table_name="rolepermission")
-    op.drop_index(op.f("ix_rolepermission_permission_id"), table_name="rolepermission")
-    op.drop_table("rolepermission")
-
-    op.drop_index(op.f("ix_role_name"), table_name="role")
-    op.drop_index(op.f("ix_role_updated_by"), table_name="role")
-    op.drop_index(op.f("ix_role_updated_at"), table_name="role")
-    op.drop_index(op.f("ix_role_created_by"), table_name="role")
-    op.drop_index(op.f("ix_role_created_at"), table_name="role")
-    op.drop_table("role")
-
-    op.drop_index(op.f("ix_permission_updated_by"), table_name="permission")
-    op.drop_index(op.f("ix_permission_updated_at"), table_name="permission")
-    op.drop_index(op.f("ix_permission_created_by"), table_name="permission")
-    op.drop_index(op.f("ix_permission_created_at"), table_name="permission")
-    op.drop_index(op.f("ix_permission_name"), table_name="permission")
-    op.drop_table("permission")
+    op.drop_index(op.f("ix_user_session_user_id"), table_name="user_sessions")
+    op.drop_index(op.f("ix_user_session_access_token"), table_name="user_sessions")
+    op.drop_index(op.f("ix_user_session_refresh_token"), table_name="user_sessions")
+    op.drop_index(
+        op.f("ix_user_session_access_token_expired_at"), table_name="user_sessions"
+    )
+    op.drop_index(
+        op.f("ix_user_session_refresh_token_expired_at"), table_name="user_sessions"
+    )
+    op.drop_table("user_sessions")
+
+    op.drop_index(op.f("ix_user_roles_user_id"), table_name="user_roles")
+    op.drop_index(op.f("ix_user_roles_role_id"), table_name="user_roles")
+    op.drop_table("user_roles")
+
+    op.drop_index(op.f("ix_user_username"), table_name="users")
+    op.drop_index(op.f("ix_user_active"), table_name="users")
+    op.drop_index(op.f("ix_user_updated_by"), table_name="users")
+    op.drop_index(op.f("ix_user_updated_at"), table_name="users")
+    op.drop_index(op.f("ix_user_created_by"), table_name="users")
+    op.drop_index(op.f("ix_user_created_at"), table_name="users")
+    op.drop_table("users")
+
+    op.drop_index(op.f("ix_role_permissions_role_id"), table_name="role_permissions")
+    op.drop_index(
+        op.f("ix_role_permissions_permission_id"), table_name="role_permissions"
+    )
+    op.drop_table("role_permissions")
+
+    op.drop_index(op.f("ix_role_name"), table_name="roles")
+    op.drop_index(op.f("ix_role_updated_by"), table_name="roles")
+    op.drop_index(op.f("ix_role_updated_at"), table_name="roles")
+    op.drop_index(op.f("ix_role_created_by"), table_name="roles")
+    op.drop_index(op.f("ix_role_created_at"), table_name="roles")
+    op.drop_table("roles")
+
+    op.drop_index(op.f("ix_permission_updated_by"), table_name="permissions")
+    op.drop_index(op.f("ix_permission_updated_at"), table_name="permissions")
+    op.drop_index(op.f("ix_permission_created_by"), table_name="permissions")
+    op.drop_index(op.f("ix_permission_created_at"), table_name="permissions")
+    op.drop_index(op.f("ix_permission_name"), table_name="permissions")
+    op.drop_table("permissions")
     # ### end Alembic commands ###

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/migration_metadata.py

@@ -1,7 +1,6 @@
 from my_app_name.schema.permission import Permission
 from my_app_name.schema.role import Role, RolePermission
-from my_app_name.schema.session import Session
-from my_app_name.schema.user import User, UserRole
+from my_app_name.schema.user import User, UserRole, UserSession
 from sqlalchemy import MetaData
 
 metadata = MetaData()
@@ -19,5 +18,5 @@ User.__table__.tometadata(metadata)
 UserRole.metadata = metadata
 UserRole.__table__.tometadata(metadata)
 
-Session.metadata = metadata
-Session.__table__.tometadata(metadata)
+UserSession.metadata = metadata
+UserSession.__table__.tometadata(metadata)

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/route.py

@@ -5,10 +5,23 @@ from my_app_name.config import APP_MAIN_MODULE, APP_MODE, APP_MODULES
 from my_app_name.module.auth.service.permission.permission_service_factory import (
     permission_service,
 )
+from my_app_name.module.auth.service.role.role_service_factory import role_service
 from my_app_name.module.auth.service.user.user_service_factory import user_service
 
 
-def serve_health_check(app: FastAPI):
+def serve_route(app: FastAPI):
+    if APP_MODE != "microservices" or "auth" not in APP_MODULES:
+        return
+    if APP_MAIN_MODULE == "auth":
+        _serve_health_check(app)
+        _serve_readiness_check(app)
+
+    permission_service.serve_route(app)
+    role_service.serve_route(app)
+    user_service.serve_route(app)
+
+
+def _serve_health_check(app: FastAPI):
     @app.api_route("/health", methods=["GET", "HEAD"], response_model=BasicResponse)
     async def health():
         """
@@ -17,7 +30,7 @@ def serve_health_check(app: FastAPI):
         return BasicResponse(message="ok")
 
 
-def serve_readiness_check(app: FastAPI):
+def _serve_readiness_check(app: FastAPI):
     @app.api_route("/readiness", methods=["GET", "HEAD"], response_model=BasicResponse)
     async def readiness():
         """
@@ -26,16 +39,4 @@ def serve_readiness_check(app: FastAPI):
         return BasicResponse(message="ok")
 
 
-def serve_route(app: FastAPI):
-    if APP_MODE != "microservices" or "auth" not in APP_MODULES:
-        return
-    if APP_MAIN_MODULE == "auth":
-        serve_health_check(app)
-        serve_readiness_check(app)
-
-    # Serve user endpoints for APIClient
-    user_service.serve_route(app)
-    permission_service.serve_route(app)
-
-
 serve_route(app)

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/permission_service.py

@@ -71,11 +71,11 @@ class PermissionService(BaseService):
     @BaseService.route(
         "/api/v1/permissions/bulk",
         methods=["put"],
-        response_model=PermissionResponse,
+        response_model=list[PermissionResponse],
     )
     async def update_permission_bulk(
         self, permission_ids: list[str], data: PermissionUpdateWithAudit
-    ) -> PermissionResponse:
+    ) -> list[PermissionResponse]:
         await self.permission_repository.update_bulk(permission_ids, data)
         return await self.permission_repository.get_by_ids(permission_ids)
 
@@ -93,11 +93,11 @@ class PermissionService(BaseService):
     @BaseService.route(
         "/api/v1/permissions/bulk",
         methods=["delete"],
-        response_model=PermissionResponse,
+        response_model=list[PermissionResponse],
     )
     async def delete_permission_bulk(
         self, permission_ids: list[str], deleted_by: str
-    ) -> PermissionResponse:
+    ) -> list[PermissionResponse]:
         permissions = await self.permission_repository.get_by_ids(permission_ids)
         await self.permission_repository.delete_bulk(permission_ids)
         return permissions

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/repository/role_db_repository.py

@@ -54,28 +54,47 @@ class RoleDBRepository(
                 and permission.id not in role_permission_map[role.id]
             ):
                 role_permission_map[role.id].append(permission.id)
-                role_map[role.id]["permissions"].append(permission.model_dump())
+                role_map[role.id]["permissions"].append(permission)
         return [
-            RoleResponse(**data["role"].model_dump(), permissions=data["permissions"])
+            RoleResponse(
+                **data["role"].model_dump(),
+                permission_names=[
+                    permission.name for permission in data["permissions"]
+                ],
+            )
             for data in role_map.values()
         ]
 
     async def add_permissions(self, data: dict[str, list[str]], created_by: str):
         now = datetime.datetime.now(datetime.timezone.utc)
+        # get mapping from perrmission names to permission ids
+        all_permission_names = {
+            name for permission_names in data.values() for name in permission_names
+        }
+        async with self._session_scope() as session:
+            result = await self._execute_statement(
+                session,
+                select(Permission.id, Permission.name).where(
+                    Permission.name.in_(all_permission_names)
+                ),
+            )
+            permission_mapping = {row.name: row.id for row in result}
+        # Assemble data dict
         data_dict_list: list[dict[str, Any]] = []
-        for role_id, permission_ids in data.items():
-            for permission_id in permission_ids:
+        for role_id, permission_names in data.items():
+            for permission_name in permission_names:
                 data_dict_list.append(
                     self._model_to_data_dict(
                         RolePermission(
                             id=ulid.new().str,
                             role_id=role_id,
-                            permission_id=permission_id,
+                            permission_id=permission_mapping.get(permission_name),
                             created_at=now,
                             created_by=created_by,
                         )
                     )
                 )
+        # Insert rolePermissions
         async with self._session_scope() as session:
             await self._execute_statement(
                 session, insert(RolePermission).values(data_dict_list)

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/role_service.py

@@ -50,13 +50,13 @@ class RoleService(BaseService):
     async def create_role_bulk(
         self, data: list[RoleCreateWithPermissionsAndAudit]
     ) -> list[RoleResponse]:
-        permission_ids = [row.get_permission_ids() for row in data]
+        permission_names = [row.get_permission_names() for row in data]
         data = [row.get_role_create_with_audit() for row in data]
         roles = await self.role_repository.create_bulk(data)
         if len(roles) > 0:
             created_by = roles[0].created_by
             await self.role_repository.add_permissions(
-                data={role.id: permission_ids[i] for i, role in enumerate(roles)},
+                data={role.id: permission_names[i] for i, role in enumerate(roles)},
                 created_by=created_by,
             )
         return await self.role_repository.get_by_ids([role.id for role in roles])
@@ -69,30 +69,32 @@ class RoleService(BaseService):
     async def create_role(
         self, data: RoleCreateWithPermissionsAndAudit
     ) -> RoleResponse:
-        permission_ids = data.get_permission_ids()
+        permission_names = data.get_permission_names()
         data = data.get_role_create_with_audit()
         role = await self.role_repository.create(data)
         await self.role_repository.add_permissions(
-            data={role.id: permission_ids}, created_by=role.created_by
+            data={role.id: permission_names}, created_by=role.created_by
         )
         return await self.role_repository.get_by_id(role.id)
 
     @BaseService.route(
         "/api/v1/roles/bulk",
         methods=["put"],
-        response_model=RoleResponse,
+        response_model=list[RoleResponse],
     )
     async def update_role_bulk(
         self, role_ids: list[str], data: RoleUpdateWithPermissionsAndAudit
-    ) -> RoleResponse:
-        permission_ids = [row.get_permission_ids() for row in data]
+    ) -> list[RoleResponse]:
+        permission_names = [row.get_permission_names() for row in data]
         data = [row.get_role_update_with_audit() for row in data]
         await self.role_repository.update_bulk(role_ids, data)
         if len(role_ids) > 0:
             updated_by = data[0].updated_by
             await self.role_repository.remove_all_permissions(role_ids)
             await self.role_repository.add_permissions(
-                data={role_id: permission_ids[i] for i, role_id in enumerate(role_ids)},
+                data={
+                    role_id: permission_names[i] for i, role_id in enumerate(role_ids)
+                },
                 created_by=updated_by,
             )
         return await self.role_repository.get_by_ids(role_ids)
@@ -105,23 +107,23 @@ class RoleService(BaseService):
     async def update_role(
         self, role_id: str, data: RoleUpdateWithPermissionsAndAudit
     ) -> RoleResponse:
-        permission_ids = data.get_permission_ids()
+        permission_names = data.get_permission_names()
         role_data = data.get_role_update_with_audit()
         await self.role_repository.update(role_id, role_data)
         await self.role_repository.remove_all_permissions([role_id])
         await self.role_repository.add_permissions(
-            data={role_id: permission_ids}, created_by=role_data.updated_by
+            data={role_id: permission_names}, created_by=role_data.updated_by
         )
         return await self.role_repository.get_by_id(role_id)
 
     @BaseService.route(
         "/api/v1/roles/bulk",
         methods=["delete"],
-        response_model=RoleResponse,
+        response_model=list[RoleResponse],
     )
     async def delete_role_bulk(
         self, role_ids: list[str], deleted_by: str
-    ) -> RoleResponse:
+    ) -> list[RoleResponse]:
         roles = await self.role_repository.get_by_ids(role_ids)
         await self.role_repository.delete_bulk(role_ids)
         await self.role_repository.remove_all_permissions(role_ids)