Merge pull request #47 from OCHA-DAP/main

HDXDSYS-1517 Fix COL 3W error

Author: ccataalin

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.10.30] = 2024-12-24
+
+### Fixed
+
+- 3W for COL, ETH, SDN, VEN
+
 ## [0.10.29] - 2024-12-12
 
 ### Fixed

src/hapi/pipelines/configs/core.yaml

@@ -325,6 +325,7 @@ org_type_map:
   gouvernement: "435"
   gov: "435"
   government agency: "435"
+  gobierno: "435"
   govt: "435"
   iglesia grupo religioso: "446"
   ingo: "437"
@@ -346,6 +347,7 @@ org_type_map:
   ong int: "437"
   ong internacional: "437"
   ong internationale: "437"
+  ong local: "504"
   ong nat: "441"
   ong national: "441"
   ong nacional: "441"
@@ -386,6 +388,7 @@ sector_map:
   alojamiento de emergencia: "SHL"
   alojamiento de emergencia shelter: "SHL"
   alojamientos y asentamientos: "SHL"
+  alojamiento energía y enseres: "SHL"
   ame: "SHL"
   ash: "WSH"
   assainissement: "WSH"
@@ -443,6 +446,7 @@ sector_map:
   manejo y gestion de campamentos: "CCM"
   mpca: "Cash"
   ms: "Multi"
+  multi purpose cash: "Cash"
   multi secteur: "Multi"
   multisectoriel: "Multi"
   nutricion: "NUT"
@@ -466,9 +470,11 @@ sector_map:
   protection logement terre et propriete: "PRO-HLP"
   protection ltb: "PRO-HLP"
   protection lutte anti mines: "PRO-MIN"
+  proteccion ninos ninas adolescentes: "PRO-CPN"
   protection pe: "PRO-CPN"
   protection protection de lenfant: "PRO-CPN"
   protection violences basees sur le genre: "PRO-GBV"
+  proteccion violencia de genero: "PRO-GBV"
   protection vgb: "PRO-GBV"
   proteccion: "PRO"
   provbg: "PRO-GBV"
@@ -481,6 +487,7 @@ sector_map:
   rcf health and nutrtion: "HEA"
   rcf protection: "PRO"
   recuperacion temprana: "ERY"
+  refugee consultative forum: "CCM"
   relevement precoce: "ERY"
   relevement rapide: "ERY"
   refugee response: "CCM"
@@ -510,6 +517,7 @@ sector_map:
   telecommunications durgence: "TEL"
   telecomunicaciones de emergencia: "TEL"
   transport and logistics: "LOG"
+  transversal: "Multi"
   vbg: "PRO-GBV"
   vgb pe: "PRO-GBV"
   violences basees sur le genre: "PRO-GBV"

src/hapi/pipelines/configs/operational_presence.yaml

@@ -18,6 +18,7 @@ operational_presence_default:
     - "operational_presence_nga"
     - "operational_presence_sdn"
     - "operational_presence_ssd"
+    - "operational_presence_ven"
     - "operational_presence_yem"
   output:
     - "org_name"
@@ -122,33 +123,33 @@ operational_presence_admintwo:
 
   operational_presence_col:
     dataset: "colombia-4ws"
-    resource: "COL_345W_Jan-oct2024.xlsx"
+    resource: "345W_1_enero_23_dic_2024.xlsx"
     format: "xlsx"
     xlsx2csv: True
     sheet: "Hoja-1"
     headers: 1
-    use_hxl: True
+    use_hxl: False
     source_date:
       start: "01/01/2024"
-      end: "31/10/2024"
+      end: "23/12/2024"
     admin:
       - ~
-      - "#adm2+code"
+      - "Pcode 2"
     admin_exact: True
     input:
-      - "#org+impl+name"
-      - "#org+impl"
-      - "#org+impl+type"
-      - "#sector"
-      - "#adm1+name"
-      - "#adm2+name"
+      - "ORGANIZACIÓN IMPLEMENTADORA"
+      - "Acrónimo de la organización"
+      - "Tipo de organización implementadora"
+      - "SECTOR / CLUSTER"
+      - "DEPARTAMENTO"
+      - "MUNICIPIO"
     list:
-      - "#org+impl+name"
-      - "#org+impl"
-      - "#org+impl+type"
-      - "#sector"
-      - "#adm1+name"
-      - "#adm2+name"
+      - "ORGANIZACIÓN IMPLEMENTADORA"
+      - "Acrónimo de la organización"
+      - "Tipo de organización implementadora"
+      - "SECTOR / CLUSTER"
+      - "DEPARTAMENTO"
+      - "MUNICIPIO"
 
   operational_presence_gtm:
     dataset: "guatemala-operational-presence"
@@ -425,35 +426,27 @@ operational_presence_admintwo:
 
   operational_presence_ven:
     dataset: "venezuela-who-does-what-and-where-3w"
-    resource: "VEN_5W_Jan-Oct2023.xlsx"
-    format: "xlsx"
-    xlsx2csv: True
-    sheet: "DATOS"
-    headers: 1
+    resource: "VEN_5W_2024.csv"
+    format: "csv"
+    use_hxl: True
     source_date:
-      start: "01/01/2023"
-      end: "31/10/2023"
+      start: "01/01/2024"
+      end: "31/12/2024"
     admin:
       - ~
       - "#adm2+code"
     admin_exact: True
     input:
-      - "#org+impl"
-      - "#sector+acronym"
+      - "#org+impl+ve"
+      - "#org+impl+name"
+      - "#org+impl+type"
+      - "#sector"
       - "#adm1+name"
       - "#adm2+name"
     list:
-      - "#org+impl"
-      - "#sector+acronym"
-      - "#adm1+name"
-      - "#adm2+name"
-    output:
-      - "org_name"
-      - "sector"
-      - "adm1_name"
-      - "adm2_name"
-    output_hxl:
-      - "#org+name"
+      - "#org+impl+ve"
+      - "#org+impl+name"
+      - "#org+impl+type"
       - "#sector"
       - "#adm1+name"
       - "#adm2+name"
@@ -604,15 +597,15 @@ operational_presence_national:
 
   operational_presence_eth:
     dataset: "ethiopia-operational-presence"
-    resource: "Ethiopia Who is Doing What Where (4W) - October 2024.xlsx"
+    resource: "Ethiopia Who is Doing What Where (4W) - November 2024.xlsx"
     format: "xlsx"
     xlsx2csv: True
     sheet: "October 2024"
     headers: 1
     use_hxl: True
     source_date:
-      start: "01/10/2024"
-      end: "31/10/2024"
+      start: "01/11/2024"
+      end: "30/11/2024"
     admin_single: "ETH"
     input:
       - "#org+impl+name"
@@ -730,30 +723,30 @@ operational_presence_national:
 
   operational_presence_sdn:
     dataset: "sudan-operational-presence"
-    resource: "2024-consolidated-3w-data-jan-to-oct.xlsx"
+    resource: "2024-consolidated-3w-data-jan-to-nov.xlsx"
     format: "xlsx"
     xlsx2csv: True
     sheet: "HDX"
     headers: 1
-    use_hxl: True
+    use_hxl: False
     source_date:
       start: "01/01/2024"
-      end: "31/10/2024"
+      end: "30/11/2024"
     admin_single: "SDN"
     input:
-      - "#org+name"
-      - "#org+acronym"
-      - "#org+type"
-      - "#sector+cluster"
-      - "#adm1+name"
-      - "#adm2+name"
+      - "Org name"
+      - "Org acronym"
+      - "Org type"
+      - "Cluster"
+      - "State"
+      - "Locality"
     list:
-      - "#org+name"
-      - "#org+acronym"
-      - "#org+type"
-      - "#sector+cluster"
-      - "#adm1+name"
-      - "#adm2+name"
+      - "Org name"
+      - "Org acronym"
+      - "Org type"
+      - "Cluster"
+      - "State"
+      - "Locality"
 
   operational_presence_ssd:
     dataset: "south-sudan-operational-presence"