fix: group router

main.py

@@ -2,7 +2,7 @@
 from fastapi import FastAPI, Depends
 from bson.objectid import ObjectId
 from typing import List
-from routers import users_router, activities_router, notification_router
+from routers import notifications_router, users_router, activities_router, groups_router
 from fastapi import FastAPI
 from database import close_mongo_connection, connect_to_mongo
 from fastapi.middleware.cors import CORSMiddleware
@@ -23,25 +23,29 @@
 
 # 注册路由
 app.include_router(users_router.router, prefix="/api/user", tags=["users"])
-app.include_router(activities_router.router, prefix="/api/activity", tags=["activities"])
-app.include_router(notification_router.router, prefix="/api/notification", tags=["notifications"])
+app.include_router(
+    activities_router.router, prefix="/api/activity", tags=["activities"]
+)
+app.include_router(
+    notifications_router.router, prefix="/api/notification", tags=["notifications"]
+)
+app.include_router(groups_router.router, prefix="/api/group", tags=["groups"])
 
-@app.get('/api/cert')
+@app.get("/api/cert")
 async def get_cert():
     return {
         "status": "ok",
         "code": 200,
-        "data": open('./rsa_public_key.pem', 'r').read()
+        "data": open("./rsa_public_key.pem", "r").read(),
     }
 
-@app.get('/api/version')
+
+@app.get("/api/version")
 async def get_version():
-    return {
-        "status": "ok",
-        "code": 200,
-        "data": "0.1.0-alpha.1"
-    }
+    return {"status": "ok", "code": 200, "data": "0.1.0-alpha.1"}
+
 
 if __name__ == "__main__":
     import uvicorn
+
     uvicorn.run(app=app, host="0.0.0.0", port=8000)

routers/activities_router.py

@@ -244,16 +244,16 @@ async def read_activities(
 @router.get("/{activity_oid}")
 async def read_activity(activity_oid: str, user=Depends(get_current_user)):
     """
-    返回义工信息
+    Return activity
     """
-    # 读取义工信息
+    # Read activity
     activity = await db.zvms.activities.find_one(
         {"_id": validate_object_id(activity_oid)}
     )
     if not activity:
         raise HTTPException(status_code=404, detail="Activity not found")
 
-    # 遍历 activity 将所有 $OID 转换为 str
+    # Change ObjectId to str
     for key in activity:
         if isinstance(activity[key], ObjectId):
             activity[key] = str(activity[key])
@@ -491,8 +491,6 @@ async def user_status_edit(
         "code": 200,
     }
 
-    # PUT 请求无需返回值
-
 
 @router.delete("/{activity_oid}")
 async def delete_activity(activity_oid: str, user=Depends(compulsory_temporary_token)):

util/group.py

@@ -0,0 +1,16 @@
+from database import db
+from typings.user import User
+
+async def get_user_permissions(user: User):
+    """
+    Get user's permissions
+    """
+    groups = user.group
+
+    permissions = []
+
+    for group in groups:
+        group = await db.zvms.groups.find_one({"_id": group})
+        permissions.extend(group["permissions"])
+
+    return permissions