From 87958c01f9b4c32c3e129361b92065fc911c5074 Mon Sep 17 00:00:00 2001 From: Antoine Garcia Date: Wed, 29 Sep 2021 12:25:48 +0200 Subject: [PATCH] (PC-8434) make search_group_name non optional --- .../routes/native/v1/serialization/offers.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/pcapi/routes/native/v1/serialization/offers.py b/src/pcapi/routes/native/v1/serialization/offers.py index 55b6b1a5d8..e6b1d785ed 100644 --- a/src/pcapi/routes/native/v1/serialization/offers.py +++ b/src/pcapi/routes/native/v1/serialization/offers.py @@ -8,10 +8,8 @@ from pydantic.fields import Field from pcapi.core.bookings.api import compute_cancellation_limit_date +from pcapi.core.categories import categories from pcapi.core.categories import subcategories -from pcapi.core.categories.categories import CategoryIdEnum -from pcapi.core.categories.subcategories import HomepageLabelNameEnum -from pcapi.core.categories.subcategories import SubcategoryIdEnum from pcapi.core.offers import repository as offers_repository from pcapi.core.offers.api import get_expense_domains from pcapi.core.offers.models import Offer @@ -216,7 +214,7 @@ def from_orm(cls: Any, offer: Offer): # type: ignore isEducational: bool name: str category: OfferCategoryResponse - subcategoryId: SubcategoryIdEnum + subcategoryId: subcategories.SubcategoryIdEnum stocks: list[OfferStockResponse] image: Optional[OfferImageResponse] venue: OfferVenueResponse @@ -283,11 +281,11 @@ class Config: class SubcategoryResponseModel(BaseModel): - id: SubcategoryIdEnum - category_id: CategoryIdEnum + id: subcategories.SubcategoryIdEnum + category_id: categories.CategoryIdEnum app_label: str - search_group_name: Optional[subcategories.SearchGroupNameEnum] - homepage_label_name: HomepageLabelNameEnum + search_group_name: subcategories.SearchGroupNameEnum + homepage_label_name: subcategories.HomepageLabelNameEnum is_event: bool online_offline_platform: subcategories.OnlineOfflinePlatformChoicesEnum @@ -308,7 +306,7 @@ class Config: class HomepageLabelResponseModel(BaseModel): - name: HomepageLabelNameEnum + name: subcategories.HomepageLabelNameEnum value: Optional[str] class Config: