Merge pull request #523 from mission-apprentissage/fix/lint-rework

chore: remove prettier & enforce lint
mission-apprentissage · Jan 7, 2025 · b2a7988 · b2a7988
2 parents 2b64117 + 9d70a24
commit b2a7988
Show file tree

Hide file tree

Showing 134 changed files with 2,438 additions and 2,464 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,6 +15,7 @@
   },
   "plugins": ["react", "@typescript-eslint", "simple-import-sort", "import", "@dword-design/import-alias"],
   "rules": {
+    "max-len": ["warn", { "code": 120 }],
     "simple-import-sort/imports": "error",
     "no-extra-semi": "error",
     "semi": ["error", "always"],

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,6 +70,3 @@ jobs:
 
       - name: test
         run: yarn test:ci
-
-      - name: prettier
-        run: yarn prettier:check
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -13,7 +13,6 @@
     "bierner.markdown-preview-github-styles",
     "bierner.markdown-mermaid",
     "christian-kohler.npm-intellisense",
-    "esbenp.prettier-vscode",
     "yoavbls.pretty-ts-errors",
     "pflannery.vscode-versionlens",
     "vitest.explorer",

diff --git a/docs/developpement/developpement.md b/docs/developpement/developpement.md
@@ -5,7 +5,6 @@
   - [Opérations](#opérations)
     - [Installation et Mise à jour des dépendences](#installation-et-mise-à-jour-des-dépendences)
   - [Linter](#linter)
-  - [Prettier](#prettier)
   - [Typescript](#typescript)
     - [Arrêt des services](#arrêt-des-services)
     - [Suppression des services](#suppression-des-services)
@@ -185,16 +184,6 @@ yarn lint
 
 **Note:** eslint est run automatiquement à chaque commit
 
-### Prettier
-
-Prettier est mis en place dans le projet, pour le lancer :
-
-```bash
-yarn prettier:fix
-```
-
-**Note:** eslint est run automatiquement à chaque commit
-
 ### Typescript
 
 L'application utilise TypeScript, pour vérifier que les erreurs liés au type veuillez lancer:

diff --git a/package.json b/package.json
@@ -44,8 +44,6 @@
     "seed:update": ".bin/product seed:update",
     "lint": "eslint --ignore-path .gitignore --cache --ext .js,.jsx,.ts,.tsx .",
     "lint:fix": "yarn lint --fix",
-    "prettier:fix": "prettier --write -u .",
-    "prettier:check": "prettier --check -u .",
     "release": "semantic-release",
     "release:interactive": ".bin/product release:interactive",
     "release:manual": ".bin/product release:manual",
@@ -97,26 +95,15 @@
     "exceljs": "^4.4.0",
     "lint-staged": "^15.2.10",
     "node-talisman": "^1.29.11",
-    "prettier": "^3.3.3",
     "semantic-release": "22.0.12",
     "semantic-release-slack-bot": "4.0.2",
     "typescript": "^5.6.3",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^2.0.5"
   },
-  "prettier": {
-    "printWidth": 120,
-    "bracketSpacing": true,
-    "trailingComma": "es5",
-    "arrowParens": "always"
-  },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
-      "eslint --ignore-path .gitignore --cache --fix",
-      "prettier --write -u"
-    ],
-    "*": [
-      "prettier --write -u"
+      "eslint --ignore-path .gitignore --cache --fix"
     ],
     "yarn.lock": [
       "yarn dedupe"

diff --git a/server/src/commands.ts b/server/src/commands.ts
@@ -163,7 +163,7 @@ program
   .action(async () => {
     console.log(path.join(__dirname(), "../src", "db/schema.ts"));
     exec(
-      `DATABASE_URL="${config.psql.uri}" npx kysely-codegen --schema public --out-file=${path.join(__dirname(), "../src", "db/schema.ts")} --dialect postgres && yarn prettier:fix`
+      `DATABASE_URL="${config.psql.uri}" npx kysely-codegen --schema public --out-file=${path.join(__dirname(), "../src", "db/schema.ts")} --dialect postgres`
     );
   });
 

diff --git a/server/src/modules/changelog/getChangelog/getChangelog.usecase.ts b/server/src/modules/changelog/getChangelog/getChangelog.usecase.ts
@@ -146,50 +146,50 @@ export const getChangelogFactory =
       config,
     }
   ) =>
-  async (dbId: string = deps.config.notion.dbChangelogId): Promise<Changelog> => {
-    const database = (await deps.getDatabaseRows(dbId)) as unknown as ChangelogDatabase;
-    const changelog: Changelog = [];
+    async (dbId: string = deps.config.notion.dbChangelogId): Promise<Changelog> => {
+      const database = (await deps.getDatabaseRows(dbId)) as unknown as ChangelogDatabase;
+      const changelog: Changelog = [];
 
-    database.results?.forEach((result) => {
-      const entry: Partial<ChangelogEntry> = {};
+      database.results?.forEach((result) => {
+        const entry: Partial<ChangelogEntry> = {};
 
-      entry.title = result.properties["Mise à jour"].title?.[0]?.plain_text ?? "";
+        entry.title = result.properties["Mise à jour"].title?.[0]?.plain_text ?? "";
 
-      if (!entry.title) {
-        return;
-      }
+        if (!entry.title) {
+          return;
+        }
 
-      entry.id = result.id;
+        entry.id = result.id;
 
-      entry.types =
+        entry.types =
         result.properties.Type.multi_select?.map((type) => ({
           label: type.name,
           color: type.color,
         })) ?? [];
 
-      entry.show = result.properties["A afficher"].checkbox;
-      entry.description = result.properties["Description"].rich_text?.[0]?.plain_text ?? "";
-      entry.deployed = result.properties["En Prod ?"].checkbox;
+        entry.show = result.properties["A afficher"].checkbox;
+        entry.description = result.properties["Description"].rich_text?.[0]?.plain_text ?? "";
+        entry.deployed = result.properties["En Prod ?"].checkbox;
 
-      if (result.properties.Date.type === "rich_text") {
-        entry.date = {
-          type: result.properties.Date.rich_text?.[0]?.type === "mention" ? "date" : "string",
-          value: result.properties.Date.rich_text?.[0]?.plain_text ?? "",
-        };
-      }
+        if (result.properties.Date.type === "rich_text") {
+          entry.date = {
+            type: result.properties.Date.rich_text?.[0]?.type === "mention" ? "date" : "string",
+            value: result.properties.Date.rich_text?.[0]?.plain_text ?? "",
+          };
+        }
 
-      changelog.push(entry as ChangelogEntry);
-    });
+        changelog.push(entry as ChangelogEntry);
+      });
 
-    changelog.sort((a, b) => {
-      if (a.date.type === "date" && b.date.type === "date") {
-        return new Date(b.date.value).getTime() - new Date(a.date.value).getTime();
-      }
+      changelog.sort((a, b) => {
+        if (a.date.type === "date" && b.date.type === "date") {
+          return new Date(b.date.value).getTime() - new Date(a.date.value).getTime();
+        }
 
-      return 0;
-    });
+        return 0;
+      });
 
-    return changelog;
-  };
+      return changelog;
+    };
 
 export const getChangelog = getChangelogFactory();
diff --git a/server/src/modules/core/services/notion/notion.ts b/server/src/modules/core/services/notion/notion.ts
@@ -14,12 +14,12 @@ type CallbackFunction<K extends unknown[], T> = (...args: K) => Promise<T>;
 
 const withNotionErrorHandling =
   <K extends unknown[], T>(callback: CallbackFunction<K, T>) =>
-  async (...args: K): Promise<T> => {
-    try {
-      return await callback(...args);
-    } catch (error) {
-      if (isNotionClientError(error)) {
-        switch (error.code) {
+    async (...args: K): Promise<T> => {
+      try {
+        return await callback(...args);
+      } catch (error) {
+        if (isNotionClientError(error)) {
+          switch (error.code) {
           case APIErrorCode.ObjectNotFound:
             throw Boom.notFound("Base de donnée Notion introuvable");
           case APIErrorCode.Unauthorized:
@@ -41,14 +41,14 @@ const withNotionErrorHandling =
               error: error as Error,
               ...args,
             });
+          }
         }
-      }
 
-      throw Boom.badImplementation(
-        "Erreur lors de l'appel à Notion avec les parametres suivants " + JSON.stringify(args)
-      );
-    }
-  };
+        throw Boom.badImplementation(
+          "Erreur lors de l'appel à Notion avec les parametres suivants " + JSON.stringify(args)
+        );
+      }
+    };
 
 const getDatabaseRowsFactory = (
   deps = {

diff --git a/server/src/modules/core/usecases/createUser/utils/canCreateUserInScope.ts b/server/src/modules/core/usecases/createUser/utils/canCreateUserInScope.ts
@@ -6,11 +6,11 @@ import { getScopeFilterForUser } from "@/modules/core/utils/getScopeFilterForUse
 export function canCreateUserInScope({ body, requestUser }: { body: BodySchema; requestUser: RequestUser }) {
   const { scope, scopeFilter } = getScopeFilterForUser("users/ecriture", requestUser);
   switch (scope) {
-    case "national":
-      return true;
-    case "region":
-      return body.codeRegion !== undefined && scopeFilter.includes(body.codeRegion);
-    default:
-      return false;
+  case "national":
+    return true;
+  case "region":
+    return body.codeRegion !== undefined && scopeFilter.includes(body.codeRegion);
+  default:
+    return false;
   }
 }
diff --git a/server/src/modules/core/usecases/editUser/utils/canEditUserInScope.ts b/server/src/modules/core/usecases/editUser/utils/canEditUserInScope.ts
@@ -6,11 +6,11 @@ import { getScopeFilterForUser } from "@/modules/core/utils/getScopeFilterForUse
 export function canEditUserInScope({ body, requestUser }: { body: BodySchema; requestUser: RequestUser }) {
   const { scope, scopeFilter } = getScopeFilterForUser("users/ecriture", requestUser);
   switch (scope) {
-    case "national":
-      return true;
-    case "region":
-      return body.codeRegion !== null && scopeFilter.includes(body.codeRegion);
-    default:
-      return false;
+  case "national":
+    return true;
+  case "region":
+    return body.codeRegion !== null && scopeFilter.includes(body.codeRegion);
+  default:
+    return false;
   }
 }
diff --git a/server/src/modules/core/utils/getScopeFilterForUser.ts b/server/src/modules/core/utils/getScopeFilterForUser.ts
@@ -17,17 +17,17 @@ export const getScopeFilterForUser = (permission: Permission, user: RequestUser)
     };
 
     switch (scope) {
-      case "region":
-        if (user.codeRegion) {
-          scopeWithFilter.scopeFilter = [user.codeRegion];
-        }
-        break;
-      case "national":
-      case "uai":
-      case "role":
-      default:
-        scopeWithFilter.scopeFilter = [];
-        break;
+    case "region":
+      if (user.codeRegion) {
+        scopeWithFilter.scopeFilter = [user.codeRegion];
+      }
+      break;
+    case "national":
+    case "uai":
+    case "role":
+    default:
+      scopeWithFilter.scopeFilter = [];
+      break;
     }
 
     return scopeWithFilter;

diff --git a/server/src/modules/core/utils/hasPermission.ts b/server/src/modules/core/utils/hasPermission.ts
@@ -6,11 +6,11 @@ import type { Permission } from "shared/security/permissions";
 
 export const hasPermissionHandler =
   <P extends Permission>(permission: P) =>
-  (request: FastifyRequestType, _reply: FastifyReplyType, done: HookHandlerDoneFunction) => {
-    if (!request.user) throw Boom.unauthorized();
-    if (!request.user.role) throw Boom.forbidden();
-    if (!hasPermission(request.user.role, permission)) {
-      throw Boom.forbidden();
-    }
-    done();
-  };
+    (request: FastifyRequestType, _reply: FastifyReplyType, done: HookHandlerDoneFunction) => {
+      if (!request.user) throw Boom.unauthorized();
+      if (!request.user.role) throw Boom.forbidden();
+      if (!hasPermission(request.user.role, permission)) {
+        throw Boom.forbidden();
+      }
+      done();
+    };
diff --git a/server/src/modules/corrections/usecases/getCorrections/getCorrections.usecase.ts b/server/src/modules/corrections/usecases/getCorrections/getCorrections.usecase.ts
@@ -27,30 +27,30 @@ const getCorrectionsFactory =
       getFiltersQuery,
     }
   ) =>
-  async (activeFilters: ActiveFilters) => {
-    const campagne = await deps.getCurrentCampagneQuery();
-    const anneeCampagne = activeFilters?.campagne ?? campagne.annee;
-    const [stats, { count, corrections }, filters] = await Promise.all([
-      deps.getStatsCorrectionsQuery({
-        ...activeFilters,
-        campagne: anneeCampagne,
-      }),
-      deps.getCorrectionsQuery({
-        ...activeFilters,
-        campagne: anneeCampagne,
-      }),
-      deps.getFiltersQuery({
-        ...activeFilters,
-        campagne: anneeCampagne,
-      }),
-    ]);
+    async (activeFilters: ActiveFilters) => {
+      const campagne = await deps.getCurrentCampagneQuery();
+      const anneeCampagne = activeFilters?.campagne ?? campagne.annee;
+      const [stats, { count, corrections }, filters] = await Promise.all([
+        deps.getStatsCorrectionsQuery({
+          ...activeFilters,
+          campagne: anneeCampagne,
+        }),
+        deps.getCorrectionsQuery({
+          ...activeFilters,
+          campagne: anneeCampagne,
+        }),
+        deps.getFiltersQuery({
+          ...activeFilters,
+          campagne: anneeCampagne,
+        }),
+      ]);
 
-    return {
-      corrections,
-      count,
-      stats,
-      filters,
+      return {
+        corrections,
+        count,
+        stats,
+        filters,
+      };
     };
-  };
 
 export const getCorrectionsUsecase = getCorrectionsFactory();