From 4d696941ada14596f49ed0ce257a05def74efc2a Mon Sep 17 00:00:00 2001 From: Yassine R Date: Tue, 31 Jan 2023 23:16:48 +0100 Subject: [PATCH] =?UTF-8?q?fix(clean-code):=20nettoyage=20de=20fichiers=20?= =?UTF-8?q?obsol=C3=A8tes,=20traitement=20des=20alertes=20SonarCloud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _docs/dev/30.tests.md | 43 ------------------- packages/backend/Dockerfile | 2 +- .../admin-structures.controller.ts | 4 +- .../auth/guards/CanGetUserStructure.guard.ts | 1 - .../message-sms/MessageSmsTable.typeorm.ts | 2 - .../tests/buildCustomDoc.service.spec.ts | 2 +- .../src/users/users.controller.spec.ts | 3 +- packages/frontend/Dockerfile | 2 +- .../frontend/src/app/app-routing.module.ts | 8 ++-- .../modules/shared/services/auth.service.ts | 2 +- packages/portail-admins/Dockerfile | 2 +- .../_common/structure/StructurePublic.type.ts | 2 +- .../_static/politique/politique.component.css | 0 .../_static/politique/politique.component.ts | 1 - .../portail-admins/src/assets/css/main.css | 8 ---- packages/portail-usagers/Dockerfile | 2 +- .../formatInternationalPhoneNumber.pipe.ts | 6 +-- .../section-options.component.css | 0 .../section-options.component.ts | 1 - 19 files changed, 14 insertions(+), 77 deletions(-) delete mode 100644 packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.css delete mode 100644 packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.css diff --git a/_docs/dev/30.tests.md b/_docs/dev/30.tests.md index 97b998f506..03a354682e 100644 --- a/_docs/dev/30.tests.md +++ b/_docs/dev/30.tests.md @@ -51,49 +51,6 @@ DOMIFA_FILTER_SEC_TEST=Agenda ENV_FILE=tests-local npx jest -- app-controllers.s Note: il est aussi possible de filter par tags: -### Tests e2e backend - -**NOTE**: actuellement non-exécuté par la CI et non maintenu - -**TODO**: à réparer - -Restaurer les bases de test: - -```bash -_scripts/db/restore-database-docker.sh --db=test -``` - -Démarrer le backend de test (les éventuelles migrations vont être appliquées au démarrage du serveur): - -```bash -# /app/packages/backend -# démarrer le backend (branché sur les bases de test) -yarn start:tests-local -``` - -Démarrer le frontend: - -```bash -# démarrer le frontend -yarn start -``` - -Pour n'exécuter que certains tests: - -```bash -# filter by test name -npx codeceptjs run --features --debug ../../features/users/register.feature -npx codeceptjs run --features --debug ../../features/stats/stats.feature -# grep filter (run all tests with name containing "register") -npx codeceptjs run --features --debug --grep register -``` - -Pour exécuter les tests via une interface graphique: - -```bash -yarn test:open-ui -``` - ## Mettre à jour les données de test Installer la dernière version des dumps: diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile index 9423420405..c6cebd1433 100644 --- a/packages/backend/Dockerfile +++ b/packages/backend/Dockerfile @@ -1,7 +1,7 @@ # --------------------------------------------------------- # 1) BUILDER IMAGE # --------------------------------------------------------- -FROM node:16.19-bullseye as builder +FROM node:16.19-bullseye AS builder ENV TZ Europe/Paris diff --git a/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts b/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts index eec7fd4d9e..3d0cec9d0f 100644 --- a/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts +++ b/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts @@ -141,9 +141,7 @@ export class AdminStructuresController { @Get("stats") @AllowUserProfiles("super-admin-domifa") public async stats(): Promise { - const stats = - await this.adminStructuresService.getStatsDomifaAdminDashboard(); - return stats; + return await this.adminStructuresService.getStatsDomifaAdminDashboard(); } @Get("") diff --git a/packages/backend/src/auth/guards/CanGetUserStructure.guard.ts b/packages/backend/src/auth/guards/CanGetUserStructure.guard.ts index 0b2c3182d8..3958feadff 100644 --- a/packages/backend/src/auth/guards/CanGetUserStructure.guard.ts +++ b/packages/backend/src/auth/guards/CanGetUserStructure.guard.ts @@ -26,7 +26,6 @@ export class CanGetUserStructureGuard implements CanActivate { ); throw new HttpException("Invalid structureId", HttpStatus.FORBIDDEN); } - // TODO: remplacer par une jointure const chosenUserStructure = await userStructureRepository.findOne( { id: userId, diff --git a/packages/backend/src/database/entities/message-sms/MessageSmsTable.typeorm.ts b/packages/backend/src/database/entities/message-sms/MessageSmsTable.typeorm.ts index f83f221ec2..7d007a4491 100644 --- a/packages/backend/src/database/entities/message-sms/MessageSmsTable.typeorm.ts +++ b/packages/backend/src/database/entities/message-sms/MessageSmsTable.typeorm.ts @@ -15,8 +15,6 @@ export class MessageSmsTable extends AppTypeormTable implements MessageSms { - // TODO: associer un usagerUUID - // Infos usager @Column({ type: "integer" }) @Index() public usagerRef: number; diff --git a/packages/backend/src/usagers/services/custom-docs/tests/buildCustomDoc.service.spec.ts b/packages/backend/src/usagers/services/custom-docs/tests/buildCustomDoc.service.spec.ts index 9b2cdfeb20..23d157ecbc 100644 --- a/packages/backend/src/usagers/services/custom-docs/tests/buildCustomDoc.service.spec.ts +++ b/packages/backend/src/usagers/services/custom-docs/tests/buildCustomDoc.service.spec.ts @@ -1,7 +1,7 @@ import { buildCustomDoc } from ".."; import { AppTestHelper } from "../../../../util/test"; -import { STRUCTURE_MOCK } from "../../../../_common/mocks"; import { + STRUCTURE_MOCK, USAGER_REFUS_MOCK, USAGER_VALIDE_MOCK, } from "../../../../_common/mocks"; diff --git a/packages/backend/src/users/users.controller.spec.ts b/packages/backend/src/users/users.controller.spec.ts index 44b3280e22..8a07c711c5 100644 --- a/packages/backend/src/users/users.controller.spec.ts +++ b/packages/backend/src/users/users.controller.spec.ts @@ -3,9 +3,8 @@ import { HttpModule } from "@nestjs/axios"; import { MailsModule } from "../mails/mails.module"; import { StructuresModule } from "../structures/structure.module"; import { UsagersModule } from "../usagers/usagers.module"; -import { AppTestContext, AppTestHelper } from "../util/test"; +import { AppTestContext, AppTestHelper, AppTestHttpClient } from "../util/test"; import { UsersController } from "./users.controller"; -import { AppTestHttpClient } from "../util/test"; import { userMock } from "../_common/mocks"; import { TESTS_USERS_STRUCTURE } from "../_tests"; import { usersDeletor } from "./services/users-deletor.service"; diff --git a/packages/frontend/Dockerfile b/packages/frontend/Dockerfile index 0c01aef734..109049330e 100644 --- a/packages/frontend/Dockerfile +++ b/packages/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.19.0 as builder +FROM node:16.19.0 AS builder USER node # these variables are needed at build time because we produce a *static* app diff --git a/packages/frontend/src/app/app-routing.module.ts b/packages/frontend/src/app/app-routing.module.ts index 7b14e6aaba..944beae165 100644 --- a/packages/frontend/src/app/app-routing.module.ts +++ b/packages/frontend/src/app/app-routing.module.ts @@ -55,7 +55,7 @@ export const routes: Routes = [ path: "stats", }, { - canActivate: [AuthGuard], + canLoad: [AuthGuard], loadChildren: () => import("./modules/manage-usagers/manage-usagers.module").then( (m) => m.ManageUsagersModule @@ -63,7 +63,7 @@ export const routes: Routes = [ path: "manage", }, { - canActivate: [AuthGuard, FacteurGuard], + canLoad: [AuthGuard, FacteurGuard], loadChildren: () => import("./modules/import-usagers/import-usagers.module").then( (m) => m.ImportUsagersModule @@ -76,7 +76,7 @@ export const routes: Routes = [ path: "users", }, { - canActivate: [AuthGuard, FacteurGuard], + canLoad: [AuthGuard, FacteurGuard], loadChildren: () => import("./modules/usager-dossier/usager-dossier.module").then( (m) => m.UsagerDossierModule @@ -84,7 +84,7 @@ export const routes: Routes = [ path: "usager", }, { - canActivate: [AuthGuard], + canLoad: [AuthGuard], loadChildren: () => import("./modules/usager-profil/usager-profil.module").then( (m) => m.UsagerProfilModule diff --git a/packages/frontend/src/app/modules/shared/services/auth.service.ts b/packages/frontend/src/app/modules/shared/services/auth.service.ts index b7f159a43f..02258c3da0 100644 --- a/packages/frontend/src/app/modules/shared/services/auth.service.ts +++ b/packages/frontend/src/app/modules/shared/services/auth.service.ts @@ -30,7 +30,7 @@ export class AuthService { ) { this.currentUserSubject = new BehaviorSubject( localStorage.getItem("currentUser") !== null - ? JSON.parse(localStorage.getItem("currentUser") as string) + ? JSON.parse(localStorage.getItem("currentUser")) : null ); } diff --git a/packages/portail-admins/Dockerfile b/packages/portail-admins/Dockerfile index df8b9e41c1..b22f93a1bc 100644 --- a/packages/portail-admins/Dockerfile +++ b/packages/portail-admins/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.19.0 as builder +FROM node:16.19.0 AS builder USER node # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-admins/src/_common/structure/StructurePublic.type.ts b/packages/portail-admins/src/_common/structure/StructurePublic.type.ts index 3ee0f63cbf..7b7d03855a 100644 --- a/packages/portail-admins/src/_common/structure/StructurePublic.type.ts +++ b/packages/portail-admins/src/_common/structure/StructurePublic.type.ts @@ -3,7 +3,7 @@ import { StructureType, StructureAddresseCourrier } from "."; import { AppEntity } from "../_core"; export type StructurePublic = AppEntity & { - id: number; // TODO: à voir si c'est utile + id: number; adresse: string; complementAdresse: string; nom: string; diff --git a/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.css b/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.ts b/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.ts index 7043245960..e3a3ad0091 100644 --- a/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.ts +++ b/packages/portail-admins/src/app/modules/general/components/_static/politique/politique.component.ts @@ -4,7 +4,6 @@ import { Title } from "@angular/platform-browser"; @Component({ selector: "app-politique", templateUrl: "./politique.component.html", - styleUrls: ["./politique.component.css"], }) export class PolitiqueComponent implements OnInit { public constructor(private titleService: Title) {} diff --git a/packages/portail-admins/src/assets/css/main.css b/packages/portail-admins/src/assets/css/main.css index 8feedae92b..53509a543f 100644 --- a/packages/portail-admins/src/assets/css/main.css +++ b/packages/portail-admins/src/assets/css/main.css @@ -177,11 +177,3 @@ html { background-color: var(--bs-primary); width: 100%; } - -.head-page .title, -.head-page h1 { - font-style: normal; - font-weight: bold; - font-size: 1.7rem; - color: #ffffff; -} diff --git a/packages/portail-usagers/Dockerfile b/packages/portail-usagers/Dockerfile index f7641b9950..cb77071e2e 100644 --- a/packages/portail-usagers/Dockerfile +++ b/packages/portail-usagers/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.19.0 as builder +FROM node:16.19.0 AS builder USER node # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-usagers/src/app/modules/shared/pipes/formatInternationalPhoneNumber.pipe.ts b/packages/portail-usagers/src/app/modules/shared/pipes/formatInternationalPhoneNumber.pipe.ts index c32523d64e..18457596ac 100644 --- a/packages/portail-usagers/src/app/modules/shared/pipes/formatInternationalPhoneNumber.pipe.ts +++ b/packages/portail-usagers/src/app/modules/shared/pipes/formatInternationalPhoneNumber.pipe.ts @@ -16,11 +16,7 @@ export class FormatInternationalPhoneNumberPipe implements PipeTransform { telephone.numero, telephone.countryCode.toUpperCase(), ); - const internationalPhone = this.phoneUtil.format( - numero, - lpn.PhoneNumberFormat.INTERNATIONAL, - ); - return internationalPhone; + return this.phoneUtil.format(numero, lpn.PhoneNumberFormat.INTERNATIONAL); } catch (error) { console.warn(error); return "Non renseigné"; diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.css b/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.ts b/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.ts index 26d27ec167..620e880446 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.ts +++ b/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.ts @@ -8,7 +8,6 @@ import { @Component({ selector: "app-section-options", templateUrl: "./section-options.component.html", - styleUrls: ["./section-options.component.css"], }) export class SectionOptionsComponent implements OnInit { @Input() public usager!: PortailUsagerPublic;