refactor: activity member creation (#136)

Author: Zcraft3793

main.py

@@ -16,6 +16,7 @@
     activity_statistics_router,
     times_router,
     mcp_router,
+    activities_v3_router,
 )
 from database import close_mongo_connection, connect_to_mongo
 import socketio
@@ -24,7 +25,6 @@
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 import asyncio
 from tasks.compute_time import compute_tasks, generate_reports
-from tasks.data_fix import wash_data
 
 scheduler = AsyncIOScheduler()
 sio = socketio.AsyncServer(async_mode="asgi")
@@ -35,6 +35,7 @@
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
+        "http://localhost:4173",
         "http://localhost:5173",
         "https://v4.zvms.site",
         "https://v4-netlify.zvms.site",
@@ -129,6 +130,7 @@ async def shutdown_event():
     activity_statistics_router.router, prefix="/api/v2/statistics/activities"
 )
 app.include_router(mcp_router.router, prefix="/api/v2/mcp")
+app.include_router(activities_v3_router.router, prefix="/api/v3/activities")
 
 
 @app.get("/api/")

routers/activities_v2_router.py

@@ -43,12 +43,12 @@ async def create_activity_v2(
 
     activity.creator = str(user["id"])
 
-    activity = activity.model_dump()
+    activity_ = activity.model_dump()
 
-    result = await db.zvms_new.get_collection("activities").insert_one(activity)
+    result = await db.zvms_new.get_collection("activities").insert_one(activity_)
 
     log.with_text(
-        f'User {await get_user_name(user['id'])} (ID: {user['id']}) created activity {activity["name"]} at {datetime.now().isoformat()} (ID: {result.inserted_id}).'
+        f'User {await get_user_name(user['id'])} (ID: {user['id']}) created activity {activity_["name"]} at {datetime.now().isoformat()} (ID: {result.inserted_id}).'
     )
     await log.insert_log()
 
@@ -340,9 +340,9 @@ async def add_activity_member_v2(
             status_code=400, detail="User already in activity with same counting mode"
         )
 
-    member = member.model_dump()
+    member_ = member.model_dump()
 
-    result = await db.zvms_new.get_collection("activity_members").insert_one(member)
+    result = await db.zvms_new.get_collection("activity_members").insert_one(member_)
 
     log.with_text(
         f'User {await get_user_name(user["id"])} added member {target_user.name} to activity {target_activity.name} at {datetime.now().isoformat()}.'

routers/activities_v3_router.py

@@ -0,0 +1,90 @@
+from datetime import datetime
+from fastapi import APIRouter, Depends, HTTPException, Body
+from database import db
+from typings.activity_v2 import Activity, ActivityMember
+from typings.log import inject_log
+from typings.user import User as UserV1
+from util.object_id import get_current_user
+from util.permission import volunteer_member
+from util.user import get_user_name
+from utils import validate_object_id
+
+router = APIRouter()
+
+@router.post("/{activity_id}/members")
+async def add_activity_member_v3(
+    activity_id: str,
+    members: list[ActivityMember] = Body(),
+    user=Depends(get_current_user),
+    log=Depends(inject_log),
+):
+    """
+    :param activity_id: ID of the activity to be retrieved
+    :param user: Current user
+    :param member: ActivityMember object to be added
+    :param log: Logger object
+    :return: Activity object
+    """
+
+    target_activity = await db.zvms_new.get_collection("activities").find_one(
+        {"_id": validate_object_id(activity_id)}
+    )
+
+    results = []
+
+    for member in members:    
+        target_user = await db.zvms.get_collection("users").find_one(
+            {"_id": validate_object_id(member.member)}
+        )
+        target_activity = Activity.model_validate(target_activity, strict=False)
+        target_user = UserV1.model_validate(target_user, strict=False)
+        await volunteer_member.validate_create_permission(
+            user, target_user, target_activity
+        )
+
+        if target_activity.type != "hybrid" and target_activity.type != member.mode:
+            raise HTTPException(
+                status_code=400, detail="Activity type and member mode do not match"
+            )
+        
+        existing: ActivityMember = await db.zvms_new.get_collection("activity_members").find_one(
+            {
+                "member": str(member.member),
+                "activity": str(activity_id),
+                "mode": member.mode,
+            }
+        )
+
+        if existing:
+
+            updated_data = {
+                "duration": existing.duration + member.duration,
+                "mode": member.mode,
+            }
+
+            result = await db.zvms_new.get_collection("activity_members").update_one(
+                {"_id": validate_object_id(existing._id)},
+                {"$set": updated_data},
+            )
+
+            results.append(str(existing._id))
+
+            continue
+
+        member_ = member.model_dump()
+
+        result = await db.zvms_new.get_collection("activity_members").insert_one(member_)
+        
+        log.with_text(
+            f'User {await get_user_name(user["id"])} added member {target_user.name} to activity {target_activity.name} at {datetime.now().isoformat()}.'
+        )
+        await log.insert_log()
+
+        results.append(str(result.inserted_id))
+
+    return {
+        "result": results,
+        "count": await db.zvms_new.get_collection("activity_members").count_documents(
+            {"activity": str(activity_id)}
+        ),
+    }