Merge pull request #242 from American-Institutes-for-Research/HEA-809/add_regex_for_men_women_boys_girls

Better regex for fishing - see HEA-809

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -92,7 +92,7 @@
         "people_per_household"
     ],
     [
-        "{product_pattern}{separator_pattern} {age_gender_pattern} ?\\(?{unit_of_measure_pattern}(?: collectés?|gathered)?\\)?",
+        "(?:fish|poisson)?{separator_pattern}{product_pattern}{separator_pattern} {age_gender_pattern} ?\\(?{unit_of_measure_pattern}(?: collectés?|gathered)?\\)?",
         null,
         true,
         "quantity_produced"
@@ -806,7 +806,7 @@
         "quantity_produced"
     ],
     [
-        "(?:fish|fish \\(?dry\\)?|fish \\(?fresh\\)?){separator_pattern} {product_pattern}{separator_pattern} \\(?{unit_of_measure_pattern} gathered\\)?",
+        "(?:fish|fish \\(?dry\\)?|fish \\(?fresh\\)?|poisson){separator_pattern} {product_pattern}{separator_pattern} \\(?{unit_of_measure_pattern} (?:gathered|collectés)\\)?",
         null,
         true,
         "quantity_produced"

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -1032,6 +1032,18 @@
         "unit_of_measure_id": "kg",
         "attribute": "quantity_produced"
     },
+    "poisson : poisson 4 (kg collectés)" : {
+        "is_start": true,
+        "product_id": "poisson 4",
+        "unit_of_measure_id": "kg",
+        "attribute": "quantity_produced"
+    },
+    "fish : fish 4 (kg gathered)": {
+        "is_start": true,
+        "product_id": "fish 4",
+        "unit_of_measure_id": "kg",
+        "attribute": "quantity_produced"
+    },
     "petit commerce: nbre de personnes par mènage": {
         "is_start": true,
         "product_id": "petit commerce",
@@ -1087,9 +1099,9 @@
         "product_id": "threshing, harvesting",
         "household_labor_provider": "women"
     },
-    "poisson/peche homme (kg collectés)": {
+    "poisson : peche homme (kg collectés)": {
         "is_start": true,
-        "product_id": "poisson/peche",
+        "product_id": "peche",
         "household_labor_provider": "men",
         "unit_of_measure_id": "kg",
         "attribute": "quantity_produced"