add ApiReturnModel ー＞return value 統一

backend/app/db/crud.py

@@ -293,19 +293,19 @@ def create_domain(db: Session, domain: schemas.DomainIn,userid:int):
         ownerid = domain.ownerid
     )
     db.add(db_domain)
-    db.flush()
-    add_userdomain(db,userid,db_domain.id)
+    #add_userdomain(db,userid,db_domain.id)
     db.commit()
     db.refresh(db_domain)
     return db_domain
 
 def delete_domain(db: Session,id: int):
     db_domain = db.query(models.Domain).get(id)
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    db.delete(db_domain)
-    db.commit()
-    return db_domain
+    #if not db_domain:
+    #   raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    if db_domain:
+        db.delete(db_domain)
+        db.commit()
+    return True
 
 
 def edit_domain(
@@ -339,6 +339,8 @@ def edit_domain(
 def add_userdomain(db: Session, userid:int,domainid:int):
     user_domain = models.UserDomain(userid = userid, domainid = domainid )
     db.add(user_domain)
+    db.commit()
+    db.refresh(user_domain)
     return user_domain
 
 def add_userdomains(db: Session, userid:int,domainids:list[str]):
@@ -349,11 +351,12 @@ def add_userdomains(db: Session, userid:int,domainids:list[str]):
 
 def delete_userdomain(db: Session, userid: int,domainid: int):
     db_domain = db.query(models.UserDomain).filter(and_(models.UserDomain.userid == userid,models.UserDomain.domainid == domainid)).first()
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    db.delete(db_domain)
-    db.commit()
-    return db_domain
+    #if not db_domain:
+    #    raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    if db_domain:
+        db.delete(db_domain)
+        db.commit()
+    return True
 
 def active_userdomain(db: Session, userid: int,domainid: int):
     db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
@@ -376,8 +379,8 @@ def get_activedomain(db: Session, userid: int)-> t.Optional[models.Domain]:
     db_domain=None
     if len(user_domains)==1:
         db_domain = user_domains[0][0];
-    else:
-        db_domain = next((domain for domain,active in user_domains if active),None)
+    # else:
+    #     db_domain = next((domain for domain,active in user_domains if active),None)
     # raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
     return db_domain