✨ Shares Menu nearly feature complete

classquiz/db/models.py

@@ -360,13 +360,15 @@ class OnlyId(BaseModel):
 class PublicQuizTivityShare(BaseModel):
     id: uuid.UUID
     name: str | None
-    expire_in: int
+    expire_in: int | None
     quiztivity: OnlyId
     user: OnlyId
 
     @classmethod
     def from_db_model(cls, data: QuizTivityShare):
-        expire_in = int((data.expire_at - datetime.now()).seconds / 60)
+        expire_in = None
+        if data.expire_at is not None:
+            expire_in = int((data.expire_at - datetime.now()).seconds / 60)
         return cls(
             id=data.id,
             name=data.name,

classquiz/routers/quiztivity/__init__.py

@@ -56,7 +56,9 @@ async def get_all_quiztivities(user: User = Depends(get_current_user)) -> list[Q
 
 @router.get("/{uuid}/shares")
 async def get_shares(uuid: UUID, user: User = Depends(get_current_user)) -> list[PublicQuizTivityShare]:
-    shares = await QuizTivityShare.objects.filter(quiztivity=uuid, user=user).all()
+    shares = (
+        await QuizTivityShare.objects.filter(quiztivity=uuid, user=user).order_by(QuizTivityShare.expire_at.asc()).all()
+    )
     resp_shares = []
     for share in shares:
         resp_shares.append(PublicQuizTivityShare.from_db_model(share))

classquiz/routers/quiztivity/shares.py

@@ -77,4 +77,6 @@ async def get_share(uuid: UUID) -> QuizTivity:
     share = await QuizTivityShare.objects.select_related("quiztivity").get_or_none(id=uuid)
     if share is None:
         raise HTTPException(status_code=404, detail="Share not found")
+    if share.expire_at < datetime.now():
+        raise HTTPException(status_code=410, detail="Already expired")
     return share.quiztivity