fix active_userdomain

backend/app/db/crud.py

@@ -360,19 +360,20 @@ def delete_userdomain(db: Session, userid: int,domainid: int):
     return True
 
 def active_userdomain(db: Session, userid: int,domainid: int):
-    db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
+    db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.is_active)).first()
-    # if not db_userdomains:
+    if db_domain:
-    #     raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+        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")
         
-    for domain in db_userdomains:
+        for domain in db_userdomains:
-        if domain.domainid == domainid:
+            if domain.domainid == domainid:
-            domain.active = True
+                domain.active = True
-            active_domain = domain
+            else:
-        else:
+                domain.active = False
-            domain.active = False
+            db.add(domain)
-        db.add(domain)
+        db.commit()
-    db.commit()
+    return db_domain
-    return active_domain
 
 def get_activedomain(db: Session, userid: int):
     # user_domains = (db.query(models.Domain,models.UserDomain.active)