fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: removed price categories

Browse Source
This commit is contained in:
AlexSserb
2025-02-12 15:27:48 +04:00
parent 5b9e75dddf
commit a509a3a586
7 changed files with 3 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
services/service.py
View File

@@ -5,8 +5,7 @@ from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import joinedload
from enums.service import ServiceType
from models import Service, ServiceCategory, ServicePriceRange, ServicesKit, services_kit_services, \
ServiceCategoryPrice, ServicePriceCategory
from models import Service, ServiceCategory, ServicePriceRange, ServicesKit, services_kit_services
from schemas.service import *
from services.base import BaseService
from utils.list_utils import previous_current_next
@@ -62,7 +61,6 @@ class ServiceService(BaseService):
price=0,
service_type=service_type,
price_ranges=[],
category_prices=[],
cost=0,
rank='',
is_placeholder=True
@@ -88,7 +86,6 @@ class ServiceService(BaseService):
del service_dict['id']
del service_dict['category']
del service_dict['price_ranges']
del service_dict['category_prices']
del service_dict['is_placeholder']
service_type = ServiceType(raw_service.service_type)
category_id = raw_service.category.id
@@ -110,15 +107,6 @@ class ServiceService(BaseService):
del price_range_dict['id']
price_range_obj = ServicePriceRange(**price_range_dict)
self.session.add(price_range_obj)
category_prices = request.service.category_prices
for category_price in category_prices:
category_price_dict = category_price.model_dump()
category_price_dict['service_id'] = service.id
category_price_dict['category_id'] = category_price.category.id
del category_price_dict['category']
category_price_obj = ServiceCategoryPrice(**category_price_dict)
self.session.add(category_price_obj)
await self.session.commit()
return ServiceCreateResponse(ok=True, message="Услуга успешно создана")
except Exception as e:
@@ -136,7 +124,6 @@ class ServiceService(BaseService):
service_dict['category_id'] = raw_service.category.id
del service_dict['category']
del service_dict['price_ranges']
del service_dict['category_prices']
del service_dict['is_placeholder']
if prev_category_id != new_category_id:
latest_rank = await self.get_latest_rank_in_category(new_category_id, ServiceType(raw_service.service_type))
@@ -173,25 +160,6 @@ class ServiceService(BaseService):
price_range_obj = ServicePriceRange(**price_range_dict)
self.session.add(price_range_obj)
# deleting previouse category prices
stmt = (
delete(
ServiceCategoryPrice
).where(
ServiceCategoryPrice.service_id == service.id
)
)
await self.session.execute(stmt)
await self.session.flush()
# inserting new category prices
for category_price in raw_service.category_prices:
category_price_dict = category_price.dict()
category_price_dict['service_id'] = raw_service.id
category_price_dict['category_id'] = category_price.category.id
del category_price_dict['category']
category_price_obj = ServiceCategoryPrice(**category_price_dict)
self.session.add(category_price_obj)
await self.session.commit()
return ServiceUpdateResponse(ok=True, message="Услуга успешно обновлена")
except Exception as e:
@@ -345,63 +313,6 @@ class ServiceService(BaseService):
except Exception as e:
return UpdateServicesKitResponse(ok=False, message=str(e))
async def get_all_price_categories(self) -> GetAllPriceCategoriesResponse:
query = await (self.session
.scalars(select(ServicePriceCategory)
.order_by(ServicePriceCategory.id)))
price_categories = []
for category in query.all():
price_categories.append(ServicePriceCategorySchema.model_validate(category))
return GetAllPriceCategoriesResponse(price_categories=price_categories)
async def create_price_category(self, request: CreatePriceCategoryRequest) -> ServiceCreateCategoryResponse:
try:
raw_category = request.name
category = ServicePriceCategory(name=raw_category)
self.session.add(category)
await self.session.commit()
return ServiceCreateCategoryResponse(ok=True, message="Категория цен успешно создана")
except Exception as e:
return ServiceCreateCategoryResponse(ok=False, message=f"Неудалось создать категорию цен, ошибка: {e}")
async def update_price_category(self, request: UpdatePriceCategoryRequest) -> ServiceUpdateResponse:
try:
raw_category = request.name
category = await (self.session.get(ServicePriceCategory, request.id))
if not category:
return ServiceUpdateResponse(ok=False, message="Категория цен не найдена")
await self.session.execute(
update(ServicePriceCategory)
.where(ServicePriceCategory.id == request.id)
.values(name=raw_category)
)
await self.session.commit()
return ServiceUpdateResponse(ok=True, message="Категория цен успешно обновлена")
except Exception as e:
return ServiceUpdateResponse(ok=False, message=f"Неудалось обновить категорию цен, ошибка: {e}")
async def delete_price_category(self, request: DeletePriceCategoryRequest) -> ServiceDeleteResponse:
try:
category = await (
self.session
.scalar(
select(
ServicePriceCategory
)
.filter(
ServicePriceCategory.id == request.id
)
)
)
if not category:
return ServiceDeleteResponse(ok=False, message="Категория цен не найдена")
await self.session.delete(category)
await self.session.commit()
return ServiceDeleteResponse(ok=True, message="Категория цен успешно удалена")
except Exception as e:
return ServiceDeleteResponse(ok=False, message=f"Неудалось удалить категорию цен, ошибка: {e}")
async def reorder(self, request: ServiceReorderRequest) -> ServiceReorderResponse:
try:
draining_service = await (self.session.get(Service, request.draining_service_id))