bugfix get_default_domain

2024-12-01 12:21:13 +09:00
parent 39b02e0a8e
commit 8ee013527a
2 changed files with 20 additions and 13 deletions
--- a/backend/app/db/cruddb/dbdomain.py
+++ b/backend/app/db/cruddb/dbdomain.py
@@ -109,8 +109,12 @@ class dbdomain(crudbase):
            return domain
        return None

-    def get_default_domain(self,db: Session, userid: int) -> schemas.UserDomain:
-        return dbuserdomain.get_user_default_domain(db,userid)
+    def get_default_domain(self,db: Session, userid: int) -> schemas.DomainOut:
+        userdomain = dbuserdomain.get_user_default_domain(db,userid)
+        if userdomain:
+            return userdomain.domain
+        else:
+            return None

    def set_default_domain(self,db: Session, userid: int,domainid: int):
        db_domain =super().get_by_conditions(db,{"id":domainid,"is_active":True}).first()