bugfix set user default domain

backend/app/db/cruddb/dbdomain.py

@@ -40,7 +40,7 @@ class dbdomain(crudbase):
     
     def get_domains_by_owner(self,db: Session,ownerid:int)-> ApiReturnPage[models.Base]:
         return paginate(db,super().get_by_conditions({"ownerid":ownerid}))
-                  
+                      
     def create_domain(self,db: Session, domain: schemas.DomainIn,userid:int):
         #db_domain = super().get_by_conditions(db,{"url":domain.url,"kintoneuser":domain.kintoneuser,"onwerid":userid}).first()
         #if not db_domain:
@@ -117,20 +117,29 @@ class dbdomain(crudbase):
             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()
+        db_domain =db.execute(super().get_by_conditions({"id":domainid,"is_active":True})).scalars().first()
         if db_domain:
             db_default_domain = dbuserdomain.get_user_default_domain(db,userid)
             db_userdomain =dbuserdomain.get_userdomain(db,userid,domainid)
             if db_default_domain:
-                db_default_domain.is_default = False
-                db_default_domain.updateuserid = userid
-                db.add(db_default_domain)
+                if db_default_domain.domainid != domainid:
+                    db_default_domain.is_default = False
+                    db_default_domain.updateuserid = userid
+                    db.add(db_default_domain)
+                else:
+                    return db_domain
             if db_userdomain:
                 db_userdomain.is_default = True
                 db_userdomain.updateuserid = userid
                 db.add(db_userdomain)
+            else:
+                db_userdomain = dbuserdomain.create(db,schemas.UserDomainIn(domainid=domainid,userid=userid,is_default = True))
+                db.add(db_userdomain)
             db.commit()
-        return db_domain
+            return db_domain
+        else:
+            return None
+
 
     def get_shareddomain_users(self,db: Session,ownerid:int,domainid: int) -> ApiReturnPage[models.Base]:
         users = db.query(models.User).join(models.UserDomain,models.UserDomain.userid == models.User.id).filter(models.UserDomain.domainid ==domainid)

backend/app/db/schemas.py

@@ -192,6 +192,11 @@ class UserDomain(BaseModel):
     domain:DomainOut
     user:UserOut
 
+class UserDomainIn(BaseModel):
+    is_default: bool
+    domainid:int
+    userid:int
+
 class Domain(Base):
     id: int
     tenantid: str