fix:'createdAt' not returning (#48)

* Update activities_router.py

* Remove useless code

* Remove trophy API

* Remove useless code

* Clear useless commented code

* Remove notification api

Author: Zcraft3793

routers/activities_router.py

@@ -269,7 +269,6 @@ async def read_activities(
     # User permission check
     if (
         "admin" not in user["per"]
-        and "auditor" not in user["per"]
         and "department" not in user["per"]
         and mode == "campus"
     ):
@@ -290,7 +289,7 @@ async def read_activities(
         # Read activities
         result = []
 
-        audit = "auditor" in user["per"] or "admin" in user["per"]
+        audit = "admin" in user["per"]
 
         pipeline = [
             {
@@ -486,6 +485,7 @@ async def read_activity(activity_oid: str, user=Depends(get_current_user)):
                 "type": True,
                 "special": True,
                 "creator": True,
+                "createdAt": True,
                 "updatedAt": True,
                 "registration": True,
             }
@@ -626,8 +626,6 @@ async def read_activity_user(
     if (
         "department" not in user["per"]
         and "admin" not in user["per"]
-        and "auditor" not in user["per"]
-        and "inspector" not in user["per"]
         and ("secretary" not in user["per"])
         and user["id"] != str(validate_object_id(uid))
     ):
@@ -639,27 +637,6 @@ async def read_activity_user(
     return {"status": "ok", "code": 200, "data": activity[0]["members"][0]}
 
 
-@router.get("/{activity_oid}/member/{uid}/history")
-async def read_user_history(
-    activity_oid: str, uid: str, user=Depends(get_current_user)
-):
-    if (
-        "department" not in user["per"]
-        and "admin" not in user["per"]
-        and "auditor" not in user["per"]
-        and "inspector" not in user["per"]
-        and ("secretary" not in user["per"])
-        and user["id"] != str(validate_object_id(uid))
-    ):
-        raise HTTPException(status_code=403, detail="Permission denined.")
-    activity = await db.zvms.activities.find_one(
-        {"_id": validate_object_id(activity_oid), "members._id": uid},
-        {"members.$": 1, "_id": 0},
-    )
-    if not activity:
-        raise HTTPException(status_code=404, detail="Activity not found")
-    return {"status": "ok", "code": 200, "data": activity["members"][0]["history"]}
-
 
 @router.delete("/{activity_oid}/member/{uid}")
 async def user_activity_signoff(
@@ -738,55 +715,3 @@ async def delete_activity(activity_oid: str, user=Depends(compulsory_temporary_t
         "status": "ok",
         "code": 200,
     }
-
-
-@router.get("/{activity_oid}/ratings")
-async def get_activity_ratings(activity_oid: str, user=Depends(get_current_user)):
-    """
-    Get activity ratings
-    """
-
-    if "admin" not in user["per"] and "department" not in user["per"] and "rating" not in user["elg"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-
-    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")
-
-    if (
-        user["id"] != activity["creator"]
-        and "admin" not in user["per"]
-        and "department" not in user["per"]
-    ):
-        raise HTTPException(status_code=403, detail="Permission denied")
-
-    # Check the average rating for each int-typed field, and remain the original value for other fields
-
-    res = await db.zvms.ratings.find(
-        {"activity_id": activity_oid}
-    ).to_list(None)
-
-    result = {}
-    ratings = {}
-
-    for rating in res:
-        rating["_id"] = str(rating["_id"])
-        for key, value in rating.items():
-            if key in ["_id", "activity_id", "user_id"]:
-                continue
-            if isinstance(value, int):
-                if key not in result:
-                    result[key] = 0
-                result[key] += value
-
-    for key, value in result.items():
-        result[key] = value / len(ratings)
-
-    return {
-        "status": "ok",
-        "code": 200,
-        "data": result,
-    }

routers/exports_router.py

@@ -1,3 +1,4 @@
+
 import uuid
 from time import sleep
 
@@ -56,7 +57,7 @@ async def process_task(task_id: str):
                 'group': group['name'],
                 'on-campus': user_time["on-campus"],
                 'off-campus': user_time["off-campus"],
-                'social-practice': user_time["social-practice"]
+                'social-practice': user_
             }
             result.append(doc)
             task['percentage'] = (idx + 1) / len(users) * 100
@@ -174,3 +175,4 @@ async def get_export_list():
         "status": "ok",
         "data": result
     }
+

routers/notifications_router.py

@@ -10,77 +10,18 @@
 
 @router.post("")
 async def create_notification(request: Notification, user=Depends(get_current_user)):
-    """
-    Create Notification
-    """
-    # Create notification
-    if "admin" not in user["per"] and "department" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    notification = request.model_dump()
-    notification["global"] = notification["global_"]
-    notification["publisher"] = user["id"]
-    del notification["global_"]
-    del notification["id"]
-    for i in notification["receivers"]:
-        validate_object_id(i)
-    result = await db.zvms.notifications.insert_one(notification)
-    return {
-        "status": "ok",
-        "code": 201,
-        "data": {"_id": str(result.inserted_id)},
-    }
+    raise HTTPException(status_code=410, detail="Gone")
 
 
 @router.get("")
 async def get_notifications(
     page: int = 1, perpage: int = 10, user=Depends(get_current_user)
 ):
-    """
-    Get Notifications
-    """
-    if "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Get notifications
-    count = await db.zvms.notifications.count_documents({})
-    result = (
-        await db.zvms.notifications.find()
-        .sort("_id", -1)
-        .skip(0 if page == -1 else (page - 1) * perpage)
-        .limit(0 if page == -1 else perpage)
-        .to_list(None if page == -1 else perpage)
-    )
-    for i in result:
-        i["_id"] = str(i["_id"])
-    return {
-        "status": "ok",
-        "code": 200,
-        "data": result,
-        "metadata": {
-            "size": count,
-        },
-    }
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 @router.get("/{notification_oid}")
 async def get_notification(notification_oid: str, user=Depends(get_current_user)):
-    """
-    Get Notification
-    """
-    item = await db.zvms.notifications.find_one(
-        {"_id": validate_object_id(notification_oid)}
-    )
-    if not item:
-        raise HTTPException(status_code=404, detail="Notification not found")
-    if user["id"] != item["publisher"] and "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Get notification
-    item["_id"] = str(item["_id"])
-    return {
-        "status": "ok",
-        "code": 200,
-        "data": item,
-    }
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 class PutContent(BaseModel):
     content: str
@@ -94,65 +35,17 @@ class PutTitle(BaseModel):
 async def update_notification_content(
     notification_oid: str, request: PutContent, user=Depends(get_current_user)
 ):
-    """
-    Update Notification Content
-    """
-    item = await db.zvms.notifications.find_one(
-        {"_id": validate_object_id(notification_oid)}
-    )
-    if item is None:
-        raise HTTPException(status_code=404, detail="Notification not found")
-    if user["id"] != item["publisher"] or "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    actioner = await db.zvms.users.find_one({"_id": item["publisher"]})
-    if actioner is None:
-        raise HTTPException(status_code=404, detail="User not found")
-    msg = f"{actioner['name']} modified notification at {datetime.now()}"
-    if user["id"] != item["publisher"] or "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Update notification content
-    await db.zvms.notifications.update_one(
-        {"_id": validate_object_id(notification_oid)},
-        {"$set": {"content": request.content + "\n" + msg}},
-    )
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 @router.put("/{notification_oid}/title")
 async def update_notification_title(
     notification_oid: str, request: PutTitle, user=Depends(get_current_user)
 ):
-    """
-    Update Notification Title
-    """
-    item = await db.zvms.notifications.find_one(
-        {"_id": validate_object_id(notification_oid)}
-    )
-    if item is None:
-        raise HTTPException(status_code=404, detail="Notification not found")
-    if user["id"] != item["publisher"] or "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Update notification title
-    await db.zvms.notifications.update_one(
-        {"_id": validate_object_id(notification_oid)},
-        {"$set": {"title": request.title}},
-    )
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 @router.delete("/{notification_oid}")
 async def delete_notification(
     notification_oid: str, user=Depends(compulsory_temporary_token)
 ):
-    """
-    Remove Notification
-    """
-    item = await db.zvms.notifications.find_one(
-        {"_id": validate_object_id(notification_oid)}
-    )
-    if item is None:
-        raise HTTPException(status_code=404, detail="Notification not found")
-    if user["id"] != item["publisher"] and "admin" not in user["per"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Remove notification
-    await db.zvms.notifications.delete_one(
-        {"_id": validate_object_id(notification_oid)}
-    )
+    raise HTTPException(status_code=410, detail="Gone")
+    

routers/plugins_router.py

@@ -8,21 +8,8 @@
 
 @router.get('/dictionary/oxford/{word}')
 def get_word_oxford(word: str):
-    result = requests.get(f'https://api.dictionaryapi.dev/api/v2/entries/en/{word}').json()
-    return {
-        'status': 'ok',
-        'code': 200,
-        'data': result
-    }
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 @router.get('/translate/deepl')
 def translate_deepl(text: str, lang: str):
-    data = {'text': text, 'target_lang': lang}
-    data = json.dumps(data)
-    result = requests.post(f'http://127.0.0.1:1188/translate', data=data).json()
-    return {
-        'status': 'ok',
-        'code': 200,
-        'data': result
-    }
+    raise HTTPException(status_code=410, detail="Gone")

routers/rating_router.py

@@ -10,53 +10,10 @@
 
 @router.post("")
 async def create_rating(rating: ActivityRating, user=Depends(get_current_user)):
-    if 'admin' not in user['per'] and 'department' not in user['per'] and 'rating' not in user['elg']:
-        raise HTTPException(status_code=403, detail="Forbidden")
-
-    # Find duplicated document, if exists, return bad request
-    redunants = await db.zvms.ratings.find({
-        "activity_id": rating.activity_id,
-        "user_id": rating.user_id
-    }).to_list(None)
-
-    if len(redunants) > 0:
-        raise HTTPException(status_code=400, detail="Duplicated rating")
-
-    if rating.user_id != user['id']:
-        raise HTTPException(status_code=403, detail="Permission denied")
-
-    # Create rating
-    rating = rating.model_dump()
-    await db.zvms.ratings.insert_one(rating)
-    return {
-        "status": "ok",
-        "code": 201,
-        "data": {"_id": str(rating["_id"])},
-    }
-
+    raise HTTPException(status_code=410, detail="Gone")
 
 @router.get("")
 async def get_ratings(
     page: int = 1, perpage: int = 10, user=Depends(get_current_user)
 ):
-    if "admin" not in user["per"] or "rating" not in user["elg"]:
-        raise HTTPException(status_code=403, detail="Permission denied")
-    # Get ratings
-    count = await db.zvms.ratings.count_documents({})
-    result = (
-        await db.zvms.ratings.find()
-        .sort("_id", -1)
-        .skip(0 if page == -1 else (page - 1) * perpage)
-        .limit(0 if page == -1 else perpage)
-        .to_list(None if page == -1 else perpage)
-    )
-    for i in result:
-        i["_id"] = str(i["_id"])
-    return {
-        "status": "ok",
-        "code": 200,
-        "data": result,
-        "metadata": {
-            "size": count,
-        },
-    }
+    raise HTTPException(status_code=410, detail="Gone")