fix setuserdomain& activedomian

backend/app/db/crud.py

@@ -336,8 +336,8 @@ def edit_domain(
     return db_domain
 
 
-def add_userdomain(db: Session, userid:int,domainid:int):
-    db_domain = db.query(models.Domain).get(domainid)
+def add_userdomain(db: Session,ownerid:int, userid:int,domainid:int):
+    db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.ownerid == ownerid,models.Domain.is_active)).first()
     if db_domain:
         user_domain = models.UserDomain(userid = userid, domainid = domainid )
         db.add(user_domain)
@@ -361,16 +361,18 @@ def delete_userdomain(db: Session, userid: int,domainid: int):
 
 def active_userdomain(db: Session, userid: int,domainid: int):
     db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
-    if not db_userdomains:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    # if not db_userdomains:
+    #     raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    
     for domain in db_userdomains:
         if domain.domainid == domainid:
             domain.active = True
+            active_domain = domain
         else:
             domain.active = False
         db.add(domain)
     db.commit()
-    return db_userdomains
+    return active_domain
 
 def get_activedomain(db: Session, userid: int):
     # user_domains = (db.query(models.Domain,models.UserDomain.active)