refactor the crud & paginate

backend/app/db/schemas.py

@@ -28,9 +28,14 @@ class UserBase(BaseModel):
     first_name: str = None
     last_name: str = None
     roles:t.List[Role] = []
+   
 
-class UserOut(UserBase):
-    pass
+class UserOut(BaseModel):
+    email: str
+    is_active: bool = True
+    is_superuser: bool = False
+    first_name: str = None
+    last_name: str = None
 
 
 class UserCreate(UserBase):
@@ -149,9 +154,11 @@ class DomainIn(BaseModel):
     name: str 
     url: str
     kintoneuser: str 
-    kintonepwd: str 
+    kintonepwd: t.Optional[str] = None 
     is_active: bool
-    ownerid:int
+    createuserid:t.Optional[int] = None
+    updateuserid:t.Optional[int] = None
+    ownerid:t.Optional[int] = None
 
     def encrypt_kintonepwd(self):
         encrypted_pwd = chacha20Encrypt(self.kintonepwd)
@@ -162,16 +169,18 @@ class DomainOut(BaseModel):
     tenantid: str
     name: str 
     url: str
+    kintoneuser: str
     is_active: bool
     ownerid:int
 
+    class ConfigDict:
+        orm_mode = True
 
-class ActiveDomain(BaseModel):
+class UserDomain(BaseModel):
     id: int
-    tenantid: str
-    name: str 
-    url: str
-    is_active: bool
+    is_default: bool
+    domain:DomainOut
+    user:UserOut
 
 class Domain(Base):
     id: int
@@ -179,12 +188,14 @@ class Domain(Base):
     name: str 
     url: str
     kintoneuser: str 
-    kintonepwd: str 
     is_active: bool
+    updateuser:UserOut
     owner:UserOut
+    
     class ConfigDict:
         orm_mode = True
 
+
 class Event(Base):
     id: int
     category: str