Better vente de regexes - see HEA-833

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -55,18 +55,6 @@
         true,
         null
     ],
-    [
-        "vente (?:de |d')?{product_pattern}",
-        null,
-        true,
-        null
-    ],
-    [
-        "{product_pattern} sales",
-        null,
-        true,
-        null
-    ],
     [
         "(?:autre auto-emploi|other self-employment){separator_pattern} {age_gender_pattern}{separator_pattern} {product_pattern}",
         "OtherCashIncome",
@@ -314,16 +302,10 @@
         "price"
     ],
     [
-        "prix d'achat \\(espèces\\)",
-        null,
-        false,
-        "purchase_price"
-    ],
-    [
-        "prix de vente \\(espèces\\)",
+        "prix (?:d'|du|de) ?(?:vente|achat) ?\\(?(?:cash|espèces|cash prix d'achat)\\)?",
         null,
         false,
-        "sales_price"
+        "price"
     ],
     [
         "paiement en {unit_of_measure_pattern} par fois \\({product_pattern}\\)",
@@ -500,7 +482,25 @@
         "percentage_sold_slaughtered"
     ],
     [
-        "{product_pattern} sales: no. sold",
+        "{product_pattern} sales{separator_pattern} {nbr_pattern} sold",
+        "LivestockSale",
+        true,
+        "quantity_sold"
+    ],
+    [
+        "vente (?:des? |d')?{product_pattern}{separator_pattern} {nbr_pattern} {vendu_pattern}",
+        "LivestockSale",
+        true,
+        "quantity_sold"
+    ],
+    [
+        "{product_pattern} vente: {nbr_pattern} {vendu_pattern}",
+        "LivestockSale",
+        true,
+        "quantity_sold"
+    ],
+    [
+        "{product_pattern}: {nbr_pattern} {vendu_pattern}",
         "LivestockSale",
         true,
         "quantity_sold"
@@ -745,24 +745,6 @@
         false,
         "carcass_weight"
     ],
-    [
-        "vente (?:des? |d')?{product_pattern}: {nbr_pattern} {vendu_pattern}",
-        "LivestockSale",
-        true,
-        "quantity_sold"
-    ],
-    [
-        "{product_pattern} vente: {nbr_pattern} {vendu_pattern}",
-        "LivestockSale",
-        true,
-        "quantity_sold"
-    ],
-    [
-        "{product_pattern}: {nbr_pattern} {vendu_pattern}",
-        "LivestockSale",
-        true,
-        "quantity_sold"
-    ],
     [
         "autre (?:culture de rente|culture|cereale|céréale/légumineuse|céréale? principal|légumineuse)?{separator_pattern} \\(?{product_pattern}\\)?{separator_pattern} {unit_of_measure_pattern} produits?",
         null,
@@ -902,7 +884,7 @@
         "quantity_sold"
     ],
     [
-        "{product_pattern}: (?P<unit_of_measure_id>kg|l)? {vendu_pattern}",
+        "(?:vente de |vente )?{product_pattern}{separator_pattern} (?P<unit_of_measure_id>kg|l)? {vendu_pattern}",
         null,
         true,
         "quantity_sold"
@@ -919,14 +901,26 @@
         true,
         "quantity_sold"
     ],
+    [
+        "(?:autre)?{separator_pattern}vente (?:de |d')?{product_pattern}",
+        null,
+        true,
+        null
+    ],
+    [
+        "{product_pattern} sales",
+        null,
+        true,
+        null
+    ],
     [
         "autre achat{separator_pattern} ?{product_pattern}",
         null,
         true,
         null
     ],
     [
-        "autre auto-emploi{separator_pattern} ?{product_pattern}",
+        "autre auto-emploi{separator_pattern} (?:vente de |vente )?{product_pattern}",
         null,
         true,
         null

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -165,6 +165,18 @@
         "product_id": "eggs",
         "attribute": "quantity_sold"
     },
+    "vente de légume: kg vendus": {
+        "is_start": true,
+        "product_id": "légume",
+        "unit_of_measure_id": "kg",
+        "attribute": "quantity_sold"
+    },
+    "vente cultures maraichères: kg vendus": {
+        "is_start": true,
+        "product_id": "cultures maraichères",
+        "unit_of_measure_id": "kg",
+        "attribute": "quantity_sold"
+    },
     "Vente de bois de chauffage": {
         "is_start": true,
         "product_id": "bois de chauffage"
@@ -185,6 +197,10 @@
         "is_start": true,
         "product_id": "orange"
     },
+    "autre: vente néré": {
+        "is_start": true,
+        "product_id": "néré"
+    },
     "sand sales": {
         "is_start": true,
         "product_id": "sand"
@@ -530,6 +546,18 @@
         "product_id": "volaille",
         "attribute": "quantity_sold"
     },
+    "vente de porcs - nb vendus": {
+        "strategy_type": "LivestockSale",
+        "is_start": true,
+        "product_id": "porcs",
+        "attribute": "quantity_sold"
+    },
+    "pig sales: no sold": {
+        "strategy_type": "LivestockSale",
+        "is_start": true,
+        "product_id": "pig",
+        "attribute": "quantity_sold"
+    },
     "Peaux: nb vendues": {
         "strategy_type": "LivestockSale",
         "is_start": true,
@@ -874,10 +902,19 @@
         "attribute": "price"
     },
     "prix d'achat (espèces)": {
-        "attribute": "purchase_price"
+        "attribute": "price"
     },
     "prix de vente (espèces)": {
-        "attribute": "sales_price"
+        "attribute": "price"
+    },
+    "prix du vente (cash prix d'achat)": {
+        "attribute": "price"
+    },
+    "prix du vente (cash)": {
+        "attribute": "price"
+    },
+    "prix de vente (cash)": {
+        "attribute": "price"
     },
     "dépense": {
         "attribute": "expenditure"
@@ -1088,7 +1125,15 @@
         "is_start": true,
         "product_id": "petty trade",
         "attribute": "people_per_household"
-},
+    },
+    "autre auto-emploi vente de foin": {
+        "is_start": true,
+        "product_id": "foin"
+    },
+    "autre auto-emploi: vente prods de cueillette": {
+        "is_start": true,
+        "product_id": "prods de cueillette"
+    },
     "hommes - preparation terre/labour": {
         "is_start": true,
         "product_id": "preparation terre/labour",