From 3726c8f342e593ef1594083fcdb40fb0fbc862cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Wed, 27 Nov 2024 16:36:53 +0900 Subject: [PATCH] fix active_userdomain --- backend/app/db/crud.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/backend/app/db/crud.py b/backend/app/db/crud.py index f723643..f0b64ff 100644 --- a/backend/app/db/crud.py +++ b/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() - # 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 active_domain + db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.is_active)).first() + if db_domain: + 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: + if domain.domainid == domainid: + domain.active = True + else: + domain.active = False + db.add(domain) + db.commit() + return db_domain def get_activedomain(db: Session, userid: int): # user_domains = (db.query(models.Domain,models.UserDomain.active)