added routes for adding/removing sites to users

routers/profile.py

@@ -76,13 +76,13 @@ def read_site(*,
               site_id: int
               ):
     current_site = crud.get_current_site(session, current_user, site_id)
-    # access_token = utils.get_key()
-    # in_url= utils.get_feed_url(access_token, current_site.in_camera)
-    # out_url= utils.get_feed_url(access_token, current_site.out_camera)
-    # current_site.in_url = in_url
-    # current_site.out_url = out_url
-    # session.add(current_site)
-    # session.commit()
+    access_token = utils.get_key()
+    in_url= utils.get_feed_url(access_token, current_site.in_camera)
+    out_url= utils.get_feed_url(access_token, current_site.out_camera)
+    current_site.in_url = in_url
+    current_site.out_url = out_url
+    session.add(current_site)
+    session.commit()
     return current_site
 
 

routers/users.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from fastapi import Depends, APIRouter, HTTPException, Query
 from sqlmodel import Session, select
-from models import User, UserCreate, UserPublic, UserUpdate, UserPublicWith
+from models import User, UserCreate, UserPublic, UserUpdate, UserPublicWith, Site
 from core import crud, utils
 
 router = APIRouter(
@@ -54,4 +54,47 @@ def delete_user(*, session: Session = Depends(utils.get_session), user_id: int):
         raise HTTPException(status_code=404, detail="User not found")
     session.delete(user)
     session.commit()
-    return {"ok": True}
+    
+
+@router.patch("/{user_id}/site/{site_id}", response_model=UserPublicWith)
+def add_user_site(*, 
+                session: Session = Depends(utils.get_session), 
+                user_id: int, 
+                site_id: int,
+                ):
+    db_user = session.get(User, user_id)
+    if not db_user:
+        raise HTTPException(status_code=404, detail="User not found")
+    user_site_list = [site.id for site in db_user.sites]
+    if site_id in user_site_list:
+        raise HTTPException(status_code=404, detail=f"Site '{site_id}' already associated with the user")
+    db_site = session.get(Site, site_id)
+    if not db_site:
+        raise HTTPException(status_code=404, detail="Site not found")
+    db_user.sites.append(db_site)
+    session.add(db_user)
+    session.commit()
+    session.refresh(db_user)
+    return db_user
+
+
+@router.patch("/{user_id}/notsite/{site_id}", response_model=UserPublicWith)
+def delete_user_site(*, 
+                session: Session = Depends(utils.get_session), 
+                user_id: int, 
+                site_id: int,
+                ):
+    db_user = session.get(User, user_id)
+    if not db_user:
+        raise HTTPException(status_code=404, detail="User not found")
+    user_site_list = [site.id for site in db_user.sites]
+    if site_id not in user_site_list:
+        raise HTTPException(status_code=404, detail=f"Site '{site_id}' not associated with the user")
+    db_site = session.get(Site, site_id)
+    if not db_site:
+        raise HTTPException(status_code=404, detail="Site not found")
+    db_user.sites.remove(db_site)
+    session.add(db_user)
+    session.commit()
+    session.refresh(db_user)
+    return db_user