feat: add date fields to etablissements mapping

annuaire-entreprises-data-gouv-fr · Nov 8, 2023 · 62b63b5 · 62b63b5
1 parent 8c2fd35
commit 62b63b5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/data_preprocessing/etablissements.py b/data_preprocessing/etablissements.py
@@ -26,6 +26,8 @@ def download_stock(departement):
             "siret",
             "dateCreationEtablissement",
             "trancheEffectifsEtablissement",
+            "anneeEffectifsEtablissement",
+            "dateDernierTraitementEtablissement",
             "activitePrincipaleRegistreMetiersEtablissement",
             "etablissementSiege",
             "numeroVoieEtablissement",
@@ -96,6 +98,8 @@ def download_flux(data_dir):
             "siret",
             "dateCreationEtablissement",
             "trancheEffectifsEtablissement",
+            "anneeEffectifsEtablissement",
+            "dateDernierTraitementEtablissement",
             "activitePrincipaleRegistreMetiersEtablissement",
             "etablissementSiege",
             "numeroVoieEtablissement",
@@ -151,6 +155,8 @@ def preprocess_etablissements_data(siret_file_type, departement=None, data_dir=N
         columns={
             "dateCreationEtablissement": "date_creation",
             "trancheEffectifsEtablissement": "tranche_effectif_salarie",
+            "anneeEffectifsEtablissement": "annee_tranche_effectif_salarie",
+            "dateDernierTraitementEtablissement": "date_mise_a_jour",
             "activitePrincipaleRegistreMetiersEtablissement": "activite_principale"
             "_registre_metier",
             "etablissementSiege": "est_siege",

diff --git a/elasticsearch/mapping_index.py b/elasticsearch/mapping_index.py
@@ -100,6 +100,7 @@ class EtablissementMapping(InnerDoc):
     activite_principale = Text()
     activite_principale_registre_metier = Keyword()
     adresse = Text(analyzer=annuaire_analyzer)
+    annee_tranche_effectif_salarie = Date()
     cedex = Keyword()
     cedex_2 = Text()
     code_pays_etranger = Text()
@@ -116,6 +117,7 @@ class EtablissementMapping(InnerDoc):
     complement_adresse_2 = Text()
     date_creation = Date()
     date_debut_activite = Date()
+    date_mise_a_jour = Date()
     departement = Keyword()
     distribution_speciale = Text()
     distribution_speciale_2 = Text()
@@ -161,6 +163,7 @@ class SiegeMapping(InnerDoc):
     activite_principale = Text()
     activite_principale_registre_metier = Keyword()
     adresse = Text(analyzer=annuaire_analyzer)
+    annee_tranche_effectif_salarie = Date()
     cedex = Keyword()
     cedex_2 = Text()
     code_pays_etranger = Text()
@@ -173,6 +176,7 @@ class SiegeMapping(InnerDoc):
     complement_adresse_2 = Text()
     date_creation = Date()
     date_debut_activite = Date()
+    date_mise_a_jour = Date()
     departement = Keyword()
     distribution_speciale = Text()
     distribution_speciale_2 = Text()

diff --git a/sqlite/queries/create_table_etabs.py b/sqlite/queries/create_table_etabs.py
@@ -4,6 +4,8 @@
             siret TEXT PRIMARY KEY,
             date_creation,
             tranche_effectif_salarie,
+            annee_tranche_effectif_salarie,
+            date_mise_a_jour,
             activite_principale_registre_metier,
             est_siege,
             numero_voie,

diff --git a/sqlite/queries/create_table_flux_etabs.py b/sqlite/queries/create_table_flux_etabs.py
@@ -4,6 +4,8 @@
             siret TEXT PRIMARY KEY,
             date_creation,
             tranche_effectif_salarie,
+            annee_tranche_effectif_salarie,
+            date_mise_a_jour,
             activite_principale_registre_metier,
             est_siege,
             numero_voie,

diff --git a/sqlite/queries/select_fields_to_index.py b/sqlite/queries/select_fields_to_index.py
@@ -129,6 +129,8 @@
                         'siren', siren,
                         'siret', siret,
                         'tranche_effectif_salarie',tranche_effectif_salarie,
+                        'annee_tranche_effectif_salarie',annee_tranche_effectif_salarie,
+                        'date_mise_a_jour', date_mise_a_jour,
                         'type_voie',type_voie,
                         'type_voie_2',type_voie_2
                         )
@@ -186,7 +188,11 @@
                         s.numero_voie_2 as numero_voie_2,
                         s.siren as siren,
                         s.siret as siret,
-                        s.tranche_effectif_salarie as tranche_effectif_salarie,
+                        s.tranche_effectif_salarie as
+                        tranche_effectif_salarie,
+                        s.annee_tranche_effectif_salarie as
+                        annee_tranche_effectif_salarie,
+                        s.date_mise_a_jour as date_mise_a_jour,
                         s.type_voie as type_voie,
                         s.type_voie_2 as type_voie_2
                         FROM siret s
@@ -242,6 +248,9 @@
                         'siren', siren,
                         'siret', siret,
                         'tranche_effectif_salarie',tranche_effectif_salarie,
+                        'annee_tranche_effectif_salarie',
+                        annee_tranche_effectif_salarie,
+                        'date_mise_a_jour', date_mise_a_jour,
                         'type_voie',type_voie,
                         'type_voie_2',type_voie_2
                         )
@@ -300,6 +309,9 @@
                         s.siren as siren,
                         s.siret as siret,
                         s.tranche_effectif_salarie as tranche_effectif_salarie,
+                        s.annee_tranche_effectif_salarie as
+                        annee_tranche_effectif_salarie,
+                        s.date_mise_a_jour as date_mise_a_jour,
                         s.type_voie as type_voie,
                         s.type_voie_2 as type_voie_2
                         FROM siretsiege as s