feat: add price filters on category_tag, labels_tags & origins_tags (#…

…113) * Add filters on Price.category_tag, Price.labels_tags & Price.origins_tags * Add extra test on currency
openfoodfacts · Dec 31, 2023 · 2a1e350 · 2a1e350
1 parent cd2f34b
commit 2a1e350
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 7 deletions.
diff --git a/app/schemas.py b/app/schemas.py
@@ -267,21 +267,25 @@ class ProofBase(BaseModel):
 class PriceFilter(Filter):
     product_code: Optional[str] | None = None
     product_id: Optional[int] | None = None
+    category_tag: Optional[str] | None = None
+    labels_tags__like: Optional[str] | None = None
+    origins_tags__like: Optional[str] | None = None
     location_osm_id: Optional[int] | None = None
     location_osm_type: Optional[LocationOSMEnum] | None = None
     location_id: Optional[int] | None = None
     price: Optional[int] | None = None
-    currency: Optional[str] | None = None
     price__gt: Optional[int] | None = None
     price__gte: Optional[int] | None = None
     price__lt: Optional[int] | None = None
     price__lte: Optional[int] | None = None
+    currency: Optional[str] | None = None
     date: Optional[str] | None = None
     date__gt: Optional[str] | None = None
     date__gte: Optional[str] | None = None
     date__lt: Optional[str] | None = None
     date__lte: Optional[str] | None = None
     owner: Optional[str] | None = None
+
     order_by: Optional[list[str]] | None = None
 
     class Constants(Filter.Constants):

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -304,26 +304,58 @@ def test_get_prices_filters(db_session, user, clean_prices):
     crud.create_price(
         db_session,
         PRICE_1.model_copy(
-            update={"price": 3.99, "date": datetime.date.fromisoformat("2023-11-01")}
+            update={
+                "price": 3.99,
+                "currency": "USD",
+                "date": datetime.date.fromisoformat("2023-11-01"),
+            }
         ),
         user,
     )
     crud.create_price(db_session, PRICE_1.model_copy(update={"price": 5.10}), user)
+    crud.create_price(
+        db_session,
+        PRICE_1.model_copy(
+            update={
+                "product_code": None,
+                "category_tag": "en:tomatoes",
+                "labels_tags": ["en:organic"],
+                "origins_tags": ["en:spain"],
+            }
+        ),
+        user,
+    )
 
-    assert len(crud.get_prices(db_session)) == 3
+    assert len(crud.get_prices(db_session)) == 4
 
+    # 3 prices with the same product_code
     response = client.get(f"/api/v1/prices?product_code={PRICE_1.product_code}")
     assert response.status_code == 200
-    # 3 prices with the same product_code
     assert len(response.json()["items"]) == 3
-    response = client.get("/api/v1/prices?price__gt=5")
+    # 1 price with a category_tag
+    response = client.get("/api/v1/prices?category_tag=en:tomatoes")
     assert response.status_code == 200
+    assert len(response.json()["items"]) == 1
+    # 1 price with labels_tags
+    response = client.get("/api/v1/prices?labels_tags__like=en:organic")
+    assert response.status_code == 200
+    assert len(response.json()["items"]) == 1
+    # 1 price with origins_tags
+    response = client.get("/api/v1/prices?origins_tags__like=en:spain")
+    assert response.status_code == 200
+    assert len(response.json()["items"]) == 1
     # 1 price with price > 5
+    response = client.get("/api/v1/prices?price__gt=5")
+    assert response.status_code == 200
     assert len(response.json()["items"]) == 1
-    response = client.get("/api/v1/prices?date=2023-10-31")
+    # 1 price with currency USD
+    response = client.get("/api/v1/prices?currency=USD")
     assert response.status_code == 200
+    assert len(response.json()["items"]) == 1
     # 2 prices with date = 2023-10-31
-    assert len(response.json()["items"]) == 2
+    response = client.get(f"/api/v1/prices?date={PRICE_1.date}")
+    assert response.status_code == 200
+    assert len(response.json()["items"]) == 3
 
 
 def test_get_prices_orders(db_session, user, clean_prices):