Merge branch 'main' into HEA-984/Livelihood_activity_valid_instances_errors_for_income_not_rounding_error

Author: girumb

apps/common/migrations/0008_load_classified_product.py

@@ -1,12 +1,10 @@
 # Generated by Django 4.2.2 on 2023-09-03 13:52
 import ast
 import datetime
-import json
 import logging
 import os
 from collections import namedtuple
 
-from django.conf import settings
 from django.db import migrations
 
 from common.utils import UnicodeDictReader, get_frozen_treebeard_model
@@ -231,7 +229,6 @@ def load_new_products(ClassifiedProduct):
             "P23130HB", "Groats, meal and pellets of oats, rolled oats", "Rolled oats", None, "", "", "", "", "", ""
         ),
         Product("P23170HA", "Other vegetable flours and meals, yam flour", "Yam flour", None, "", "", "", "", "", ""),
-        Product("R01412HA", "Soya beans, other, dry", "Soya beans (dry)", None, "", "", "", "", "", ""),
         Product(
             "R01219HA",
             "Other leafy or stem vegetables, dark green",
@@ -268,18 +265,6 @@ def load_new_products(ClassifiedProduct):
             "",
             "",
         ),
-        Product(
-            "P24490HA",
-            "Other non-alcoholic caloric beverages, soft drinks",
-            "Soft drinks (commercial)",
-            None,
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-        ),
         Product(
             "P21111HA",
             "Meat of cattle, fresh or chilled, moderate fat",

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -503,7 +503,7 @@
         "is_start": true,
         "season": "1ème saison",
         "attribute": "percentage_kcals"
-    },        
+    },
     "poids de la carcasse (kg)": {
         "unit_of_measure_id": "kg",
         "attribute": "carcass_weight"
@@ -863,6 +863,10 @@
         "unit_of_measure_id": "kg",
         "attribute": "unit_multiple"
     },
+    "AUTRE ACHAT": {
+        "strategy_type": "OtherPurchase",
+        "is_start": true
+    },
     "Autre achat: beurre de Karité": {
         "is_start": true,
         "product_id": "beurre de karité",
@@ -1077,7 +1081,7 @@
         "unit_of_measure_id": "kg",
         "attribute": "quantity_produced"
     },
-    "poisson : poisson 4 (kg collectés)" : {
+    "poisson : poisson 4 (kg collectés)": {
         "is_start": true,
         "product_id": "poisson 4",
         "unit_of_measure_id": "kg",
@@ -1252,44 +1256,43 @@
         "is_start": true,
         "product_id": "vente de légumes",
         "household_labor_provider": "girls"
+    },
+    "huile: nom du mesure": {
+        "is_start": true,
+        "product_id": "huile",
+        "attribute": "name_of_local_measure"
+    },
+    "sel - nom de la mesure locale": {
+        "is_start": true,
+        "product_id": "sel",
+        "attribute": "name_of_local_measure"
+    },
+    "sucre: nom mesure locale": {
+        "is_start": true,
+        "product_id": "sucre",
+        "attribute": "name_of_local_measure"
+    },
+    "eau pour humains: nom de mesure locale:.": {
+        "is_start": true,
+        "product_id": "eau pour humains",
+        "attribute": "name_of_local_measure"
+    },
+    "eau pour betail: nom de la mesure locale": {
+        "is_start": true,
+        "product_id": "eau pour betail",
+        "attribute": "name_of_local_measure"
+    },
+    "farine de ble - nom de la mesure locale": {
+        "is_start": true,
+        "product_id": "farine de ble",
+        "attribute": "name_of_local_measure"
+    },
+    "nom de la mesure local": {
+        "attribute": "name_of_local_measure"
+    },
+    "eau pour le bétail: nom mesure": {
+        "is_start": true,
+        "product_id": "eau pour le bétail",
+        "attribute": "name_of_local_measure"
     }
-,
-  "huile: nom du mesure": {
-    "is_start": true,
-    "product_id": "huile",
-    "attribute": "name_of_local_measure"
-  },
-  "sel - nom de la mesure locale": {
-    "is_start": true,
-    "product_id": "sel",
-    "attribute": "name_of_local_measure"
-  },
-  "sucre: nom mesure locale": {
-    "is_start": true,
-    "product_id": "sucre",
-    "attribute": "name_of_local_measure"
-  },
-  "eau pour humains: nom de mesure locale:.": {
-    "is_start": true,
-    "product_id": "eau pour humains",
-    "attribute": "name_of_local_measure"
-  },
-  "eau pour betail: nom de la mesure locale": {
-    "is_start": true,
-    "product_id": "eau pour betail",
-    "attribute": "name_of_local_measure"
-  },
-  "farine de ble - nom de la mesure locale": {
-    "is_start": true,
-    "product_id": "farine de ble",
-    "attribute": "name_of_local_measure"
-  },
-  "nom de la mesure local": {
-    "attribute": "name_of_local_measure"
-  },
-  "eau pour le bétail: nom mesure": {
-    "is_start": true,
-    "product_id": "eau pour le bétail",
-    "attribute": "name_of_local_measure"
-  }
 }