Allow receipt_quantity for GDPR proofs

openfoodfacts · Oct 18, 2024 · 0e00b8a · 0e00b8a
1 parent 8af22ba
commit 0e00b8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/open_prices/prices/models.py b/open_prices/prices/models.py
@@ -369,15 +369,15 @@ def clean(self, *args, **kwargs):
                                     "proof",
                                     f"Proof {PROOF_FIELD} ({proof_field_value}) does not match the price {PROOF_FIELD} ({price_field_value})",
                                 )
-                if proof.type == proof_constants.TYPE_RECEIPT:
+                if proof.type in proof_constants.TYPE_SHOPPING_SESSION_LIST:
                     if not self.receipt_quantity:
                         self.receipt_quantity = 1
                 else:
                     if self.receipt_quantity is not None:
                         validation_errors = utils.add_validation_error(
                             validation_errors,
                             "receipt_quantity",
-                            "Can only be set if proof type RECEIPT",
+                            f"Can only be set if proof type in {proof_constants.TYPE_SHOPPING_SESSION_LIST}",
                         )
         # return
         if bool(validation_errors):

diff --git a/open_prices/proofs/constants.py b/open_prices/proofs/constants.py
@@ -8,4 +8,5 @@
 
 # 1 proof = 1 shop + 1 date
 TYPE_SINGLE_SHOP_LIST = [TYPE_PRICE_TAG, TYPE_RECEIPT, TYPE_SHOP_IMPORT]
+TYPE_SHOPPING_SESSION_LIST = [TYPE_RECEIPT, TYPE_GDPR_REQUEST]
 TYPE_MULTIPLE_SHOP_LIST = [TYPE_GDPR_REQUEST]
diff --git a/open_prices/proofs/models.py b/open_prices/proofs/models.py
@@ -26,6 +26,9 @@ def has_type_shop_import(self):
     def has_type_single_shop(self):
         return self.filter(type__in=proof_constants.TYPE_SINGLE_SHOP_LIST)
 
+    def has_type_shopping_session(self):
+        return self.filter(type=proof_constants.TYPE_SHOPPING_SESSION_LIST)
+
     def has_prices(self):
         return self.filter(price_count__gt=0)