add product type to pain report + embed in no fresh egg exception

Author: littlecoffe8

backend/app/business/open_food_facts/knowledge_panel.py

@@ -24,6 +24,7 @@
     Panel,
     PanelElement,
     ProductInfo,
+    ProductType,
     TextElement,
     TitleElement,
 )
@@ -158,8 +159,7 @@ async def get_pain_reports(barcode: str, locale: str) -> List[PainReport]:
         calculator = PainReportCalculator(product_data)
 
     except EggButNotFreshEgg as e:
-        return [PainReport(product_name=e.product_name, product_image_url=e.image_url)]
-
+        return [e.pain_report]
     # Generate and return the pain report
     # For no fresh chicken eggs return empty list to display a specific knowledge panel
     pain_reports = calculator.get_pain_reports()
@@ -219,6 +219,12 @@ def get_response(self) -> KnowledgePanelResponse:
         """
         # Defining which detailed panels are to be displayed
 
+        # No result if the product is no egg
+        if len(self.pain_reports) > 0 and self.pain_reports[0].product_type != ProductType(
+            is_mixed=False, animal_types={AnimalType.LAYING_HEN}
+        ):
+            raise ResourceNotFoundException(f"Product {self.pain_reports[0].product_name} is not a laying hen")
+
         detailed_panels = ["project_panel"]
 
         # root panel depending on pain report data and detailed panels
@@ -255,6 +261,7 @@ def _create_root_panel(self, detailed_panels: list[str]) -> Panel:
         # Initialize the panel with generic information message about the project
         elements = []
 
+        #
         if len(self.pain_reports) == 1 and self.pain_reports[0].animal_pain_reports == []:
             elements += self._create_element_from_html("no_fresh_egg.html")
 

backend/app/business/open_food_facts/pain_report_calculator.py

@@ -90,6 +90,7 @@ def get_pain_reports(self) -> List[PainReport]:
                     animal_pain_reports=[],
                     product_name=self.product_data.product_name,
                     product_image_url=self.product_data.image_url,
+                    product_type=self.product_type,
                 )
             ]
 
@@ -116,6 +117,7 @@ def get_pain_reports(self) -> List[PainReport]:
                     animal_pain_reports=[animal_report],
                     product_name=self.product_data.product_name,
                     product_image_url=self.product_data.image_url,
+                    product_type=self.product_type,
                 )
                 pain_reports.append(pain_report)
 

backend/app/business/open_food_facts/product_type_calculator.py

@@ -4,7 +4,7 @@
 from app.enums.open_food_facts.enums import AnimalType
 from app.enums.open_food_facts.product_type_enums import ProductTypePatternRepository
 from app.schemas.open_food_facts.external import ProductData
-from app.schemas.open_food_facts.internal import ProductType
+from app.schemas.open_food_facts.internal import PainReport, ProductType
 
 
 def get_product_type(product_data: ProductData) -> ProductType:
@@ -28,7 +28,13 @@ def get_product_type(product_data: ProductData) -> ProductType:
 
                 # temp fix to display specific information for this kind of product
                 else:
-                    raise EggButNotFreshEgg(product_name=product_data.product_name, image_url=product_data.image_url)
+                    raise EggButNotFreshEgg(
+                        pain_report=PainReport(
+                            product_name=product_data.product_name,
+                            product_image_url=product_data.image_url,
+                            product_type=ProductType(is_mixed=False, animal_types={AnimalType.LAYING_HEN}),
+                        )
+                    )
             else:
                 animal_types.add(animal_type)
 

backend/app/config/exceptions.py

@@ -5,7 +5,7 @@
 
 import logging
 
-from pydantic import HttpUrl
+from app.schemas.open_food_facts.internal import PainReport
 
 logger = logging.getLogger("app")
 
@@ -52,10 +52,7 @@ class MissingBreedingTypeOrQuantityError(Exception):
 
 
 class EggButNotFreshEgg(Exception):
-    def __init__(
-        self, product_name: str | None = None, image_url: HttpUrl | None = None, message: str = "Egg but not fresh egg"
-    ):
-        self.product_name = product_name
-        self.image_url = image_url
+    def __init__(self, pain_report: PainReport, message: str = "Egg but not fresh egg"):
         self.message = message
+        self.pain_report = pain_report
         super().__init__(message)

backend/app/schemas/open_food_facts/internal.py

@@ -47,6 +47,7 @@ class PainReport(BaseModel):
     animal_pain_reports: List[AnimalPainReport] = []
     product_name: str | None
     product_image_url: HttpUrl | None = None
+    product_type: ProductType
 
 
 # Knowledge panel response models

frontend/app/[locale]/off/page.tsx

@@ -89,6 +89,8 @@ export default function KnowledgePanel() {
     '78742330808',
     '5051140152901',
     '3560071227241',
+    '0030561400018',
+
   ];
 
   const barcodeNames: { [key: string]: string } = {
@@ -115,6 +117,7 @@ export default function KnowledgePanel() {
     '78742330808': '"1 egg" dans quantity',
     '5051140152901': '12 large - calibre trouvé',
     '3560071227241': '6 moyens - calibre trouvé',
+    '0030561400018' : 'pickled eggs',
   };
 
   useEffect(() => {