feat: 1270 returns of review 1

Author: l-scherer

packages/backend/src/__tests__/helper/fixtures/agrementsHelper.ts

@@ -1,6 +1,5 @@
 import type { AgrementDto } from "@vao/shared-bridge";
 
-import { AgrementService as AgrementServiceShared } from "../../../shared/agrements/agrements.service";
 import { AgrementService } from "../../../usagers/agrements/agrements.service";
 
 export const createAgrement = async ({
@@ -22,7 +21,7 @@ export const createAgrement = async ({
 };
 
 export const getAgrement = async (agrementId: number) => {
-  const agrement = await AgrementServiceShared.getById({
+  const agrement = await AgrementService.getById({
     agrementId,
     withDetails: true,
   });

packages/backend/src/admin/agrements/agrements.controller.ts

@@ -6,7 +6,6 @@ import {
 } from "@vao/shared-bridge";
 import type { NextFunction } from "express";
 
-import { AgrementService as AgrementServiceShared } from "../../shared/agrements/agrements.service";
 import type { RouteRequest, RouteResponse } from "../../types/request";
 import AppError from "../../utils/error";
 import logger from "../../utils/logger";
@@ -54,7 +53,7 @@ export const AgrementController = {
   ) {
     const agrementId = Number(req.validatedParams!.agrementId);
     try {
-      const agrement: AgrementDto | null = await AgrementServiceShared.getById({
+      const agrement: AgrementDto | null = await AgrementService.getById({
         agrementId,
         withDetails: true,
       });

packages/backend/src/admin/agrements/agrements.repository.ts

@@ -13,6 +13,7 @@ import {
 import { processQuery } from "../../helpers/queryParams";
 import { AgrementEntity } from "../../shared/agrements/agrements.entity";
 import { AgrementsMapper } from "../../shared/agrements/agrements.mapper";
+import { AgrementsRepositoryShared } from "../../shared/agrements/agrements.repository";
 import Logger from "../../utils/logger";
 import { getPool } from "../../utils/pgpool";
 
@@ -21,6 +22,15 @@ const log = Logger(module.filename);
 // 🏗️ Repository Admin
 // ------------------------------------------------------------
 export const AgrementsRepository = {
+  async getById({
+    agrementId,
+    withDetails,
+  }: {
+    agrementId: number;
+    withDetails: boolean;
+  }): Promise<AgrementDto | null> {
+    return AgrementsRepositoryShared.getById({ agrementId, withDetails });
+  },
   /**
    * Récupère une liste d'agréments par région d'obtention
    */

packages/backend/src/admin/agrements/agrements.service.ts

@@ -11,7 +11,7 @@ import {
 import Region from "../../services/geo/Region";
 import { mailService } from "../../services/mail";
 import { getOne as serviceOrganismeGetOne } from "../../services/Organisme";
-import { AgrementsRepository as AgrementsRepositoryShared } from "../../shared/agrements/agrements.repository";
+import { AgrementServiceShared } from "../../shared/agrements/agrements.service";
 import AppError from "../../utils/error";
 import logger from "../../utils/logger";
 import MailUtils from "../../utils/mail";
@@ -20,6 +20,15 @@ import { AgrementsRepository } from "./agrements.repository";
 const log = logger(module.filename);
 
 export const AgrementService = {
+  async getById({
+    agrementId,
+    withDetails,
+  }: {
+    agrementId: number;
+    withDetails: boolean;
+  }) {
+    return await AgrementServiceShared.getById({ agrementId, withDetails });
+  },
   async getHistory(agrementId: number) {
     const history = await AgrementsRepository.getHistory(agrementId);
     return history;
@@ -144,7 +153,7 @@ export const AgrementService = {
     commentaire?: string;
     territoireCode: string;
   }): Promise<boolean> {
-    const agrement = await AgrementsRepositoryShared.getById({
+    const agrement = await AgrementsRepository.getById({
       agrementId,
       withDetails: false,
     });

packages/backend/src/shared/agrements/agrements.repository.ts

@@ -1,4 +1,4 @@
-import { AgrementDto } from "@vao/shared-bridge";
+import type { AgrementDto } from "@vao/shared-bridge";
 
 import { AgrementEntity } from "../../shared/agrements/agrements.entity";
 import {
@@ -13,9 +13,9 @@ import { getPool } from "../../utils/pgpool";
 
 const log = Logger(module.filename);
 // ------------------------------------------------------------
-// 🏗️ Repository Admin
+// 🏗️ Repository Shared
 // ------------------------------------------------------------
-export const AgrementsRepository = {
+export const AgrementsRepositoryShared = {
   /**
    * Récupère un agrément par son ID.
    */

packages/backend/src/shared/agrements/agrements.service.ts

@@ -1,16 +1,16 @@
 import { getById } from "../../services/adresse";
 import { getFileMetaData } from "../../services/Document";
-import { AgrementsRepository } from "./agrements.repository";
+import { AgrementsRepositoryShared } from "./agrements.repository";
 
-export const AgrementService = {
+export const AgrementServiceShared = {
   async getById({
     agrementId,
     withDetails,
   }: {
     agrementId: number;
     withDetails: boolean;
   }) {
-    const agrement = await AgrementsRepository.getById({
+    const agrement = await AgrementsRepositoryShared.getById({
       agrementId,
       withDetails,
     });

packages/backend/src/usagers/agrements/agrements.controller.ts

@@ -6,7 +6,6 @@ import {
 } from "@vao/shared-bridge";
 import type { NextFunction } from "express";
 
-import { AgrementService as AgrementServiceShared } from "../../shared/agrements/agrements.service";
 import type { RouteRequest, RouteResponse } from "../../types/request";
 import AppError from "../../utils/error";
 import logger from "../../utils/logger";
@@ -75,7 +74,7 @@ export const AgrementController = {
     }
 
     try {
-      const agrement: AgrementDto | null = await AgrementServiceShared.getById({
+      const agrement: AgrementDto | null = await AgrementService.getById({
         agrementId,
         withDetails: true,
       });

packages/backend/src/usagers/agrements/agrements.repository.ts

@@ -17,6 +17,7 @@ import {
   AgrementSejoursMapper,
   AgrementsMapper,
 } from "../../shared/agrements/agrements.mapper";
+import { AgrementsRepositoryShared } from "../../shared/agrements/agrements.repository";
 import Logger from "../../utils/logger";
 import { getPool } from "../../utils/pgpool";
 
@@ -248,6 +249,16 @@ export const AgrementsRepository = {
     const result = await client.query(query);
     return result.rows;
   },
+
+  async getById({
+    agrementId,
+    withDetails,
+  }: {
+    agrementId: number;
+    withDetails: boolean;
+  }): Promise<AgrementDto | null> {
+    return AgrementsRepositoryShared.getById({ agrementId, withDetails });
+  },
   /**
    * Récupère un agrément par organisme ID (avec ou sans détails liés)
    */

packages/backend/src/usagers/agrements/agrements.service.ts

@@ -8,7 +8,7 @@ import {
 } from "@vao/shared-bridge";
 
 import { mailService } from "../../services/mail";
-import { AgrementsRepository as AgrementsRepositoryShared } from "../../shared/agrements/agrements.repository";
+import { AgrementServiceShared } from "../../shared/agrements/agrements.service";
 import AppError from "../../utils/error";
 import logger from "../../utils/logger";
 import MailUtils from "../../utils/mail";
@@ -26,6 +26,15 @@ export const AgrementService = {
       libelle: activite.libelle,
     }));
   },
+  async getById({
+    agrementId,
+    withDetails,
+  }: {
+    agrementId: number;
+    withDetails: boolean;
+  }) {
+    return await AgrementServiceShared.getById({ agrementId, withDetails });
+  },
   async getHistory(agrementId: number) {
     const history = await AgrementsRepository.getHistory(agrementId);
     return history;
@@ -80,7 +89,7 @@ export const AgrementService = {
     statut: AGREMENT_STATUT;
     usagerUserId: string;
   }): Promise<boolean> {
-    const agrement = await AgrementsRepositoryShared.getById({
+    const agrement = await AgrementsRepository.getById({
       agrementId,
       withDetails: false,
     });

packages/frontend-bo/src/pages/agrements/[agrementId].vue

@@ -38,9 +38,6 @@
         :asc="asc"
       >
         <h1>Dossier</h1>
-        <AgrementsActions
-          :cdn-url="`${config.public.backendUrl}/documents/`"
-        ></AgrementsActions>
       </DsfrTabContent>
 
       <DsfrTabContent
@@ -149,7 +146,6 @@ const initialSelectedIndex =
   typeof queryIndex === "string" ? parseInt(queryIndex, 10) : 0;
 
 const selectedTabIndex = ref(initialSelectedIndex);
-const config = useRuntimeConfig();
 
 const asc = ref(true);