Merge branch 'release/v2.5.0'

.vscode/extensions.json

@@ -1,9 +1,5 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-    // List of extensions which should be recommended for users of this workspace.
-    "recommendations": ["matklad.rust-analyzer"],
-    // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-    "unwantedRecommendations": []
+    "recommendations": [
+        "rust-lang.rust-analyzer"
+    ]
 }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sirene"
-version = "2.4.1"
+version = "2.5.0"
 authors = ["Julien Blatecky <[email protected]>"]
 edition = "2021"
 

app/Chart.yaml

@@ -21,7 +21,7 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.4.1"
+appVersion: "v2.5.0"
 
 dependencies:
     - name: postgresql

migrations/2022-05-13-142631_remove_societe_mission_column/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "public"."unite_legale" ADD COLUMN "societe_mission" varchar(1) DEFAULT NULL;
+ALTER TABLE "public"."unite_legale_staging" ADD COLUMN "societe_mission" varchar(1) DEFAULT NULL;

migrations/2022-05-13-142631_remove_societe_mission_column/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "public"."unite_legale" DROP COLUMN "societe_mission";
+ALTER TABLE "public"."unite_legale_staging" DROP COLUMN "societe_mission";

src/connectors/insee/types/unite_legale.rs

@@ -93,7 +93,6 @@ pub struct PeriodeInseeUniteLegale {
     pub changement_economie_sociale_solidaire_unite_legale: bool,
     pub caractere_employeur_unite_legale: Option<String>,
     pub changement_caractere_employeur_unite_legale: bool,
-    pub societe_mission_unite_legale: Option<String>,
 }
 
 impl From<&InseeUniteLegale> for Option<UniteLegale> {
@@ -149,7 +148,6 @@ impl From<InseeUniteLegaleWithPeriode> for UniteLegale {
             nic_siege: u.periode.nic_siege_unite_legale,
             economie_sociale_solidaire: u.periode.economie_sociale_solidaire_unite_legale,
             caractere_employeur: u.periode.caractere_employeur_unite_legale,
-            societe_mission: u.periode.societe_mission_unite_legale,
         }
     }
 }

src/models/schema.rs

@@ -156,7 +156,6 @@ table! {
         nic_siege -> Nullable<Text>,
         economie_sociale_solidaire -> Nullable<Text>,
         caractere_employeur -> Nullable<Varchar>,
-        societe_mission -> Nullable<Varchar>,
     }
 }
 
@@ -195,7 +194,6 @@ table! {
         nic_siege -> Nullable<Text>,
         economie_sociale_solidaire -> Nullable<Text>,
         caractere_employeur -> Nullable<Varchar>,
-        societe_mission -> Nullable<Varchar>,
     }
 }
 

src/models/unite_legale/columns.rs

@@ -31,6 +31,5 @@ activite_principale,
 nomenclature_activite_principale,
 nic_siege,
 economie_sociale_solidaire,
-caractere_employeur,
-societe_mission
+caractere_employeur
 "#;

src/models/unite_legale/common.rs

@@ -37,6 +37,5 @@ pub struct UniteLegale {
     pub nomenclature_activite_principale: Option<String>,
     pub nic_siege: Option<String>,
     pub economie_sociale_solidaire: Option<String>,
-    pub caractere_employeur: Option<String>,
-    pub societe_mission: Option<String>,
+    pub caractere_employeur: Option<String>
 }

src/models/unite_legale/mod.rs

@@ -173,7 +173,6 @@ impl UpdatableModel for UniteLegaleModel {
                 dsl::nic_siege.eq(excluded(dsl::nic_siege)),
                 dsl::economie_sociale_solidaire.eq(excluded(dsl::economie_sociale_solidaire)),
                 dsl::caractere_employeur.eq(excluded(dsl::caractere_employeur)),
-                dsl::societe_mission.eq(excluded(dsl::societe_mission)),
             ))
             .execute(&connection)?;