From 179954ace6e09e3f94e51f5dfcd83a5e86af64c3 Mon Sep 17 00:00:00 2001
From: Martin Ratinaud <martinratinaud@gmail.com>
Date: Mon, 3 Feb 2025 16:46:06 +0400
Subject: [PATCH] Finalisation suite aux retours Github

---
 package.json                                    | 6 +++---
 scripts/data-import/adapters/etudes-en-cours.ts | 2 +-
 scripts/data-import/base.ts                     | 2 +-
 scripts/data-import/utils.ts                    | 5 ++---
 src/server/db/kysely/database.ts                | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index dec872c72..ff03c98a5 100644
--- a/package.json
+++ b/package.json
@@ -28,10 +28,10 @@
     "test": "vitest run",
     "test:watch": "vitest dev",
     "cli": "tsx scripts/cli.ts",
-    "db:migrate": "knex migrate:latest && yarn db:sync",
+    "db:migrate": "knex migrate:latest",
     "db:new": "knex migrate:make",
-    "db:revert": "knex migrate:rollback && yarn db:sync",
-    "db:revert:one": "knex migrate:down && yarn db:sync",
+    "db:revert": "knex migrate:rollback",
+    "db:revert:one": "knex migrate:down",
     "db:sync": "kysely-codegen --numeric-parser number --out-file ./src/server/db/kysely/database.ts --env-file=\"./.env.local\" --log-level=\"error\" --exclude-pattern=\"(public.spatial_ref_sys|topology.*|tiger.*|public.geography_columns|public.geometry_columns)\" && prettier --write ./src/server/db/kysely/database.ts",
     "db:verify": "yarn db:introspect --verify",
     "scalingo-postbuild": "yarn build && next-sitemap",
diff --git a/scripts/data-import/adapters/etudes-en-cours.ts b/scripts/data-import/adapters/etudes-en-cours.ts
index 61bb1b1d2..c436ed5f4 100644
--- a/scripts/data-import/adapters/etudes-en-cours.ts
+++ b/scripts/data-import/adapters/etudes-en-cours.ts
@@ -40,7 +40,7 @@ const logger = parentLogger.child({
 export default class EtudesEnCoursAdapter extends BaseAdapter {
   /**
    *
-   * @param filepath must be like in "data/sample.csv", initially taken from a Google Doc named "Extraction de DATA Cartographie - pour FCU_02122024"
+   * @param filepath must be like in "data/etudes-en-cours-sample.csv", initially taken from a Google Doc named "Extraction de DATA Cartographie - pour FCU_02122024"
    */
   async importData(filepath?: string) {
     if (!filepath) {
diff --git a/scripts/data-import/base.ts b/scripts/data-import/base.ts
index bc4eee808..4fdd72860 100644
--- a/scripts/data-import/base.ts
+++ b/scripts/data-import/base.ts
@@ -1,3 +1,3 @@
 export abstract class BaseAdapter {
-  abstract importData(filepath?: string): Promise<any>;
+  abstract importData(filepath?: string): Promise<void>;
 }
diff --git a/scripts/data-import/utils.ts b/scripts/data-import/utils.ts
index d047f9338..ccdb57348 100644
--- a/scripts/data-import/utils.ts
+++ b/scripts/data-import/utils.ts
@@ -33,8 +33,7 @@ export const loadDataFromFile = async (filepath: string, options: Parameters<typ
   if (ext === '.csv') {
     const data = await loadCsvFile(filepath, options);
     return data;
-  } else {
-    console.error('Format de fichier non pris en charge');
-    throw new Error('Format de fichier non pris en charge');
   }
+
+  throw new Error('Format de fichier non pris en charge');
 };
diff --git a/src/server/db/kysely/database.ts b/src/server/db/kysely/database.ts
index 2cc2d8df8..370b65b3e 100644
--- a/src/server/db/kysely/database.ts
+++ b/src/server/db/kysely/database.ts
@@ -3066,7 +3066,7 @@ export interface ReseauxDeFroid {
   contenu_CO2_2023_tmp: number | null;
   contenu_CO2_ACV_2023_tmp: number | null;
   CP_MO: string | null;
-  departement: number | null;
+  departement: string | null;
   fichiers: Json | null;
   geom: string | null;
   Gestionnaire: string | null;