pydantic out model and comments

README.md

@@ -109,8 +109,8 @@ pytest
 	•	Миграции через Alembic
 	•	Обработка ошибок
 	•	Логирование
-	•	PostgreSQL + Pgpool-II для продакшена
+	•	PostgreSQL + Pgpool-II для продакшена 	✅
-	•	Разделение схем Pydantic на вход/выход
+	•	Разделение схем Pydantic на вход/выход 	✅
 	•	Тестирование edge-cases
 ```
 ⸻

server/backend/endpoints.py

@@ -30,44 +30,44 @@ api.add_middleware(
 
 @api.middleware("http")                                     #Логирование заходов перед всеми endpoints
 async def log_requests(request: Request, call_next):
-    ip = request.client.host
+    ip = request.client.host                                #ip
-    ua = request.headers.get("user-agent")
+    ua = request.headers.get("user-agent")                  #browser
-    method = request.method
+    method = request.method                                 #method
-    url = str(request.url)
+    url = str(request.url)                                  #url
     print(f"[{method}] {url} from {ip} ({ua})")
     response = await call_next(request)
     return response
 
-@api.get("/protected")
+@api.get("/protected")                                      #test
 async def protected(current_user: str = Depends(JWT.current_user)):
     return {"msg": f"Hello, {current_user}"}
 
-@api.get("/", response_model=list[pydentic.UsersInfo])  #список!
+@api.get("/", response_model=list[pydentic.UserOut])  #список!
 async def get_all_rows(current_user: str = Depends(JWT.current_user)):
     users = await db.get_all_rows()
     if not users:
         raise HTTPException(status_code=404, detail="No users found")
     return users
-@api.get("/get_user_by_email/{email}", response_model=pydentic.UsersInfo)
+@api.get("/get_user_by_email/{email}", response_model=pydentic.UserOut)
 async def get_user_by_email(email:str, current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if user:
         return user
     else:
         raise HTTPException(status_code=404, detail="The user isn't found")
-@api.post("/user_create", response_model=pydentic.UsersInfo)
+@api.post("/user_create", response_model=pydentic.UserOut)
 async def create_user(row:pydentic.CreateUser):
     new_row = pydentic.CreateUser(email=row.email, description=row.description, activated = row.activated, password = row.password)
     await db.create_user(new_row)
     return new_row
-@api.delete("/user_delete/{email}", response_model=pydentic.UsersInfo)
+@api.delete("/user_delete/{email}", response_model=pydentic.UserOut)
 async def delete_user(email:str,current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if not user:
         raise HTTPException(status_code=404, detail="The user isn't found")
     await db.delete_user(email)
     return user
-@api.put("/user_update/{email}", response_model=pydentic.UsersInfo)
+@api.put("/user_update/{email}", response_model=pydentic.UserOut)
 async def update_user(email:str, updated_row: pydentic.UserUpdate, current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if not user:
@@ -101,7 +101,7 @@ async def login_user(form_data: OAuth2PasswordRequestForm = Depends()):
         timedelta(minutes=JWT.ACCESS_TOKEN_EXPIRE_MINUTES)
     )
     return {"access_token": access_token, "token_type": "bearer"}
-@api.post("/reset", response_model=pydentic.UsersInfo)
+@api.post("/reset", response_model=pydentic.UserOut)
 async def reset_user(row:pydentic.UserReset):
     
     user = await db.get_user_by_email(row.email)

server/backend/pydentic.py

@@ -3,7 +3,7 @@ from typing import List, Optional
 from enum import IntEnum
 #Валидация пароля
 import re
-def check_password_complexity(cls, password):
+def check_password_complexity(cls, password):                                   #Проверка пароля на соответствие сложности
     if password is None:
         return password
     if not re.search(r'[A-Za-z]', password):
@@ -42,3 +42,7 @@ class UserReset(BaseModel):
     @validator('new_password')
     def password_validator(cls, new_password):
         return check_password_complexity(cls, new_password)
+class UserOut(BaseModel):
+    email:EmailStr
+    description:str
+    activated:bool