crappy

services/client.py

@@ -3,6 +3,7 @@ from typing import Union, Annotated
 
 from fastapi import Depends
 from sqlalchemy import select, update
+from sqlalchemy.orm import joinedload
 
 from models import Client, ClientDetails, User
 from services.auth import get_current_user
@@ -24,7 +25,7 @@ class ClientService(BaseService):
         return details
 
     async def get_all(self) -> ClientGetAllResponse:
-        clients_query = await self.session.scalars(select(Client))
+        clients_query = await self.session.scalars(select(Client).options(joinedload(Client.details)))
         clients = clients_query.all()
         result = []
         for client in clients:
@@ -65,7 +66,8 @@ class ClientService(BaseService):
 
     async def search_clients(self, request: ClientSearchRequest) -> ClientSearchResponse:
         query = await self.session.scalars(select(Client)
-                                           .where(Client.name.ilike(f'%{request.name}%')))
+                                           .where(Client.name.ilike(f'%{request.name}%'))
+                                           .options(joinedload(Client.details)))
         clients = []
         for client in query.all():
             clients.append(ClientSchema.model_validate(client))