(PC-29215)[API] fix: undo making native category nullable

pass-culture · Sep 26, 2024 · 15a7e1c · 15a7e1c
1 parent ee27c76
commit 15a7e1c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/api/src/pcapi/core/categories/subcategories_v2.py b/api/src/pcapi/core/categories/subcategories_v2.py
@@ -410,6 +410,7 @@ def get_show_nodes() -> list[ShowGenre]:
     label="Musique en ligne",
     parents=[SEARCH_GROUP_CD_VINYLE_MUSIQUE_EN_LIGNE.id],
 )
+NATIVE_CATEGORY_NONE = NativeCategory(technical_name="NATIVE_CATEGORY_NONE", label="None", parents=[])
 NATIVE_CATEGORY_PARTITIONS_DE_MUSIQUE = NativeCategory(
     technical_name="PARTITIONS_DE_MUSIQUE",
     label="Partitions de musique",
@@ -617,7 +618,7 @@ class EacFormat(Enum):
 class Subcategory:
     id: str
     category: categories.Category
-    native_category: NativeCategory | None
+    native_category: NativeCategory
     pro_label: str
     app_label: str
     search_group_name: str
@@ -655,8 +656,8 @@ def category_id(self) -> str:
         return self.category.id
 
     @property
-    def native_category_id(self) -> str | None:
-        return self.native_category.id if self.native_category else None
+    def native_category_id(self) -> str:
+        return self.native_category.id
 
     @property
     def is_offline_only(self) -> bool:
@@ -1302,7 +1303,7 @@ def is_online_only(self) -> bool:
 CARTE_JEUNES = Subcategory(
     id="CARTE_JEUNES",
     category=categories.CARTE_JEUNES,
-    native_category=None,
+    native_category=NATIVE_CATEGORY_NONE,
     pro_label="Carte jeunes",
     app_label="Carte jeunes",
     search_group_name=SEARCH_GROUP_CARTES_JEUNES.id,

diff --git a/api/src/pcapi/core/search/backends/algolia.py b/api/src/pcapi/core/search/backends/algolia.py
@@ -16,6 +16,7 @@
 
 from pcapi import settings
 from pcapi.core.categories import categories
+from pcapi.core.categories import subcategories_v2
 from pcapi.core.educational.academies import get_academy_from_department
 import pcapi.core.educational.api.offer as educational_api_offer
 import pcapi.core.educational.models as educational_models
@@ -526,7 +527,7 @@ def serialize_offer(cls, offer: offers_models.Offer, last_30_days_bookings: int)
 
         search_groups = (
             offer.subcategory.native_category.parents
-            if offer.subcategory.native_category
+            if offer.subcategory.native_category != subcategories_v2.NATIVE_CATEGORY_NONE
             else [offer.subcategory.search_group_name]
         )
 

diff --git a/api/tests/routes/native/openapi_test.py b/api/tests/routes/native/openapi_test.py
@@ -1094,6 +1094,7 @@ def test_public_api(client):
                         "LUDOTHEQUE",
                         "MATERIELS_CREATIFS",
                         "MUSIQUE_EN_LIGNE",
+                        "NATIVE_CATEGORY_NONE",
                         "PARTITIONS_DE_MUSIQUE",
                         "PODCAST",
                         "PRATIQUES_ET_ATELIERS_ARTISTIQUES",