Address PR feedback see HEA-820

Author: girumb

pipelines/assets/livelihood_activity.py

@@ -243,6 +243,7 @@ def get_livelihood_activity_regexes() -> list:
         "nbr_pattern": r"(?:n[b|o]r?)\.?",
         "vendu_pattern": r"(?:quantité )?vendu(?:e|s|ss|es|ses)?",
         "separator_pattern": r" ?[:-]?",
+        "name_of_local_measure_pattern": r"(?:name of (?:meas(?:ure)?)|nom(?: (?:de la mesure(?: locale)?|de mesure locale|du mesure|d'unité|mesure locale|unité de mesure))?)",
     }
     # Compile the regexes
     compiled_regexes = []

pipelines/assets/livelihood_activity_regexes.json

@@ -122,7 +122,7 @@
         "times_per_month"
     ],
     [
-        "name of measure",
+        "{name_of_local_measure_pattern}",
         null,
         false,
         "name_of_local_measure"
@@ -223,12 +223,6 @@
         false,
         "times_per_month"
     ],
-    [
-        "(?:nom de la mesure|nom du mesure|nom d'unité|nom mesure locale)",
-        null,
-        false,
-        "name_of_local_measure"
-    ],
     [
         "(?:poids? de la mesure|poids? du mesure|poids? d'unité)",
         null,
@@ -500,7 +494,25 @@
         "quantity_sold"
     ],
     [
-        "{product_pattern}: name of meas\\.",
+        "(?P<product_id>eau pour (?:humains|bétail|betail)|farine de [a-zà-ÿ]+){separator_pattern} {name_of_local_measure_pattern}:?\\.?",
+        "FoodPurchase",
+        true,
+        "name_of_local_measure"
+    ],
+    [
+        "autre culture(?: de rente)?{separator_pattern} (?:type|nom)",
+        null,
+        true,
+        "product__name"
+    ],
+    [
+        "(?:autre nouriture de base|autre legumineuse|autre culture)?{separator_pattern} ?\\(?{product_pattern}\\)?{separator_pattern} ?{name_of_local_measure_pattern}",
+        null,
+        true,
+        "name_of_local_measure"
+    ],
+    [
+        "{product_pattern}{separator_pattern} {name_of_local_measure_pattern}\\.?",
         null,
         true,
         "name_of_local_measure"
@@ -763,12 +775,6 @@
         false,
         "number_of_local_measures"
     ],
-    [
-        "autre culture(?: de rente)?{separator_pattern} (?:type|nom)",
-        null,
-        true,
-        "product__name"
-    ],
     [
         "autre culture{separator_pattern} \\(?{product_pattern}\\)?(?: type)?",
         null,
@@ -853,18 +859,6 @@
         true,
         "expenditure"
     ],
-    [
-        "(?P<product_id>eau pour (?:humains|bétail|betail)|farine de [a-zà-ÿ]+) *(?::| -) ?(?:name of meas|nom de la mesure locale|nom de mesure locale|nom de la mesure local|nom de la mesure|nom d'unité|nom du mesure|nom mesure locale|nom unité de mesure):?\\.?",
-        "FoodPurchase",
-        true,
-        "name_of_local_measure"
-    ],
-    [
-        "(?:autre nouriture de base|autre legumineuse|autre culture)?{separator_pattern} ?\\(?{product_pattern}\\)?{separator_pattern} ?(?:nom de la mesure locale?|nom mesure locale|nom du mesure|nom unité de mesure|nom)",
-        null,
-        true,
-        "name_of_local_measure"
-    ],
     [
         "{product_pattern} achetée?: quantité ?\\(?{unit_of_measure_pattern}\\)?",
         null,