fix: services kit create and update fix
This commit is contained in:
@ -19,3 +19,8 @@ class ServiceRepository(
|
|||||||
|
|
||||||
async def update(self, service: Service, data: UpdateServiceSchema) -> Service:
|
async def update(self, service: Service, data: UpdateServiceSchema) -> Service:
|
||||||
return await self._apply_update_data_to_model(service, data, True)
|
return await self._apply_update_data_to_model(service, data, True)
|
||||||
|
|
||||||
|
async def get_by_ids(self, ids: list[int]) -> list[Service]:
|
||||||
|
stmt = select(Service).where(Service.id.in_(ids))
|
||||||
|
result = await self.session.execute(stmt)
|
||||||
|
return result.scalars().all()
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
from sqlalchemy.orm import selectinload
|
from sqlalchemy.orm import selectinload
|
||||||
|
|
||||||
from modules.fulfillment_base.models.service import ServicesKit
|
from modules.fulfillment_base.models.service import ServicesKit
|
||||||
|
from modules.fulfillment_base.repositories import ServiceRepository
|
||||||
from modules.fulfillment_base.schemas.services_kit import (
|
from modules.fulfillment_base.schemas.services_kit import (
|
||||||
CreateServicesKitSchema,
|
CreateServicesKitSchema,
|
||||||
UpdateServicesKitSchema,
|
UpdateServicesKitSchema,
|
||||||
@ -17,7 +18,26 @@ class ServicesKitRepository(
|
|||||||
def _process_get_by_id_stmt(self, stmt: Select) -> Select:
|
def _process_get_by_id_stmt(self, stmt: Select) -> Select:
|
||||||
return stmt.options(selectinload(ServicesKit.services))
|
return stmt.options(selectinload(ServicesKit.services))
|
||||||
|
|
||||||
|
async def create(self, data: CreateServicesKitSchema) -> int:
|
||||||
|
if data.services is not None:
|
||||||
|
service_ids: list[int] = [service.id for service in data.services]
|
||||||
|
data.services = await ServiceRepository(self.session).get_by_ids(
|
||||||
|
service_ids
|
||||||
|
)
|
||||||
|
kit = ServicesKit(
|
||||||
|
name=data.name, service_type=data.service_type, services=data.services
|
||||||
|
)
|
||||||
|
self.session.add(kit)
|
||||||
|
await self.session.commit()
|
||||||
|
await self.session.refresh(kit)
|
||||||
|
return kit.id
|
||||||
|
|
||||||
async def update(
|
async def update(
|
||||||
self, service: ServicesKit, data: UpdateServicesKitSchema
|
self, service_kit: ServicesKit, data: UpdateServicesKitSchema
|
||||||
) -> ServicesKit:
|
) -> ServicesKit:
|
||||||
return await self._apply_update_data_to_model(service, data, True)
|
if data.services is not None:
|
||||||
|
service_ids: list[int] = [service.id for service in data.services]
|
||||||
|
data.services = await ServiceRepository(self.session).get_by_ids(
|
||||||
|
service_ids
|
||||||
|
)
|
||||||
|
return await self._apply_update_data_to_model(service_kit, data, True)
|
||||||
|
|||||||
@ -16,11 +16,11 @@ class ServicesKitSchema(BaseServicesKitSchema):
|
|||||||
|
|
||||||
|
|
||||||
class CreateServicesKitSchema(BaseServicesKitSchema):
|
class CreateServicesKitSchema(BaseServicesKitSchema):
|
||||||
services_ids: list[int]
|
services: list[ServiceSchema]
|
||||||
|
|
||||||
|
|
||||||
class UpdateServicesKitSchema(BaseServicesKitSchema):
|
class UpdateServicesKitSchema(BaseServicesKitSchema):
|
||||||
services_ids: list[int]
|
services: list[ServiceSchema]
|
||||||
|
|
||||||
|
|
||||||
# endregion
|
# endregion
|
||||||
|
|||||||
Reference in New Issue
Block a user