Merge pull request #207 from American-Institutes-for-Research/HEA-816/prelevement_bovins_vendu/egorge_regex_pattern

Update regex pattern for fixing prélèvement bovins (% vendu/égorgé la…

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -416,7 +416,7 @@
         "carcass_weight"
     ],
     [
-        "{product_pattern} offtake \\(% sold/slaughtered\\)",
+        "(?:(?:prélèvement|diminution)(?: des?)?)? ?{product_pattern}(?: offtake)? \\(% (?:vendus?|sold)/(?:égorgés?|egorgés?|abattus?|slaughtered)\\)",
         null,
         false,
         "percentage_sold_slaughtered"
@@ -649,12 +649,6 @@
         false,
         "carcass_weight"
     ],
-    [
-        "(?:prélèvement des .* \\(% vendus/egorgés\\)|diminution .* \\(% vendus/abattu\\))",
-        null,
-        false,
-        "percentage_sold_slaughtered"
-    ],
     [
         "vente (?:des? |d')?{product_pattern}: {nbr_pattern} {vendu_pattern}",
         "LivestockSale",

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -114,6 +114,10 @@
         "product_id": "cattle",
         "attribute": "percentage_sold_slaughtered"
     },
+    "shoat offtake (% sold/slaughtered)": {
+        "product_id": "shoat",
+        "attribute": "percentage_sold_slaughtered"
+    },
     "Chicken  sales: no. sold": {
         "strategy_type": "LivestockSale",
         "is_start": true,
@@ -383,12 +387,19 @@
         "attribute": "price"
     },
     "diminution gros bétail (% vendus/abattu)": {
+        "product_id": "gros bétail",
         "attribute": "percentage_sold_slaughtered"
     },
     "diminution petits ruminants (% vendus/abattu)": {
+        "product_id": "petits ruminants",
         "attribute": "percentage_sold_slaughtered"
     },
     "prélèvement des pts ruminants (% vendus/egorgés)": {
+        "product_id": "pts ruminants",
+        "attribute": "percentage_sold_slaughtered"
+    },
+    "prélèvement bovins (% vendu/égorgé)": {
+        "product_id": "bovins",
         "attribute": "percentage_sold_slaughtered"
     },
     "Vente des oeufs: nb  venduss": {