From 41b7d94e2e851baef5662317a5a8db56c2b3a03e Mon Sep 17 00:00:00 2001 From: Yassine R Date: Wed, 8 Nov 2023 22:16:07 +0100 Subject: [PATCH] refactor(common): add common to portail admin --- .github/workflows/unit-tests.yml | 18 +- packages/backend/package.json | 28 +- .../PortailUsagerPublic.type.ts | 10 +- .../src/_common/model/usager/Usager.type.ts | 7 +- .../model/usager/UsagerAyantDroit.type.ts | 8 - .../model/usager/UsagerDecision.type.ts | 29 - .../model/usager/UsagerTypeDom.type.ts | 1 - .../backend/src/_common/model/usager/index.ts | 3 - .../1698876391788-optimize-migration.ts | 56 -- .../1699283083901-auto-migration.ts | 25 - .../1699283951968-auto-migration.ts | 29 - .../entities/usager/UsagerTable.typeorm.ts | 12 +- .../data-anonymizer/dataUsagerAnonymizer.ts | 8 +- ...xportListeParticipantsWorksheetRenderer.ts | 9 +- .../usagersImportBuilder.service.ts | 10 +- .../usagers-decision.controller.ts | 31 +- .../backend/src/usagers/dto/decision.dto.ts | 5 +- .../cerfa/generateCerfaData.service.ts | 9 +- .../custom-docs/buildCustomDoc.service.ts | 4 +- .../generateMotifLabel.service.spec.ts | 39 - .../services/generateMotifLabel.service.ts | 39 - .../backend/src/usagers/services/index.ts | 1 - .../tests/generateMotifLabel.service.spec.ts | 40 -- .../usagerVisibleHistoryManager.service.ts | 3 +- .../src/usagers/services/usagers.service.ts | 4 +- .../generateMotifLabel.service.spec.ts | 66 ++ .../functions}/generateMotifLabel.service.ts | 8 +- packages/common/src/usager/functions/index.ts | 1 + packages/frontend/package.json | 6 +- .../src/_common/mocks/USAGER_ACTIF.mock.ts | 3 + .../src/_common/mocks/USAGER_REFUS.mock.ts | 3 +- .../src/_common/model/usager/Usager.type.ts | 7 +- .../decision/types/UsagerDecision.type.ts | 28 - .../model/usager/decision/types/index.ts | 1 - .../model/usager/rdv/UsagerRdvInfos.type.ts | 5 - .../src/_common/model/usager/rdv/index.ts | 1 - .../profil-historique-decisions.component.ts | 7 +- .../interfaces/UsagerFormModel.ts | 4 +- .../usager-shared/interfaces/decision.ts | 6 +- .../utils/generateMotifLabel.service.spec.ts | 42 -- .../app/modules/usager-shared/utils/index.ts | 1 - packages/portail-admins/Dockerfile | 9 +- packages/portail-admins/package.json | 11 +- packages/portail-usagers/Dockerfile | 9 +- packages/portail-usagers/package.json | 2 +- .../usager-account/interfaces/decision.ts | 2 +- .../generateMotifLabel.service.spec.ts | 40 -- .../interfaces/generateMotifLabel.service.ts | 22 - yarn.lock | 680 ++++++++---------- 49 files changed, 507 insertions(+), 885 deletions(-) delete mode 100644 packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts delete mode 100644 packages/backend/src/_common/model/usager/UsagerDecision.type.ts delete mode 100644 packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts delete mode 100644 packages/backend/src/_migrations/1698876391788-optimize-migration.ts delete mode 100644 packages/backend/src/_migrations/1699283083901-auto-migration.ts delete mode 100644 packages/backend/src/_migrations/1699283951968-auto-migration.ts delete mode 100644 packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts delete mode 100644 packages/backend/src/usagers/services/generateMotifLabel.service.ts delete mode 100644 packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts create mode 100644 packages/common/src/usager/functions/generateMotifLabel.service.spec.ts rename packages/{frontend/src/app/modules/usager-shared/utils => common/src/usager/functions}/generateMotifLabel.service.ts (60%) delete mode 100644 packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts delete mode 100644 packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts delete mode 100644 packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts delete mode 100644 packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.spec.ts delete mode 100644 packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ba700caefa..7c5c3ab3fa 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -111,13 +111,12 @@ jobs: - name: Set up Yarn cache uses: c-hive/gha-yarn-cache@v2 - - name: Install dependencies - run: | - yarn --immutable - - name: Install dependencies run: yarn workspaces focus @domifa/portail-usagers + - name: Build common dependencies + run: yarn workspace @domifa/common build + - name: Run "Mon DomiFa" tests run: yarn workspace @domifa/portail-usagers test --coverage --detectOpenHandles --forceExit @@ -141,15 +140,20 @@ jobs: with: node-version: "16.19" + - name: Change TimeZone + uses: szenius/set-timezone@v1.2 + with: + timezoneLinux: "Europe/Paris" + - name: Set up Yarn cache uses: c-hive/gha-yarn-cache@v2 - - name: Build common dependencies - run: yarn workspace @domifa/common build - - name: Install dependencies run: yarn workspaces focus @domifa/portail-admins + - name: Build common dependencies + run: yarn workspace @domifa/common build + - name: Run "Portail Admin" tests run: yarn workspace @domifa/portail-admins test --coverage --detectOpenHandles --forceExit diff --git a/packages/backend/package.json b/packages/backend/package.json index 7c7d405cf6..d04799d938 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -47,17 +47,17 @@ "@nestjs/terminus": "^10.0.1", "@nestjs/testing": "^10.0.5", "@ntegral/nestjs-sentry": "^4.0.0", - "@opentelemetry/api": "^1.6.0", - "@opentelemetry/core": "^1.17.0", - "@opentelemetry/instrumentation-express": "^0.33.0", - "@opentelemetry/instrumentation-http": "^0.44.0", - "@opentelemetry/instrumentation-nestjs-core": "^0.33.0", - "@opentelemetry/instrumentation-net": "^0.32.0", - "@opentelemetry/instrumentation-pg": "^0.36.0", - "@opentelemetry/sdk-node": "^0.44.0", - "@opentelemetry/semantic-conventions": "^1.17.0", - "@sentry/node": "^7.77.0", - "@sentry/opentelemetry-node": "^7.77.0", + "@opentelemetry/api": "^1.7.0", + "@opentelemetry/core": "^1.18.1", + "@opentelemetry/instrumentation-express": "^0.33.2", + "@opentelemetry/instrumentation-http": "^0.45.1", + "@opentelemetry/instrumentation-nestjs-core": "^0.33.2", + "@opentelemetry/instrumentation-net": "^0.32.2", + "@opentelemetry/instrumentation-pg": "^0.36.2", + "@opentelemetry/sdk-node": "^0.45.1", + "@opentelemetry/semantic-conventions": "^1.18.1", + "@sentry/node": "^7.79.0", + "@sentry/opentelemetry-node": "^7.79.0", "@socialgouv/streaming-file-encryption": "^1.1.0", "@types/source-map-support": "^0.5.4", "axios": "^1.4.0", @@ -83,7 +83,7 @@ "nodemailer": "^6.9.1", "nunjucks": "^3.2.3", "passport": "^0.6.0", - "passport-jwt": "^4.0.0", + "passport-jwt": "^4.0.1", "pg": "^8.7.1", "pino": "^8.7.0", "pino-pretty": "^10.0.1", @@ -102,7 +102,7 @@ "typeorm": "^0.3.17", "uuid": "^9.0.1", "xlsx": "^0.18.5", - "yup": "^0.32.9", + "yup": "^0.32.11", "yup-phone": "^1.3.2" }, "devDependencies": { @@ -149,7 +149,7 @@ "ts-jest": "^29.1.1", "ts-node": "10.9.1", "ts-node-dev": "^2.0.0", - "tsconfig-paths": "^4.0.0", + "tsconfig-paths": "^4.2.0", "typescript": "4.9.5" }, "lint-staged": { diff --git a/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts b/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts index 8838665b1d..ca4146e9bd 100644 --- a/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts +++ b/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts @@ -1,12 +1,14 @@ import { Telephone } from "./../telephone/Telephone.type"; +import { UsagerOptions } from ".."; +import { AppEntity } from "../_core"; import { + UsagerRdv, + UsagerSexe, + UsagerLastInteraction, UsagerAyantDroit, UsagerDecision, - UsagerOptions, UsagerTypeDom, -} from ".."; -import { AppEntity } from "../_core"; -import { UsagerRdv, UsagerSexe, UsagerLastInteraction } from "@domifa/common"; +} from "@domifa/common"; export type PortailUsagerPublic = AppEntity & { customRef: string; // valeur par défaut: 'ref' diff --git a/packages/backend/src/_common/model/usager/Usager.type.ts b/packages/backend/src/_common/model/usager/Usager.type.ts index 889d760005..6ae87afeaa 100644 --- a/packages/backend/src/_common/model/usager/Usager.type.ts +++ b/packages/backend/src/_common/model/usager/Usager.type.ts @@ -1,17 +1,18 @@ import { AppEntity } from "../_core/AppEntity.type"; -import { UsagerAyantDroit } from "./UsagerAyantDroit.type"; -import { UsagerDecision } from "./UsagerDecision.type"; + import { UsagerImport } from "./UsagerImport.type"; import { UsagerNote } from "./UsagerNote.type"; import { UsagerOptions } from "./options/UsagerOptions.type"; -import { UsagerTypeDom } from "./UsagerTypeDom.type"; import { Telephone } from "../telephone/Telephone.type"; import { UsagerLastInteraction, UsagerEntretien, UsagerRdv, UsagerSexe, + UsagerAyantDroit, + UsagerTypeDom, + UsagerDecision, } from "@domifa/common"; export type Usager = AppEntity & { diff --git a/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts b/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts deleted file mode 100644 index b96807aeaf..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { AyantDroiLienParent } from "@domifa/common"; - -export type UsagerAyantDroit = { - nom: string; - prenom: string; - dateNaissance: Date; - lien: AyantDroiLienParent; -}; diff --git a/packages/backend/src/_common/model/usager/UsagerDecision.type.ts b/packages/backend/src/_common/model/usager/UsagerDecision.type.ts deleted file mode 100644 index e691296319..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerDecision.type.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { - UsagerDecisionStatut, - UsagerDecisionMotif, - UsagerDecisionOrientation, -} from "@domifa/common"; -import { UsagerTypeDom } from "./UsagerTypeDom.type"; - -export type UsagerDecision = { - uuid: string; // permet d'identifier une décision en cas de suppression de l'historique - - dateDecision: Date; // Now() - - dateDebut: Date | null; - dateFin: Date | null; - - typeDom?: UsagerTypeDom; - statut: UsagerDecisionStatut; - - // Motif de refus ou radiation - motif?: UsagerDecisionMotif | null; - motifDetails?: string; - - // Orientation si refus - orientation?: UsagerDecisionOrientation; - orientationDetails?: string; - - userId: number; // UserStructure.id - userName: string; // UserStructure.nom / prenom -}; diff --git a/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts b/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts deleted file mode 100644 index 174be3cafe..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerTypeDom = "PREMIERE_DOM" | "RENOUVELLEMENT"; diff --git a/packages/backend/src/_common/model/usager/index.ts b/packages/backend/src/_common/model/usager/index.ts index 61b8fabf91..55cb037644 100644 --- a/packages/backend/src/_common/model/usager/index.ts +++ b/packages/backend/src/_common/model/usager/index.ts @@ -3,10 +3,7 @@ export * from "./cerfa"; export * from "./history"; export * from "./options"; export * from "./Usager.type"; -export * from "./UsagerAyantDroit.type"; -export * from "./UsagerDecision.type"; export * from "./UsagerDoc.type"; export * from "./UsagerImport.type"; export * from "./UsagerLight.type"; export * from "./UsagerNote.type"; -export * from "./UsagerTypeDom.type"; diff --git a/packages/backend/src/_migrations/1698876391788-optimize-migration.ts b/packages/backend/src/_migrations/1698876391788-optimize-migration.ts deleted file mode 100644 index 41e1d0cb92..0000000000 --- a/packages/backend/src/_migrations/1698876391788-optimize-migration.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { appLogger } from "../util"; -import { domifaConfig } from "../config"; - -export class OptimizeInteractionsMigration1698876391788 - implements MigrationInterface -{ - name = "OptimizeInteractionsMigration1698876391788"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - - appLogger.info("[MIGRATION] Delete deleted interactions"); - await queryRunner.query(`DELETE from interactions where event = 'delete'`); - - appLogger.info("[MIGRATION] DROP columns previousValue & event"); - await queryRunner.query( - `ALTER TABLE "interactions" DROP COLUMN "previousValue"` - ); - await queryRunner.query(`ALTER TABLE "interactions" DROP COLUMN "event"`); - - appLogger.info("[MIGRATION] Create new indexes"); - await queryRunner.query( - `CREATE INDEX "idx_structure_statut" ON "usager" ("structureId", "decision") ` - ); - await queryRunner.query( - `CREATE INDEX "idx_usagers" ON "usager" ("structureId", "ref") ` - ); - - appLogger.info("[MIGRATION] DROP useless indexes"); - await queryRunner.query( - `DROP INDEX "public"."IDX_0c5d7e9585c77ff002d4072c3c"` - ); - - await queryRunner.query( - `ALTER TABLE "interactions" DROP CONSTRAINT "FK_495b59d0dd15e43b262f2da8907"` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."idx_usagers"`); - await queryRunner.query(`DROP INDEX "public"."idx_structure_statut"`); - await queryRunner.query( - `ALTER TABLE "interactions" ADD "event" text NOT NULL DEFAULT 'create'` - ); - await queryRunner.query( - `ALTER TABLE "interactions" ADD "previousValue" jsonb` - ); - await queryRunner.query( - `CREATE INDEX "IDX_3bc72392a39f586374f0f7d577" ON "interactions" ("event") ` - ); - } -} diff --git a/packages/backend/src/_migrations/1699283083901-auto-migration.ts b/packages/backend/src/_migrations/1699283083901-auto-migration.ts deleted file mode 100644 index acd59a92af..0000000000 --- a/packages/backend/src/_migrations/1699283083901-auto-migration.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { domifaConfig } from "../config"; -import { appLogger } from "../util"; - -export class AutoMigration1699283083901 implements MigrationInterface { - name = "AutoMigration1699283083901"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - await queryRunner.query( - `CREATE INDEX "idx_interactions_type" ON "interactions" ("structureId", "usagerUUID", "type") ` - ); - await queryRunner.query( - `CREATE INDEX "idx_interactions_date" ON "interactions" ("structureId", "usagerUUID", "dateInteraction") ` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."idx_interactions_date"`); - await queryRunner.query(`DROP INDEX "public"."idx_interactions_type"`); - } -} diff --git a/packages/backend/src/_migrations/1699283951968-auto-migration.ts b/packages/backend/src/_migrations/1699283951968-auto-migration.ts deleted file mode 100644 index 07979d6c6d..0000000000 --- a/packages/backend/src/_migrations/1699283951968-auto-migration.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { domifaConfig } from "../config"; -import { appLogger } from "../util"; - -export class AutoMigration1699283951968 implements MigrationInterface { - name = "AutoMigration1699283951968"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - await queryRunner.query( - `DROP INDEX "public"."IDX_416154ec3c1e8fe5a96715b855"` - ); - await queryRunner.query( - `DROP INDEX "public"."IDX_9992157cbe54583ff7002ae4c0"` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `CREATE INDEX "IDX_9992157cbe54583ff7002ae4c0" ON "interactions" ("userId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_416154ec3c1e8fe5a96715b855" ON "interactions" ("nbCourrier") ` - ); - } -} diff --git a/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts b/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts index 17ae672958..a9b48d7e8f 100644 --- a/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts +++ b/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts @@ -9,14 +9,7 @@ import { OneToOne, Unique, } from "typeorm"; -import { - Usager, - UsagerOptions, - UsagerTypeDom, - Telephone, - UsagerAyantDroit, - UsagerDecision, -} from "../../../_common/model"; +import { Usager, UsagerOptions, Telephone } from "../../../_common/model"; import { UsagerNote } from "../../../_common/model/usager/UsagerNote.type"; import { StructureTable } from "../structure/StructureTable.typeorm"; @@ -28,6 +21,9 @@ import { UsagerRdv, UsagerSexe, UsagerLastInteraction, + UsagerTypeDom, + UsagerAyantDroit, + UsagerDecision, } from "@domifa/common"; // https://typeorm.io/#/entities/column-types-for-postgres diff --git a/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts b/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts index 8439a06898..b05a6ba99f 100644 --- a/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts +++ b/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts @@ -1,12 +1,7 @@ import { fakerFR as faker } from "@faker-js/faker"; import { appLogger } from "../../../../util"; -import { - Usager, - UsagerAyantDroit, - UsagerDecision, - UsagerOptions, -} from "../../../../_common/model"; +import { Usager, UsagerOptions } from "../../../../_common/model"; import { usagerDocsRepository, usagerEntretienRepository, @@ -16,6 +11,7 @@ import { import { usagerRepository } from "../../usager/usagerRepository.service"; import { dataGenerator } from "./dataGenerator.service"; import { dataStructureAnonymizer } from "./dataStructureAnonymizer"; +import { UsagerAyantDroit, UsagerDecision } from "@domifa/common"; export const dataUsagerAnonymizer = { anonymizeUsagers, diff --git a/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts b/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts index 896f70a60e..7503ac4d8a 100644 --- a/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts +++ b/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts @@ -1,6 +1,6 @@ import { Column, Workbook } from "exceljs"; -import { COUNTRY_CODES, UsagerDecision } from "../../../_common/model"; +import { COUNTRY_CODES } from "../../../_common/model"; import { WorksheetRenderer, xlFormater, @@ -8,8 +8,11 @@ import { XlRowModel, } from "../../xlLib"; import { StructureUsagersExportModel } from "../StructureUsagersExportModel.type"; -import { generateMotifLabel } from "./../../../usagers/services/generateMotifLabel.service"; -import { USAGER_DECISION_STATUT_LABELS } from "@domifa/common"; +import { + USAGER_DECISION_STATUT_LABELS, + UsagerDecision, + generateMotifLabel, +} from "@domifa/common"; export const exportListeParticipantsWorksheetRenderer = { renderWorksheet, diff --git a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts index 29a181c224..80db93a129 100644 --- a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts +++ b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts @@ -1,12 +1,6 @@ import { setHours } from "date-fns"; -import { - Usager, - UsagerAyantDroit, - UsagerDecision, - UserStructure, -} from "../../../../_common/model"; - +import { Usager, UserStructure } from "../../../../_common/model"; import { v4 as uuidv4 } from "uuid"; import { UsagersImportUsager } from "../step2-validate-row/schema"; @@ -14,6 +8,8 @@ import { UsagerDecisionMotif, UsagerEntretien, ETAPE_DOSSIER_COMPLET, + UsagerAyantDroit, + UsagerDecision, } from "@domifa/common"; export const usagersImportBuilder = { diff --git a/packages/backend/src/usagers/controllers/usagers-decision.controller.ts b/packages/backend/src/usagers/controllers/usagers-decision.controller.ts index a563cd3517..022da18b29 100644 --- a/packages/backend/src/usagers/controllers/usagers-decision.controller.ts +++ b/packages/backend/src/usagers/controllers/usagers-decision.controller.ts @@ -26,11 +26,7 @@ import { UserStructureAuthenticated, } from "../../_common/model"; import { CheckDuplicateUsagerRefDto, DecisionDto } from "../dto"; -import { - UsagersService, - usagerHistoryStateManager, - generateNoteForDecision, -} from "../services"; +import { UsagersService, usagerHistoryStateManager } from "../services"; import { AllowUserStructureRoles, CurrentUser, @@ -38,7 +34,13 @@ import { } from "../../auth/decorators"; import { AppUserGuard, UsagerAccessGuard } from "../../auth/guards"; import { Not } from "typeorm"; -import { ETAPE_ETAT_CIVIL, ETAPE_DECISION } from "@domifa/common"; +import { + ETAPE_ETAT_CIVIL, + ETAPE_DECISION, + USAGER_DECISION_STATUT_LABELS_PROFIL, + UsagerDecision, +} from "@domifa/common"; +import { format } from "date-fns"; @Controller("usagers-decision") @ApiTags("usagers-decision") @@ -164,7 +166,7 @@ export class UsagersDecisionController { }; const newNote: Partial = { - message: generateNoteForDecision(deletedDecision), + message: this.generateNoteForDecision(deletedDecision), usagerUUID: usager.uuid, usagerRef: usager.ref, structureId: usager.structureId, @@ -183,4 +185,19 @@ export class UsagersDecisionController { return res.status(HttpStatus.OK).json(result); } + + private generateNoteForDecision = (decision: UsagerDecision): string => { + let strDecision = `Suppression de la décision : \n ${ + USAGER_DECISION_STATUT_LABELS_PROFIL[decision.statut] + }`; + const dateDebut = format(new Date(decision.dateDebut), "dd/MM/yyyy"); + + if (decision.statut === "VALIDE") { + const dateFin = format(new Date(decision.dateFin), "dd/MM/yyyy"); + strDecision = `${strDecision} du ${dateDebut} au ${dateFin}\n`; + } else { + strDecision = `${strDecision} le ${dateDebut}\n`; + } + return strDecision; + }; } diff --git a/packages/backend/src/usagers/dto/decision.dto.ts b/packages/backend/src/usagers/dto/decision.dto.ts index 682b43d3d4..4fb4f05220 100644 --- a/packages/backend/src/usagers/dto/decision.dto.ts +++ b/packages/backend/src/usagers/dto/decision.dto.ts @@ -10,14 +10,15 @@ import { MinLength, ValidateIf, } from "class-validator"; -import { StripTagsTransform } from "../../_common/decorators"; -import { UsagerDecision } from "../../_common/model"; +import {} from "../../_common/model"; import { UsagerDecisionStatut, UsagerDecisionMotif, UsagerDecisionOrientation, + UsagerDecision, } from "@domifa/common"; +import { StripTagsTransform } from "../../_common/decorators"; export class DecisionDto implements UsagerDecision { @ApiProperty({ diff --git a/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts b/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts index b6a8aee64c..a6848fd40c 100644 --- a/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts +++ b/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts @@ -6,11 +6,14 @@ import { UserStructureAuthenticated } from "../../../_common/model"; import { DateCerfa, Usager, - UsagerAyantDroit, UsagerCerfaFields, } from "../../../_common/model/usager"; -import { generateMotifLabel } from "../generateMotifLabel.service"; -import { CerfaDocType } from "@domifa/common"; + +import { + CerfaDocType, + UsagerAyantDroit, + generateMotifLabel, +} from "@domifa/common"; import { isNil } from "lodash"; export const generateCerfaData = ( diff --git a/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts b/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts index a00d75ce3b..3d0a3a16f6 100644 --- a/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts +++ b/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts @@ -2,8 +2,6 @@ import { STRUCTURE_TYPE_LABELS } from "../../../_common/model/structure/constant import { StructureCommon, Usager } from "../../../_common/model"; import { StructureCustomDocTags } from "../../../_common/model/structure-doc/StructureCustomDocTags.type"; -import { UsagerDecision } from "../../../_common/model/usager/UsagerDecision.type"; -import { generateMotifLabel } from "../generateMotifLabel.service"; import { format } from "date-fns"; import { utcToZonedTime, zonedTimeToUtc } from "date-fns-tz"; @@ -17,6 +15,8 @@ import { ENTRETIEN_RAISON_DEMANDE, ENTRETIEN_TYPE_MENAGE, ENTRETIEN_RESIDENCE, + UsagerDecision, + generateMotifLabel, } from "@domifa/common"; export const DATE_FORMAT = { diff --git a/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts b/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts deleted file mode 100644 index 5e9f8d135f..0000000000 --- a/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { USAGER_REFUS_MOCK, USAGER_VALIDE_MOCK } from "../../_common/mocks"; -import { generateMotifLabel } from "./generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_VALIDE_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/backend/src/usagers/services/generateMotifLabel.service.ts b/packages/backend/src/usagers/services/generateMotifLabel.service.ts deleted file mode 100644 index fec0e6711d..0000000000 --- a/packages/backend/src/usagers/services/generateMotifLabel.service.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { - MOTIFS_REFUS_LABELS, - MOTIFS_RADIATION_LABELS, - USAGER_DECISION_STATUT_LABELS_PROFIL, - UsagerDecisionMotif, -} from "@domifa/common"; -import { UsagerDecision } from "../../_common/model"; -import { format } from "date-fns"; - -export const generateMotifLabel = (decision: UsagerDecision): string => { - if (!decision) { - return ""; - } - - if (decision.motif === "AUTRE") { - const motifDetails = decision.motifDetails ?? "non précisé"; - return `Autre motif: ${motifDetails}`; - } - - const motifsLabels = - decision.statut === "REFUS" ? MOTIFS_REFUS_LABELS : MOTIFS_RADIATION_LABELS; - - return motifsLabels[decision.motif as UsagerDecisionMotif] ?? ""; -}; - -export const generateNoteForDecision = (decision: UsagerDecision): string => { - let strDecision = `Suppression de la décision : \n ${ - USAGER_DECISION_STATUT_LABELS_PROFIL[decision.statut] - }`; - const dateDebut = format(new Date(decision.dateDebut), "dd/MM/yyyy"); - - if (decision.statut === "VALIDE") { - const dateFin = format(new Date(decision.dateFin), "dd/MM/yyyy"); - strDecision = `${strDecision} du ${dateDebut} au ${dateFin}\n`; - } else { - strDecision = `${strDecision} le ${dateDebut}\n`; - } - return strDecision; -}; diff --git a/packages/backend/src/usagers/services/index.ts b/packages/backend/src/usagers/services/index.ts index 3b10334300..83d482c010 100644 --- a/packages/backend/src/usagers/services/index.ts +++ b/packages/backend/src/usagers/services/index.ts @@ -1,6 +1,5 @@ // @index('./*service.ts', f => `export * from '${f.path}'`) export * from "./deleteUsagerFolder.service"; -export * from "./generateMotifLabel.service"; export * from "./usagerHistoryStateManager.service"; export * from "./usagerOptionsHistory.service"; export * from "./usagers.service"; diff --git a/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts b/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts deleted file mode 100644 index fdc897e24a..0000000000 --- a/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { USAGER_REFUS_MOCK, USAGER_VALIDE_MOCK } from "../../../_common/mocks"; - -import { generateMotifLabel } from "../generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_VALIDE_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts b/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts index d156872100..f10bec5e72 100644 --- a/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts +++ b/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts @@ -1,4 +1,5 @@ -import { Usager, UsagerDecision } from "../../_common/model"; +import { UsagerDecision } from "@domifa/common"; +import { Usager } from "../../_common/model"; export const usagerVisibleHistoryManager = { addDecisionToVisibleHistory, diff --git a/packages/backend/src/usagers/services/usagers.service.ts b/packages/backend/src/usagers/services/usagers.service.ts index ebf77aeee7..2bde49f388 100644 --- a/packages/backend/src/usagers/services/usagers.service.ts +++ b/packages/backend/src/usagers/services/usagers.service.ts @@ -8,8 +8,6 @@ import { Usager, UserStructure, UserStructureProfile, - UsagerTypeDom, - UsagerDecision, UserStructureAuthenticated, } from "../../_common/model"; import { usagerHistoryStateManager } from "./usagerHistoryStateManager.service"; @@ -25,6 +23,8 @@ import { ETAPE_DOSSIER_COMPLET, ETAPE_DECISION, ETAPE_ENTRETIEN, + UsagerTypeDom, + UsagerDecision, } from "@domifa/common"; @Injectable() diff --git a/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts b/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts new file mode 100644 index 0000000000..ced8504102 --- /dev/null +++ b/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts @@ -0,0 +1,66 @@ +import { type UsagerDecision } from "../interfaces"; +import { generateMotifLabel } from "./generateMotifLabel.service"; + +describe("generateMotifLabel", () => { + const decisionValide: UsagerDecision = { + statut: "VALIDE", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "LIEN_COMMUNE", + typeDom: "PREMIERE_DOM", + orientation: "other", + orientationDetails: "DETAILS", + motifDetails: "DETAILS", + userId: 30, + userName: "Testeur Robin", + uuid: "x", + }; + + const decisionRefus: UsagerDecision = { + statut: "REFUS", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "NON_MANIFESTATION_3_MOIS", + typeDom: "PREMIERE_DOM", + motifDetails: "", + userId: 30, + userName: "Testeur Robin", + uuid: "x", + }; + + it("generateMotifLabel ", async () => { + expect(generateMotifLabel(decisionValide)).toEqual(""); + + decisionRefus.motif = "HORS_AGREMENT"; + expect(generateMotifLabel(decisionRefus)).toEqual( + "En dehors des critères du public domicilié" + ); + + decisionRefus.motif = "LIEN_COMMUNE"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Absence de lien avec la commune" + ); + + decisionRefus.motif = "SATURATION"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Nombre maximal domiciliations atteint" + ); + + decisionRefus.motif = "AUTRE"; + decisionRefus.motifDetails = "Nombre maximal domiciliations atteint"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Autre motif: Nombre maximal domiciliations atteint" + ); + + decisionRefus.motifDetails = undefined; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Autre motif: non précisé" + ); + }); +}); diff --git a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts b/packages/common/src/usager/functions/generateMotifLabel.service.ts similarity index 60% rename from packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts rename to packages/common/src/usager/functions/generateMotifLabel.service.ts index ad33e385c9..5ffd02e708 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts +++ b/packages/common/src/usager/functions/generateMotifLabel.service.ts @@ -1,7 +1,9 @@ -import { MOTIFS_REFUS_LABELS, MOTIFS_RADIATION_LABELS } from "@domifa/common"; -import { UsagerDecision } from "../../../../_common/model"; +import { MOTIFS_REFUS_LABELS, MOTIFS_RADIATION_LABELS } from "../constants"; +import { type UsagerDecision } from "../interfaces"; -export const generateMotifLabel = (decision: UsagerDecision): string => { +export const generateMotifLabel = ( + decision: Pick +): string => { if (!decision) { return ""; } diff --git a/packages/common/src/usager/functions/index.ts b/packages/common/src/usager/functions/index.ts index 566b70a060..135cf1343c 100644 --- a/packages/common/src/usager/functions/index.ts +++ b/packages/common/src/usager/functions/index.ts @@ -1,2 +1,3 @@ // @index('./*.service.ts', f => `export * from '${f.path}'`) +export * from "./generateMotifLabel.service"; export * from "./getRdvInfos.service"; diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 8b47b3a9c4..f2c864e420 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -39,7 +39,7 @@ "@ngrx/store-devtools": "^15.4.0", "@popperjs/core": "^2.11.8", "@schematics/angular": "^15.2.10", - "@sentry/angular": "^7.77.0", + "@sentry/angular": "^7.79.0", "@swimlane/ngx-charts": "^20.4.1", "angular-user-idle": "^4.0.0", "bootstrap": "^5.2.0", @@ -54,7 +54,7 @@ "ngx-matomo-client": "^5.0.4", "rxjs": "^7.6.0", "tslib": "^2.3.0", - "validator": "^13.9.0", + "validator": "^13.11.0", "zone.js": "~0.14.0" }, "devDependencies": { @@ -70,7 +70,7 @@ "@angular/cli": "15.2.10", "@angular/compiler-cli": "^15.2.10", "@angular/language-service": "^15.2.10", - "@schematics/update": "^0.1102.18", + "@schematics/update": "^0.1102.19", "@types/file-saver": "^2.0.7", "@types/google-libphonenumber": "^7.4.30", "@types/jest": "^29.5.8", diff --git a/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts b/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts index 887dbf38c3..6787a01642 100644 --- a/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts +++ b/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts @@ -5,6 +5,7 @@ import { ETAPE_DOSSIER_COMPLET } from "@domifa/common"; export const USAGER_ACTIF_MOCK: UsagerLight = { numeroDistribution: null, decision: { + uuid: "x", statut: "VALIDE", dateDebut: new Date("2020-02-12T00:00:00.000Z"), dateDecision: new Date("2020-02-12T00:00:00.000Z"), @@ -84,6 +85,7 @@ export const USAGER_ACTIF_MOCK: UsagerLight = { etapeDemande: ETAPE_DOSSIER_COMPLET, historique: [ { + uuid: "x", statut: "VALIDE", dateDebut: new Date("2020-02-12T00:00:00.000Z"), dateDecision: new Date("2020-02-12T00:00:00.000Z"), @@ -97,6 +99,7 @@ export const USAGER_ACTIF_MOCK: UsagerLight = { userName: "Testeur Robin", }, { + uuid: "x", dateDebut: new Date("2020-12-01T10:00:24.980Z"), dateDecision: new Date("2020-12-01T10:00:24.980Z"), dateFin: new Date("2020-12-01T10:00:24.980Z"), diff --git a/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts b/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts index be98a76e70..d5116bbbd7 100644 --- a/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts +++ b/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts @@ -4,8 +4,8 @@ import { ETAPE_DOSSIER_COMPLET } from "@domifa/common"; export const USAGER_REFUS_MOCK: UsagerLight = { numeroDistribution: null, - decision: { + uuid: "x", orientationDetails: null, orientation: null, statut: "REFUS", @@ -85,6 +85,7 @@ export const USAGER_REFUS_MOCK: UsagerLight = { etapeDemande: ETAPE_DOSSIER_COMPLET, historique: [ { + uuid: "x", dateDebut: new Date("2020-12-01T10:00:24.980Z"), dateDecision: new Date("2020-12-01T10:00:24.980Z"), dateFin: new Date("2020-12-01T10:00:24.980Z"), diff --git a/packages/frontend/src/_common/model/usager/Usager.type.ts b/packages/frontend/src/_common/model/usager/Usager.type.ts index 3687380072..e6805e0fdf 100644 --- a/packages/frontend/src/_common/model/usager/Usager.type.ts +++ b/packages/frontend/src/_common/model/usager/Usager.type.ts @@ -2,14 +2,9 @@ import { AppEntity, Telephone, UsagerEcheanceInfos, - UsagerRdvInfos, } from "../../../_common/model"; import { UsagerEntretien } from "./entretien"; - -import { UsagerDecision } from "./decision/types/UsagerDecision.type"; - import { UsagerImport } from "./UsagerImport.type"; - import { UsagerNote } from "./UsagerNote.type"; import { UsagerOptions } from "./options/UsagerOptions.type"; @@ -19,6 +14,8 @@ import { UsagerSexe, UsagerTypeDom, UsagerLastInteraction, + UsagerDecision, + UsagerRdvInfos, } from "@domifa/common"; export type Usager = AppEntity & { diff --git a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts b/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts deleted file mode 100644 index 1bd9a2f4c9..0000000000 --- a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { - UsagerTypeDom, - UsagerDecisionMotif, - UsagerDecisionOrientation, - UsagerDecisionStatut, -} from "@domifa/common"; - -export type UsagerDecision = { - uuid?: string; // permet d'identifier une décision en cas de suppression de l'historique - - dateDebut: Date | null; - dateFin: Date | null; - dateDecision: Date; // Now() - - typeDom: UsagerTypeDom; - statut: UsagerDecisionStatut; - - // Motif de refus ou radiation - motif: UsagerDecisionMotif | null; - motifDetails: string | null; - - // Orientation si refus - orientation: UsagerDecisionOrientation | null; - orientationDetails: string | null; - - userId: number | null; // UserStructure.id - userName: string; // UserStructure.nom / prenom -}; diff --git a/packages/frontend/src/_common/model/usager/decision/types/index.ts b/packages/frontend/src/_common/model/usager/decision/types/index.ts index 6f85e9002a..b0e1da07f3 100644 --- a/packages/frontend/src/_common/model/usager/decision/types/index.ts +++ b/packages/frontend/src/_common/model/usager/decision/types/index.ts @@ -1,5 +1,4 @@ // @index('./*', f => `export * from '${f.path}'`) -export * from "./UsagerDecision.type"; export * from "./UsagerDecisionRadiationForm.type"; export * from "./UsagerDecisionRefusForm.type"; export * from "./UsagerDecisionValideForm"; diff --git a/packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts b/packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts deleted file mode 100644 index e7bbcccc0d..0000000000 --- a/packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type UsagerRdvInfos = { - display: boolean; - class: "danger" | "warning" | ""; - content: string; -}; diff --git a/packages/frontend/src/_common/model/usager/rdv/index.ts b/packages/frontend/src/_common/model/usager/rdv/index.ts index 9b1ab43b66..7d10963d57 100644 --- a/packages/frontend/src/_common/model/usager/rdv/index.ts +++ b/packages/frontend/src/_common/model/usager/rdv/index.ts @@ -1,3 +1,2 @@ //@index('./*', f => `export * from '${f.path}'`) export * from "./RdvForm.type"; -export * from "./UsagerRdvInfos.type"; diff --git a/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts b/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts index 17a0ab955e..179f83bdb5 100644 --- a/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts +++ b/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts @@ -1,7 +1,10 @@ import { Component, Input } from "@angular/core"; import { UsagerFormModel } from "../../../../usager-shared/interfaces"; -import { USAGER_DECISION_STATUT_LABELS_PROFIL } from "@domifa/common"; -import { UsagerDecision, UserStructure } from "../../../../../../_common/model"; +import { + USAGER_DECISION_STATUT_LABELS_PROFIL, + UsagerDecision, +} from "@domifa/common"; +import { UserStructure } from "../../../../../../_common/model"; import { UsagersFilterCriteriaSortValues } from "../../../../manage-usagers/components/usager-filter"; @Component({ diff --git a/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts b/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts index 12f5ebbe45..e3531b6092 100644 --- a/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts +++ b/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts @@ -2,9 +2,7 @@ import { CountryISO } from "ngx-intl-tel-input"; import { Entretien, Rdv, Decision, Options } from "."; import { UsagerNote, - UsagerDecision, UsagerEcheanceInfos, - UsagerRdvInfos, Telephone, UsagerLight, } from "../../../../_common/model"; @@ -19,6 +17,8 @@ import { UsagerAyantDroit, INTERACTIONS_IN, getRdvInfos, + UsagerDecision, + UsagerRdvInfos, } from "@domifa/common"; export class UsagerFormModel { diff --git a/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts b/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts index 12eeda27be..e729021902 100644 --- a/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts +++ b/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts @@ -3,13 +3,13 @@ import { UsagerTypeDom, UsagerDecisionStatut, UsagerDecisionMotif, + UsagerDecision, + generateMotifLabel, UsagerDecisionOrientation, } from "@domifa/common"; -import { UsagerDecision } from "../../../../_common/model"; -import { generateMotifLabel } from "../utils"; export class Decision implements UsagerDecision { - public uuid?: string; + public uuid: string; public dateDebut: Date | null; public dateFin: Date | null; public dateDecision: Date; diff --git a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts b/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts deleted file mode 100644 index 61263c03bd..0000000000 --- a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { - USAGER_ACTIF_MOCK, - USAGER_REFUS_MOCK, -} from "../../../../_common/mocks"; -import { generateMotifLabel } from "./generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_ACTIF_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/frontend/src/app/modules/usager-shared/utils/index.ts b/packages/frontend/src/app/modules/usager-shared/utils/index.ts index 40dd7d3858..a4c1078dd2 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/index.ts +++ b/packages/frontend/src/app/modules/usager-shared/utils/index.ts @@ -1,4 +1,3 @@ // @index('./*service.ts', f => `export * from '${f.path}'`) -export * from "./generateMotifLabel.service"; export * from "./getEcheanceInfos.service"; export * from "./getUrlUsagerProfil.service"; diff --git a/packages/portail-admins/Dockerfile b/packages/portail-admins/Dockerfile index 7aa6c75895..5151bb9fa3 100644 --- a/packages/portail-admins/Dockerfile +++ b/packages/portail-admins/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.16.1 AS builder +FROM node:18.16.1 AS deps RUN apt-get update -y && apt-get install gettext-base && rm -rf /var/lib/apt/lists/* @@ -8,6 +8,13 @@ COPY yarn.lock .yarnrc.yml ./ COPY .yarn .yarn RUN yarn fetch workspaces focus @domifa/portail-admins +FROM deps AS builder-common +COPY ./packages/common ./packages/common +RUN yarn workspace @domifa/common build + +FROM deps AS builder +COPY --from=builder-common /app/packages/common ./packages/common + COPY ./packages/portail-admins ./packages/portail-admins # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-admins/package.json b/packages/portail-admins/package.json index 9dbf46a983..aa152854f9 100644 --- a/packages/portail-admins/package.json +++ b/packages/portail-admins/package.json @@ -27,20 +27,22 @@ "@angular/platform-browser": "^15.2.10", "@angular/platform-browser-dynamic": "^15.2.10", "@angular/router": "^15.2.10", + "@domifa/common": "workspace:^", "@fortawesome/angular-fontawesome": "0.12.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@ng-bootstrap/ng-bootstrap": "^14.2.0", "@popperjs/core": "^2.11.8", - "@sentry/angular": "^7.77.0", - "@sentry/browser": "^7.77.0", - "@sentry/tracing": "^7.77.0", + "@sentry/angular": "^7.79.0", + "@sentry/browser": "^7.79.0", + "@sentry/tracing": "^7.79.0", "bootstrap": "^5.2.0", "class-validator": "^0.14.0", "date-fns": "^2.30.0", "file-saver": "^2.0.5", "redux": "^4.1.0", + "rimraf": "^5.0.5", "rxjs": "^7.6.0", "zone.js": "~0.14.0" }, @@ -57,11 +59,12 @@ "@angular/cli": "15.2.10", "@angular/compiler-cli": "^15.2.10", "@angular/language-service": "^15.2.10", - "@schematics/update": "^0.1102.18", + "@schematics/update": "^0.1102.19", "@types/d3": "^7.4.1", "@types/file-saver": "^2.0.7", "@types/jest": "^29.5.8", "@types/node": "^20.3.3", + "@types/rimraf": "^4.0.5", "@typescript-eslint/eslint-plugin": "6.10.0", "@typescript-eslint/parser": "6.10.0", "eslint": "^8.53.0", diff --git a/packages/portail-usagers/Dockerfile b/packages/portail-usagers/Dockerfile index f953e678ac..5b34438980 100644 --- a/packages/portail-usagers/Dockerfile +++ b/packages/portail-usagers/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.16.1 AS builder +FROM node:18.16.1 AS deps RUN apt-get update -y && apt-get install gettext-base && rm -rf /var/lib/apt/lists/* @@ -8,6 +8,13 @@ COPY yarn.lock .yarnrc.yml ./ COPY .yarn .yarn RUN yarn fetch workspaces focus @domifa/portail-usagers +FROM deps AS builder-common +COPY ./packages/common ./packages/common +RUN yarn workspace @domifa/common build + +FROM deps AS builder +COPY --from=builder-common /app/packages/common ./packages/common + COPY ./packages/portail-usagers ./packages/portail-usagers # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-usagers/package.json b/packages/portail-usagers/package.json index 10064e34cc..a3c638d5f5 100644 --- a/packages/portail-usagers/package.json +++ b/packages/portail-usagers/package.json @@ -33,7 +33,7 @@ "@fortawesome/free-solid-svg-icons": "^6.2.1", "@ng-bootstrap/ng-bootstrap": "^14.2.0", "@popperjs/core": "^2.11.8", - "@sentry/angular": "^7.77.0", + "@sentry/angular": "^7.79.0", "angular-user-idle": "^4.0.0", "bootstrap": "5.2.3", "date-fns": "^2.30.0", diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/decision.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/decision.ts index 90940d57cc..3719669849 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/decision.ts +++ b/packages/portail-usagers/src/app/modules/usager-account/interfaces/decision.ts @@ -5,8 +5,8 @@ import { UsagerDecisionMotif, UsagerDecisionOrientation, UsagerDecision, + generateMotifLabel, } from "@domifa/common"; -import { generateMotifLabel } from "./generateMotifLabel.service"; export class Decision implements UsagerDecision { public uuid: string; diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.spec.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.spec.ts deleted file mode 100644 index aaa50e7056..0000000000 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { USAGER_REFUS_MOCK } from "../../../../_common/mocks/USAGER_REFUS.mock"; -import { DEFAULT_USAGER } from "./../../../../_common/mocks/DEFAULT_USAGER.const"; -import { generateMotifLabel } from "./generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(DEFAULT_USAGER.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié", - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune", - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint", - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint", - ); - - USAGER_REFUS_MOCK.decision.motifDetails = ""; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé", - ); - }); -}); diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts deleted file mode 100644 index 22407a9898..0000000000 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { - MOTIFS_RADIATION_LABELS, - MOTIFS_REFUS_LABELS, - UsagerDecisionMotif, - UsagerDecision, -} from "@domifa/common"; - -export const generateMotifLabel = (decision: UsagerDecision): string => { - if (!decision) { - return ""; - } - - if (decision.motif === "AUTRE") { - const motifDetails = decision.motifDetails ?? "non précisé"; - return `Autre motif: ${motifDetails}`; - } - - const motifsLabels = - decision.statut === "REFUS" ? MOTIFS_REFUS_LABELS : MOTIFS_RADIATION_LABELS; - - return motifsLabels[decision.motif as UsagerDecisionMotif] ?? ""; -}; diff --git a/yarn.lock b/yarn.lock index d69ad2a6fc..bcbecfea89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2283,17 +2283,17 @@ __metadata: "@nestjs/terminus": ^10.0.1 "@nestjs/testing": ^10.0.5 "@ntegral/nestjs-sentry": ^4.0.0 - "@opentelemetry/api": ^1.6.0 - "@opentelemetry/core": ^1.17.0 - "@opentelemetry/instrumentation-express": ^0.33.0 - "@opentelemetry/instrumentation-http": ^0.44.0 - "@opentelemetry/instrumentation-nestjs-core": ^0.33.0 - "@opentelemetry/instrumentation-net": ^0.32.0 - "@opentelemetry/instrumentation-pg": ^0.36.0 - "@opentelemetry/sdk-node": ^0.44.0 - "@opentelemetry/semantic-conventions": ^1.17.0 - "@sentry/node": ^7.77.0 - "@sentry/opentelemetry-node": ^7.77.0 + "@opentelemetry/api": ^1.7.0 + "@opentelemetry/core": ^1.18.1 + "@opentelemetry/instrumentation-express": ^0.33.2 + "@opentelemetry/instrumentation-http": ^0.45.1 + "@opentelemetry/instrumentation-nestjs-core": ^0.33.2 + "@opentelemetry/instrumentation-net": ^0.32.2 + "@opentelemetry/instrumentation-pg": ^0.36.2 + "@opentelemetry/sdk-node": ^0.45.1 + "@opentelemetry/semantic-conventions": ^1.18.1 + "@sentry/node": ^7.79.0 + "@sentry/opentelemetry-node": ^7.79.0 "@socialgouv/eslint-config-typescript": ^1.131.0 "@socialgouv/streaming-file-encryption": ^1.1.0 "@types/bcryptjs": ^2.4.6 @@ -2354,7 +2354,7 @@ __metadata: nodemon: ^3.0.0 nunjucks: ^3.2.3 passport: ^0.6.0 - passport-jwt: ^4.0.0 + passport-jwt: ^4.0.1 pg: ^8.7.1 pino: ^8.7.0 pino-pretty: ^10.0.1 @@ -2376,12 +2376,12 @@ __metadata: ts-jest: ^29.1.1 ts-node: 10.9.1 ts-node-dev: ^2.0.0 - tsconfig-paths: ^4.0.0 + tsconfig-paths: ^4.2.0 typeorm: ^0.3.17 typescript: 4.9.5 uuid: ^9.0.1 xlsx: ^0.18.5 - yup: ^0.32.9 + yup: ^0.32.11 yup-phone: ^1.3.2 languageName: unknown linkType: soft @@ -2451,8 +2451,8 @@ __metadata: "@ngrx/store-devtools": ^15.4.0 "@popperjs/core": ^2.11.8 "@schematics/angular": ^15.2.10 - "@schematics/update": ^0.1102.18 - "@sentry/angular": ^7.77.0 + "@schematics/update": ^0.1102.19 + "@sentry/angular": ^7.79.0 "@swimlane/ngx-charts": ^20.4.1 "@types/file-saver": ^2.0.7 "@types/google-libphonenumber": ^7.4.30 @@ -2488,7 +2488,7 @@ __metadata: ts-node: ~10.9.1 tslib: ^2.3.0 typescript: 4.9.5 - validator: ^13.9.0 + validator: ^13.11.0 zone.js: ~0.14.0 languageName: unknown linkType: soft @@ -2519,20 +2519,22 @@ __metadata: "@angular/platform-browser": ^15.2.10 "@angular/platform-browser-dynamic": ^15.2.10 "@angular/router": ^15.2.10 + "@domifa/common": "workspace:^" "@fortawesome/angular-fontawesome": 0.12.1 "@fortawesome/fontawesome-svg-core": ^6.2.1 "@fortawesome/free-regular-svg-icons": ^6.2.1 "@fortawesome/free-solid-svg-icons": ^6.2.1 "@ng-bootstrap/ng-bootstrap": ^14.2.0 "@popperjs/core": ^2.11.8 - "@schematics/update": ^0.1102.18 - "@sentry/angular": ^7.77.0 - "@sentry/browser": ^7.77.0 - "@sentry/tracing": ^7.77.0 + "@schematics/update": ^0.1102.19 + "@sentry/angular": ^7.79.0 + "@sentry/browser": ^7.79.0 + "@sentry/tracing": ^7.79.0 "@types/d3": ^7.4.1 "@types/file-saver": ^2.0.7 "@types/jest": ^29.5.8 "@types/node": ^20.3.3 + "@types/rimraf": ^4.0.5 "@typescript-eslint/eslint-plugin": 6.10.0 "@typescript-eslint/parser": 6.10.0 bootstrap: ^5.2.0 @@ -2550,6 +2552,7 @@ __metadata: ng-lint-staged: ^12.0.4 prettier: 2.8.8 redux: ^4.1.0 + rimraf: ^5.0.5 rxjs: ^7.6.0 source-map-explorer: ^2.5.3 tslib: ^2.3.0 @@ -2591,7 +2594,7 @@ __metadata: "@fortawesome/free-solid-svg-icons": ^6.2.1 "@ng-bootstrap/ng-bootstrap": ^14.2.0 "@popperjs/core": ^2.11.8 - "@sentry/angular": ^7.77.0 + "@sentry/angular": ^7.79.0 "@types/google-libphonenumber": ^7.4.30 "@types/jest": ^29.5.8 "@types/node": ^20.3.3 @@ -4795,118 +4798,122 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api-logs@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/api-logs@npm:0.44.0" +"@opentelemetry/api-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/api-logs@npm:0.45.1" dependencies: "@opentelemetry/api": ^1.0.0 - checksum: 550fa16b9f9da94062fac63154f7ccaf5ad4515da7a0ad09d52c461c8e08bf88698ab819a5d2918d00e4d90cb2eb9224e9709a6ecbe8b3da021582232254d900 + checksum: cd4e9664e84ba3e166596a3c6fedf03620ea54019f5d2025e7c42b16720e4a7f5312aefa17503a7db3875aee3dfcd7d2b92b2526650372573ed0f3e72eda9c93 languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.6.0": +"@opentelemetry/api@npm:^1.0.0": version: 1.6.0 resolution: "@opentelemetry/api@npm:1.6.0" checksum: 3283b78b62a39f6568eaa050ac7045fcca747679e255874f6d2107cb8e1a3b2e10bfbf553c3e82a72500fb5fdca49dc07a5fe27fd6980debac24506cca638859 languageName: node linkType: hard -"@opentelemetry/context-async-hooks@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/context-async-hooks@npm:1.17.1" +"@opentelemetry/api@npm:^1.7.0": + version: 1.7.0 + resolution: "@opentelemetry/api@npm:1.7.0" + checksum: 2398cbe65f199c3a7050125b3ad9c835f789bb0a616665e9c7f4475a29ac8334b6a3c15f38db48d345b522180c41c00b04cc174cd0eeffba98eb4874a565fa7e + languageName: node + linkType: hard + +"@opentelemetry/context-async-hooks@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/context-async-hooks@npm:1.18.1" peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: f812d9872ab932d103c125b375351b2ee945e6cad75afe5e205ed6c90cd75dd709bb45a54d229d71ee5f4d1780a328ca15b68d9c95d9eca0c67628ffe5966206 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 6730b9780d0fa2d17c8b04aac19d3450ad4273c969bf154bc31779cf34a8b3531a489fc10633c9a9e97c33f2147d85688f27679d34af2ac92fedb38dbc4eb8b8 languageName: node linkType: hard -"@opentelemetry/core@npm:1.17.1, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.17.0, @opentelemetry/core@npm:^1.8.0": - version: 1.17.1 - resolution: "@opentelemetry/core@npm:1.17.1" +"@opentelemetry/core@npm:1.18.1, @opentelemetry/core@npm:^1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/core@npm:1.18.1" dependencies: - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 06157f4a51dd1b3c98487c0d29a927a5a0fbbc997a81b04ccc4923968424582f517969b91c4f4f19dc1718f27a97f43b0b07af1310a5c240a96c5ff14c4b5cec + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: dfb3181836ce04d2e983c0e8382e4bd0228ec42280e0a3f5330e2742903c0fb1db0efc2792479d27f928533a386f163c2e0fce2a2f45b05e66b2809d268915dc languageName: node linkType: hard -"@opentelemetry/exporter-jaeger@npm:1.17.1": +"@opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.8.0": version: 1.17.1 - resolution: "@opentelemetry/exporter-jaeger@npm:1.17.1" + resolution: "@opentelemetry/core@npm:1.17.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 "@opentelemetry/semantic-conventions": 1.17.1 - jaeger-client: ^3.15.0 peerDependencies: - "@opentelemetry/api": ^1.0.0 - checksum: f643f98ee7e7c2c6e938b808195da6595a788a458e661d3f0c80be4ce2676e1280d0ef00e818e0915a91fa49e571ddb785f3f20651b93a5600e5eb72d216faa4 + "@opentelemetry/api": ">=1.0.0 <1.7.0" + checksum: 06157f4a51dd1b3c98487c0d29a927a5a0fbbc997a81b04ccc4923968424582f517969b91c4f4f19dc1718f27a97f43b0b07af1310a5c240a96c5ff14c4b5cec languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-grpc@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-grpc@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.45.1" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-grpc-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-grpc-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 5f1bb138e3be6f3d16799cb115f0c7e6e11ab81cc38bb23f5e827529a4f845ab5d3d9dce4a177f3208d304e927a7a1649e9f3406af5958ab2d0c06b2e4a68335 + checksum: eb3d4c7983252d8e08913947bc1f802d05a6ff481d46f4adc23dc062477ce47459442f830faa0f364dc53756b4c050582203edc255b690a0f20b3a17fd65a444 languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-http@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-http@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 0b08097817d78c6dbf2ddb1d172ee0094d119bf58deb8b6ea763ebf6a342e6ccc6e280de20ef05d0f3d57f93f86a70440c80a0e99376915c0a9ac91888e4d679 + checksum: 5c330b5dca1006133c70e1f6210044c74cb8274c0619abae3e2bd201b250fd5aebbc2ac9808e8311a339905caad6c24d40390f856fb54c746e5a7d5d585cb303 languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-proto@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-proto@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 - "@opentelemetry/otlp-proto-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 + "@opentelemetry/otlp-proto-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: d00334dcf1ae5c15a02b3e5692c365ff55d21c82b8e3c663c8440887e9d030d14708d8cf2e6cd2f73eaa3f9bde7a843212e10ce14e03b322eeed49b83cf89429 + checksum: fba882926af88c66bfcc51296ad4b4244daebbbe87506b8f0a72c638a49c39224c8824da98f2d5c2d656edca3e679874a8987d52abce992f53312e80eb11dcd2 languageName: node linkType: hard -"@opentelemetry/exporter-zipkin@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/exporter-zipkin@npm:1.17.1" +"@opentelemetry/exporter-zipkin@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/exporter-zipkin@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: f9b9f4c07628be912090db2b7e497a852523a6f5a333f5954b3c72c03b24f12ed32f6e7f2ccbfeb45828248a4d9405c898a140f610a95eb351e885de88874684 + checksum: d52ed77698df53ac08c97d1dc545bcbee09bf2af30d53eb591ee8dff0c7cd3113126712ccf8500b8da6575b20e202189efd69c719e4583c2915a7c9e7d8aedcc languageName: node linkType: hard -"@opentelemetry/instrumentation-express@npm:^0.33.0": +"@opentelemetry/instrumentation-express@npm:^0.33.2": version: 0.33.2 resolution: "@opentelemetry/instrumentation-express@npm:0.33.2" dependencies: @@ -4920,21 +4927,21 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-http@npm:^0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/instrumentation-http@npm:0.44.0" +"@opentelemetry/instrumentation-http@npm:^0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/instrumentation-http@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/instrumentation": 0.44.0 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/instrumentation": 0.45.1 + "@opentelemetry/semantic-conventions": 1.18.1 semver: ^7.5.2 peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 1baadaa0be299d44705cc9727dbdd8ebbdab21b5955dac4a103d5aa9452f0c3decca1d655f99e4df9202ef8bc16009b7cb05d030865775c56b6d8c9d343eec53 + checksum: 059a975c82025efa9f73bdfa73cca0f67fae3e832140b5e20d1e237668ea8b017b1685297ec730cd87c898b951402efd05acac27b81d4f3366b6f391efda8f64 languageName: node linkType: hard -"@opentelemetry/instrumentation-nestjs-core@npm:^0.33.0": +"@opentelemetry/instrumentation-nestjs-core@npm:^0.33.2": version: 0.33.2 resolution: "@opentelemetry/instrumentation-nestjs-core@npm:0.33.2" dependencies: @@ -4946,7 +4953,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-net@npm:^0.32.0": +"@opentelemetry/instrumentation-net@npm:^0.32.2": version: 0.32.2 resolution: "@opentelemetry/instrumentation-net@npm:0.32.2" dependencies: @@ -4958,7 +4965,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-pg@npm:^0.36.0": +"@opentelemetry/instrumentation-pg@npm:^0.36.2": version: 0.36.2 resolution: "@opentelemetry/instrumentation-pg@npm:0.36.2" dependencies: @@ -4974,7 +4981,22 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation@npm:0.44.0, @opentelemetry/instrumentation@npm:^0.44.0": +"@opentelemetry/instrumentation@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/instrumentation@npm:0.45.1" + dependencies: + "@types/shimmer": ^1.0.2 + import-in-the-middle: 1.4.2 + require-in-the-middle: ^7.1.1 + semver: ^7.5.2 + shimmer: ^1.2.1 + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 4692d93f9bdb82c9e8c9facc45ef1a3affdcaf7e062edd261239e88486bacfa979ecadcdda0581a2275ddd2b04e457385536a2c80aa9d10cab72f6b8c5940cbd + languageName: node + linkType: hard + +"@opentelemetry/instrumentation@npm:^0.44.0": version: 0.44.0 resolution: "@opentelemetry/instrumentation@npm:0.44.0" dependencies: @@ -4989,180 +5011,186 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/otlp-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-exporter-base@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: e9dd8b4ccc93728bf898d434303a74020d0e71ce15116a2e8d30259a0d4769a475b33a521c63f3db33de0b4338d141b49e7aa7b0414242b45ea5614d88481199 + checksum: f5ea31d0af18ce936fdc4bfdf45f013bf532aaf05e2d7f214ff89b33b5de41ee953ee3565f0d66159ef39e8bd9655e3fc4a325a15580b92ac5fdeafd6835b925 languageName: node linkType: hard -"@opentelemetry/otlp-grpc-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-grpc-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.45.1" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 protobufjs: ^7.2.3 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: cd79e0c6029118478d4e2f42c00ac06d2a6ebbada232ab8cda74d037aa90e6d2f6875ed9b6c275b54ec6395388871196538f4827d66ac279f2edc2a6829690b6 + checksum: 1a1b5878c510b3de82ec5b0e02fe66a600cfdfb664ed9ca80cb47873eb783f25d68c0d9d5f86380fed783d52f3d5949a01e65e8bc38410d0d2a92a8365b75c41 languageName: node linkType: hard -"@opentelemetry/otlp-proto-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-proto-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-proto-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-proto-exporter-base@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 protobufjs: ^7.2.3 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: b2f78b276d484bfaddaaade11ed65a10edb082a52daa8cf0406f92cbcd7d245e86f3dde0d3992589bb64f5c8245d3da1b84b355eac4fd642ab6f391f1d108713 + checksum: 9d025252a8a13e9f97fe69d5e8952458cc46665b20ce80f6add69d3d6edb67a4c7e10b454057adb4d4b81442af249fd999dac95cf8001e83a8c52b46820e9679 languageName: node linkType: hard -"@opentelemetry/otlp-transformer@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-transformer@npm:0.44.0" +"@opentelemetry/otlp-transformer@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-transformer@npm:0.45.1" dependencies: - "@opentelemetry/api-logs": 0.44.0 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-logs": 0.44.0 - "@opentelemetry/sdk-metrics": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/api-logs": 0.45.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-logs": 0.45.1 + "@opentelemetry/sdk-metrics": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 74f826f9d33eb8de72c8e698d9d5e680936e09b63e26ffa5e080f455bf070a08fd6d0768bdb9e7e43a352d0ef8fd90183193ea85e8498005734005e75d8d232a + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 0df899070aa73c2d65b851f27ecfa5cd01c30a0055ea9ce98945071bcc24e9e2ab5185e5f35d30e7b293649246d1b0403b39bb9787ce30fd88ea596d73e476b1 languageName: node linkType: hard -"@opentelemetry/propagator-b3@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/propagator-b3@npm:1.17.1" +"@opentelemetry/propagator-b3@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/propagator-b3@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 1d6ec934ae4b1820f1568f80aae6973ecb84217078056646bf0bce562158841f64a5377b13267f4b14ee4c27398e03cc69f3f89db709408f56c7ef0597662dbf + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 4592a3969446c22d42fbcac351f0a305f7f91a1ef1a43f3b93531ea12bf9089dc51ccbc290b431162e7a690cc75bba157c7886ef4b0db74210344d0ea1bce271 languageName: node linkType: hard -"@opentelemetry/propagator-jaeger@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/propagator-jaeger@npm:1.17.1" +"@opentelemetry/propagator-jaeger@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/propagator-jaeger@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 95a9b830512296229a7bcc1da4dbf7b7cf6b942cf6c1448974c94724249e29ffbc8f26c7c179117a303c8c1c557d683006d49df61ebbf5d29332c9d15f498907 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: bae4ec3c03e7a90c916667bebe10a9ea7fa33250592c8b0b2f4872af29541d3085f71d6274b67c98007b9f39cfee40c9361557ffcdf931644e2d65ddc6b7ce5d languageName: node linkType: hard -"@opentelemetry/resources@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/resources@npm:1.17.1" +"@opentelemetry/resources@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/resources@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: ea4ec5568f5b67626be6eb2b975614d140dab4f6eb7ca73ee30d0f1957ef9779953956d1d44c35bb124c75e311b34a05e2036b32fcf31cf50ae983154df9ee3d + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: b3311734802dca77eb379331ae7c409867ffe82cf17bca0e362de49e2d28313441a0177f62fc8c6c1f605bfc82c50e80ac065f17d81fc4fa131afff146db6432 languageName: node linkType: hard -"@opentelemetry/sdk-logs@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/sdk-logs@npm:0.44.0" +"@opentelemetry/sdk-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/sdk-logs@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.4.0 <1.7.0" + "@opentelemetry/api": ">=1.4.0 <1.8.0" "@opentelemetry/api-logs": ">=0.39.1" - checksum: 627dec80cd1d6c8836235c8f1f1c912f2322883c5855918f16b36cbc22d58f46ca408f3fa9ff826b534a3a0baa03c780258c60703bf3373e3857a38addeba892 + checksum: c0db4a8f6b93a451c628ca51a2d3c1970441e22ba5a4e24d05c0b53a849df690556c9d9e80c4f42c8fa876fe1b9c17fb0d0a20ca641902ace3ae0be3e5185f66 languageName: node linkType: hard -"@opentelemetry/sdk-metrics@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-metrics@npm:1.17.1" +"@opentelemetry/sdk-metrics@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-metrics@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 lodash.merge: ^4.6.2 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 6f6a59c5f594ebfc75da7ba203cb35a9271f4536ed4c2499c83f5953b3a2486d306d7aa17f0d7c2fde0efb8cbe9ac4346988adab0e039d082ec95d8d32703509 + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: ed2b87ea6380adc04bf50955cf7ae65220c6f35292b7d0535562c2e83d8b672306103c48fd45f3cc03ab3d640a8d2c6e367b265f5f4b0cbe03b0f51eb85759c7 languageName: node linkType: hard -"@opentelemetry/sdk-node@npm:^0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/sdk-node@npm:0.44.0" - dependencies: - "@opentelemetry/api-logs": 0.44.0 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/exporter-jaeger": 1.17.1 - "@opentelemetry/exporter-trace-otlp-grpc": 0.44.0 - "@opentelemetry/exporter-trace-otlp-http": 0.44.0 - "@opentelemetry/exporter-trace-otlp-proto": 0.44.0 - "@opentelemetry/exporter-zipkin": 1.17.1 - "@opentelemetry/instrumentation": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-logs": 0.44.0 - "@opentelemetry/sdk-metrics": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 - "@opentelemetry/sdk-trace-node": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 +"@opentelemetry/sdk-node@npm:^0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/sdk-node@npm:0.45.1" + dependencies: + "@opentelemetry/api-logs": 0.45.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/exporter-trace-otlp-grpc": 0.45.1 + "@opentelemetry/exporter-trace-otlp-http": 0.45.1 + "@opentelemetry/exporter-trace-otlp-proto": 0.45.1 + "@opentelemetry/exporter-zipkin": 1.18.1 + "@opentelemetry/instrumentation": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-logs": 0.45.1 + "@opentelemetry/sdk-metrics": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 + "@opentelemetry/sdk-trace-node": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 000c6339d0eb4fc8cc22f0b9822d7b778714bdfe476fdeeb4f55fbc429f9ff099b9d2c39f6fc1ef11779629798c72f8da8e6ad6e30f7e3f479fede874e064453 + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 7554f149356988107c28ad418a6ef80b1196840442003fa05e862b77b8e1649a2a8121f9e5bd7ed3c05a844081ed60c4fba68f08632d814bcae838831dc1ed0a languageName: node linkType: hard -"@opentelemetry/sdk-trace-base@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-trace-base@npm:1.17.1" +"@opentelemetry/sdk-trace-base@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-trace-base@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 1400666e673f003f3daceb8d2c55d099b6a2b7c4fa419b844a0fc9df0acb8835ce8dd35df27c180a806397fc01d5182d2f9ae114979f21ddb87afb73ddcab22e + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 44215b359675e0565b4cf7a1922c7f757873a0715f42f3058ed575e3c664e6baa17f683626ed2866e6db3fa10580270aa8a9a19d3213a2ae211db2945eb40d49 languageName: node linkType: hard -"@opentelemetry/sdk-trace-node@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-trace-node@npm:1.17.1" +"@opentelemetry/sdk-trace-node@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-trace-node@npm:1.18.1" dependencies: - "@opentelemetry/context-async-hooks": 1.17.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/propagator-b3": 1.17.1 - "@opentelemetry/propagator-jaeger": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/context-async-hooks": 1.18.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/propagator-b3": 1.18.1 + "@opentelemetry/propagator-jaeger": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 semver: ^7.5.2 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 5f7b46e8deb189c70460e1a4b8dce7f67748a976bce22138bbc7272de60a89bf358c93cb249ee9e391d4257a8c23411fa5e89b7f171174705d6094c489f9e160 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 70117de52581966a29a6c679d2f1dcdfb8df9c4078267b62e84259856227f2690b2ff7a4c84a0575725d2beef5f0ea827a673b238272e825856957dd9ddb99bc languageName: node linkType: hard -"@opentelemetry/semantic-conventions@npm:1.17.1, @opentelemetry/semantic-conventions@npm:^1.0.0, @opentelemetry/semantic-conventions@npm:^1.17.0": +"@opentelemetry/semantic-conventions@npm:1.17.1, @opentelemetry/semantic-conventions@npm:^1.0.0": version: 1.17.1 resolution: "@opentelemetry/semantic-conventions@npm:1.17.1" checksum: 16161f70526d2abcd37a39771229ffe01a25d569f76c86e97200dc20399e7fa87b231c557a9654629b4789e945350e4fc55f88df979a502911f1dde4643ad416 languageName: node linkType: hard +"@opentelemetry/semantic-conventions@npm:1.18.1, @opentelemetry/semantic-conventions@npm:^1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/semantic-conventions@npm:1.18.1" + checksum: b60c008c01067c0e8f130ab5d61f5207c85b6db08fa926f629c854ab9917ca93fbabd7ae8d1586f9f82e3b29706b0444ded9d6781f7fb7a003eeb27d89af468f + languageName: node + linkType: hard + "@opentelemetry/sql-common@npm:^0.40.0": version: 0.40.0 resolution: "@opentelemetry/sql-common@npm:0.40.0" @@ -5304,7 +5332,7 @@ __metadata: languageName: node linkType: hard -"@schematics/update@npm:^0.1102.18": +"@schematics/update@npm:^0.1102.19": version: 0.1102.19 resolution: "@schematics/update@npm:0.1102.19" dependencies: @@ -5340,120 +5368,120 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/tracing@npm:7.77.0": - version: 7.77.0 - resolution: "@sentry-internal/tracing@npm:7.77.0" +"@sentry-internal/tracing@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry-internal/tracing@npm:7.79.0" dependencies: - "@sentry/core": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 - checksum: dc6162db6d426212440abd66f9e37a4ce1849a79dd067158091702b273f3312ea131984c7aad58708745340b2a0ddb652b898c27dbf409d8691dbd4ee8a9ebde + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 3598935354428621caaf47d144de18e44a6e05de897b26cee3acf7fbd1b68cf439242b2714ee6f7c638bbccece2b87587e7999b095ee1278e58d7cfb58b44c77 languageName: node linkType: hard -"@sentry/angular@npm:^7.77.0": - version: 7.77.0 - resolution: "@sentry/angular@npm:7.77.0" +"@sentry/angular@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/angular@npm:7.79.0" dependencies: - "@sentry/browser": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 + "@sentry/browser": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 tslib: ^2.4.1 peerDependencies: "@angular/common": ">= 10.x <= 15.x" "@angular/core": ">= 10.x <= 15.x" "@angular/router": ">= 10.x <= 15.x" rxjs: ^6.5.5 || ^7.x - checksum: a2a29758d85f93967b9774de9864be9a3be2cfdefd496d6e0afe19fb5a0293727a56c6f432adf3bd83a72c9e58ea370ff82ca9b9d24445644089947e062b1340 + checksum: 6be8522ec00e29c7eb121b58dd914558868443c1276c2f9577d310e877836d2e0fa071719624dac87e904250e63456e66f0c0de969b09348a702ff37204d4da7 languageName: node linkType: hard -"@sentry/browser@npm:7.77.0, @sentry/browser@npm:^7.77.0": - version: 7.77.0 - resolution: "@sentry/browser@npm:7.77.0" +"@sentry/browser@npm:7.79.0, @sentry/browser@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/browser@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.77.0 - "@sentry/core": 7.77.0 - "@sentry/replay": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 - checksum: b3c4ecbf27e8d940c42bc151fc39e9e3659889c0091e69a39f3b8f0e316caa9cdd17aa2c00b151ff9976eff459f023e69cb51f8efa96a840191afd4091cc7573 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/replay": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 5c3aaf5e92431c66d431e576ff300bed0e6a122cc5d3dece2b7ade2bb02ddfa34c26b59e2b5d88aa189b53f0ad158b271dc01c09e8f7a29ad0c54c9154150a46 languageName: node linkType: hard -"@sentry/core@npm:7.77.0": - version: 7.77.0 - resolution: "@sentry/core@npm:7.77.0" +"@sentry/core@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/core@npm:7.79.0" dependencies: - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 - checksum: f76e83ba5da4710b87b5e03f747ac5b5f93c93814447d29e1863b6bd3734d87f3a8fb197060a9a8370430d1d47b5c8c33dc86acc7f7b212322630e280435c6d8 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 807ac5154088c1e134b7452224badbb82385d7d473df11991f4f307778ff4ea2cffd1c51e1cedaef135035b5ab892d6b421a8925ed5094b87df1957f4bc8fc57 languageName: node linkType: hard -"@sentry/node@npm:^7.77.0": - version: 7.77.0 - resolution: "@sentry/node@npm:7.77.0" +"@sentry/node@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/node@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.77.0 - "@sentry/core": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 https-proxy-agent: ^5.0.0 - checksum: 11034db59a547f3b35208f601fa4704dc7ef6e1f9730136562c1764de8f7b286b355b701711febb44b972ed7009b3467c21ffda15f07024f7dee36979ca9e1c1 + checksum: 5aeb98b46df32c93d49196a14f190860db57cf6db53864102ea5efda422f50256248413d62a2ff20fb25c784f24afcc6799247761802ea3049e89d9f88c9e999 languageName: node linkType: hard -"@sentry/opentelemetry-node@npm:^7.77.0": - version: 7.77.0 - resolution: "@sentry/opentelemetry-node@npm:7.77.0" +"@sentry/opentelemetry-node@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/opentelemetry-node@npm:7.79.0" dependencies: - "@sentry/core": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 peerDependencies: "@opentelemetry/api": 1.x "@opentelemetry/core": 1.x "@opentelemetry/sdk-trace-base": 1.x "@opentelemetry/semantic-conventions": 1.x - checksum: 19c5177755229f1252f72a283ddbd9431442d57f073a92cefedb67e9e5aa3c022e0de02a604b7e81cbc47cc37cab6ca1388947e73236f544fe0a87f8ea9de113 + checksum: 38c2b680e4072a4d670ae22f36db8347e1b4100132ca985a744c4c3775a09dbdda00400a67559ce918e1b0bedad5d82e7cc0dc92726a751b116c55b97665b563 languageName: node linkType: hard -"@sentry/replay@npm:7.77.0": - version: 7.77.0 - resolution: "@sentry/replay@npm:7.77.0" +"@sentry/replay@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/replay@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.77.0 - "@sentry/core": 7.77.0 - "@sentry/types": 7.77.0 - "@sentry/utils": 7.77.0 - checksum: 95bbd554a33a17273501fffadd7a51050787ef5a0ec26de5cccba35f6bfd5d88b2c13f735beaf74274cdb5f77d3a310fa2699d9629220de4b79e4d4c27a14e20 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 3a4f823061fdc4ca5286787ca01d7ba66dbf070a6d544d25460a1c62a2268a2212fac7be71a71d65610216f8fbd73ccaf9429c44ecabc79636dbd1ce8bbf79dc languageName: node linkType: hard -"@sentry/tracing@npm:^7.77.0": - version: 7.77.0 - resolution: "@sentry/tracing@npm:7.77.0" +"@sentry/tracing@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/tracing@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.77.0 - checksum: 7d4dfdd6b65484c0d978b9a14fa4423e5b4c80fbc8f49a5541a54894c36475cbd21cee9bba1c79120d790b957fef12627c4697e10f63a91c4eefe09faee63f84 + "@sentry-internal/tracing": 7.79.0 + checksum: 1f2574b8e23a19243c00b752a766531e3acddca679a3df2af6a9b47d3aa3f159f049cece5e82d933c84579faf72217f3d357d747dd6daa98829abadbc45ea7b6 languageName: node linkType: hard -"@sentry/types@npm:7.77.0": - version: 7.77.0 - resolution: "@sentry/types@npm:7.77.0" - checksum: ff8047425d4b0caae9221a9fa52fa0122ddf23b51152b7d71914f6465cf72dc3fdf00b7db16e3e95b4a1d2d429824d91ed586b1abac6d5286bd7800504e30824 +"@sentry/types@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/types@npm:7.79.0" + checksum: a68ff2af32e8ff29ac132b609b101093a121597dd6a5a24a02065e36f0e99a35d79f37a8ba4945f3b313927a01dfe3fdf8182729af306171dbe1e3c01e8911f9 languageName: node linkType: hard -"@sentry/utils@npm:7.77.0": - version: 7.77.0 - resolution: "@sentry/utils@npm:7.77.0" +"@sentry/utils@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/utils@npm:7.79.0" dependencies: - "@sentry/types": 7.77.0 - checksum: 000bb1caec44812dc39a8026ecba78c14a8332f15cb78d2935c91a7ba8d61eab9553a791a4af528a113ca90b83db6e81791e3562b2559b76596accc69e4d57ad + "@sentry/types": 7.79.0 + checksum: e91dfa4cd836fca680c0c3153542a728e6a2fe287aa5816688c1a6cf1c18b213868f60587af6a9089677d69d1b0914f6cf6e8a3636ad45ca91f84747894bf028 languageName: node linkType: hard @@ -6331,7 +6359,14 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:*, @types/luxon@npm:~3.3.0": +"@types/luxon@npm:*": + version: 3.3.4 + resolution: "@types/luxon@npm:3.3.4" + checksum: aa4862bd62d748e7966f9a0ec76058e9d74397ee426c7d64f61c677d83de0303c303cc78515001833df3f4ad16c95f572b0e2ffaee6e55bc50b80857e8437f3a + languageName: node + linkType: hard + +"@types/luxon@npm:~3.3.0": version: 3.3.3 resolution: "@types/luxon@npm:3.3.3" checksum: 072dd39eea3f63453788fab2fcfc83eb33917afcaffe178ce08ecd8b016824b8ab3bfa991f66266f2fc1927768a56b4334945f2eb1d83638e325c0c43d7d0e86 @@ -7703,13 +7738,6 @@ __metadata: languageName: node linkType: hard -"ansi-color@npm:^0.2.1": - version: 0.2.1 - resolution: "ansi-color@npm:0.2.1" - checksum: f3b809a91db1b2ec869a3bf5c0af13a4a8fa971d69a3404852b09d27e7789e1ca885ecd61d7c36f446d9c9f04980393ee099f9d02223d588a0dae19be033c4f3 - languageName: node - linkType: hard - "ansi-colors@npm:4.1.3, ansi-colors@npm:^4.1.1": version: 4.1.3 resolution: "ansi-colors@npm:4.1.3" @@ -8741,18 +8769,6 @@ __metadata: languageName: node linkType: hard -"bufrw@npm:^1.2.1": - version: 1.3.0 - resolution: "bufrw@npm:1.3.0" - dependencies: - ansi-color: ^0.2.1 - error: ^7.0.0 - hexer: ^1.5.0 - xtend: ^4.0.0 - checksum: e0cdfae2d1f4c0a2ffdc4e352ce3dbd547c4683c76072d48b98322945c318cbb0b6c2ccb5719d7de14abbe2076d68796f7d905b9b2c859fa29259fe66894b6c6 - languageName: node - linkType: hard - "builtins@npm:^1.0.3": version: 1.0.3 resolution: "builtins@npm:1.0.3" @@ -11180,25 +11196,6 @@ __metadata: languageName: node linkType: hard -"error@npm:7.0.2": - version: 7.0.2 - resolution: "error@npm:7.0.2" - dependencies: - string-template: ~0.2.1 - xtend: ~4.0.0 - checksum: 407ff5faa73f5da3424a81d0160a1d3c6b5144e87cb1266334e7a4c2c7a69ae653e1b544032d7dbd8b210006858eea909ea0f46694b0484cd7555ba3086be0a8 - languageName: node - linkType: hard - -"error@npm:^7.0.0": - version: 7.2.1 - resolution: "error@npm:7.2.1" - dependencies: - string-template: ~0.2.1 - checksum: 9c790d20a386947acfeabb0d1c39173efe8e5a38cb732b5f06c11a25c23ce8ac4dafbb7aa240565e034580a49aba0703e743d0274c6228500ddf947a1b998568 - languageName: node - linkType: hard - "es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": version: 1.22.1 resolution: "es-abstract@npm:1.22.1" @@ -13651,20 +13648,6 @@ __metadata: languageName: node linkType: hard -"hexer@npm:^1.5.0": - version: 1.5.0 - resolution: "hexer@npm:1.5.0" - dependencies: - ansi-color: ^0.2.1 - minimist: ^1.1.0 - process: ^0.10.0 - xtend: ^4.0.0 - bin: - hexer: ./cli.js - checksum: 2e7a919da953ae7bc8ee3d88b01615fd640a71f65cfaa8e7f0775f44ebbd06fe9d3b901a582c155a518537282dd231f5ca2f8523a5e7b84defc0b07f16854c22 - languageName: node - linkType: hard - "hexoid@npm:^1.0.0": version: 1.0.0 resolution: "hexoid@npm:1.0.0" @@ -14947,19 +14930,6 @@ __metadata: languageName: node linkType: hard -"jaeger-client@npm:^3.15.0": - version: 3.19.0 - resolution: "jaeger-client@npm:3.19.0" - dependencies: - node-int64: ^0.4.0 - opentracing: ^0.14.4 - thriftrw: ^3.5.0 - uuid: ^8.3.2 - xorshift: ^1.1.1 - checksum: fcdc0523b70299c0db1c07e6c209fa170cef75aa3ad00e6241c906423ba07dc6112a60e1b96de59c2a8eb9d335bf0a0c2a23cc13595ef24aededca2fdff65837 - languageName: node - linkType: hard - "jake@npm:^10.8.5": version: 10.8.5 resolution: "jake@npm:10.8.5" @@ -16513,13 +16483,6 @@ __metadata: languageName: node linkType: hard -"long@npm:^2.4.0": - version: 2.4.0 - resolution: "long@npm:2.4.0" - checksum: e24fd5e14be90ba6ec3faa43b3b0f1c4ac88bfdc52471d90f63e173572f6db27c45873e847f8af58283ca3140eb42d7ba11708102f3cc0956793b03305c737e0 - languageName: node - linkType: hard - "long@npm:^4.0.0": version: 4.0.0 resolution: "long@npm:4.0.0" @@ -17056,7 +17019,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 @@ -18473,13 +18436,6 @@ __metadata: languageName: node linkType: hard -"opentracing@npm:^0.14.4": - version: 0.14.7 - resolution: "opentracing@npm:0.14.7" - checksum: 5f7e44439062d056a2a72ac89eff463c9cf5659a2aea230ff7f5a226c5e960c195ce04ec2e2cc590140bbb9c5d2be11a5a50a23484cbe2d0e132af4309d4c904 - languageName: node - linkType: hard - "option@npm:~0.2.1": version: 0.2.4 resolution: "option@npm:0.2.4" @@ -19022,7 +18978,7 @@ __metadata: languageName: node linkType: hard -"passport-jwt@npm:^4.0.0": +"passport-jwt@npm:^4.0.1": version: 4.0.1 resolution: "passport-jwt@npm:4.0.1" dependencies: @@ -19726,13 +19682,6 @@ __metadata: languageName: node linkType: hard -"process@npm:^0.10.0": - version: 0.10.1 - resolution: "process@npm:0.10.1" - checksum: bdaaa28a8edf96d5daa0f5c1faf4adfedce512ebca829a82e846d991492780c34eb934decf4fa5b311c698881d07a8d4592b4d7ea53ec03d51580a2f364d3e30 - languageName: node - linkType: hard - "process@npm:^0.11.10": version: 0.11.10 resolution: "process@npm:0.11.10" @@ -21957,13 +21906,6 @@ __metadata: languageName: node linkType: hard -"string-template@npm:~0.2.1": - version: 0.2.1 - resolution: "string-template@npm:0.2.1" - checksum: 042cdcf4d4832378f12fbf45b42f479990f330cc409e6dc184838801efbc8352ccf9428fe169f8f8cfff2b864879d4ba1ef8b5f41d63d1d71844c48005a1683f - languageName: node - linkType: hard - "string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -22578,19 +22520,6 @@ __metadata: languageName: node linkType: hard -"thriftrw@npm:^3.5.0": - version: 3.11.4 - resolution: "thriftrw@npm:3.11.4" - dependencies: - bufrw: ^1.2.1 - error: 7.0.2 - long: ^2.4.0 - bin: - thrift2json: thrift2json.js - checksum: 8ed1be215d09cc9463cc8988f80556f8f4ea9f5c23e554fa443424e7acbf767600499d4460cc3a6f6f716ee98c5f3442476b69574630c5e41f7caf050894ca26 - languageName: node - linkType: hard - "through2@npm:^2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" @@ -22941,7 +22870,7 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:4.2.0, tsconfig-paths@npm:^4.0.0, tsconfig-paths@npm:^4.1.2": +"tsconfig-paths@npm:4.2.0, tsconfig-paths@npm:^4.1.2, tsconfig-paths@npm:^4.2.0": version: 4.2.0 resolution: "tsconfig-paths@npm:4.2.0" dependencies: @@ -23714,7 +23643,7 @@ __metadata: languageName: node linkType: hard -"validator@npm:^13.7.0, validator@npm:^13.9.0": +"validator@npm:^13.11.0, validator@npm:^13.7.0": version: 13.11.0 resolution: "validator@npm:13.11.0" checksum: d1e0c27022681420756da25bc03eb08d5f0c66fb008f8ff02ebc95812b77c6be6e03d3bd05cf80ca702e23eeb73dadd66b4b3683173ea2a0bc7cc72820bee131 @@ -24456,14 +24385,7 @@ __metadata: languageName: node linkType: hard -"xorshift@npm:^1.1.1": - version: 1.2.0 - resolution: "xorshift@npm:1.2.0" - checksum: bb5575707d20a806e71fa3e80bc3dc083a4bcf3c82965bd27b797a355cf87583273fe7676cfc9c7ffaa4c17d5a171903462045e2154e51fe1f07b90a4dc6b9d2 - languageName: node - linkType: hard - -"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a