fix(backend): add referrer from creation step (#3912)

Author: pYassine

_scripts/db/dumps/domifa_test.postgres.custom.gz

@@ -18,8 +18,6 @@ export class MessageSmsSenderService {
 
   public async sendSms(message: SmsToSend): Promise<void> {
     const parsedValue = phoneUtil.parse(message.phoneNumber);
-
-    console.log({ parsedValue });
     if (!phoneUtil.isValidNumber(parsedValue)) {
       appLogger.warn(`[SMS] phone number is invalid ${message.phoneNumber}`);
       captureMessage(

packages/backend/src/modules/sms/services/message-sms-sender.service.ts

@@ -4,6 +4,7 @@ import {
   AppTestHttpClientSecurityTestDef,
   expectedResponseStatusBuilder,
 } from "../../../_tests";
+import CREATE_USAGER_DTO from "../../services/tests/CREATE_USAGER_DTO.const";
 
 ////////////////// IMPORTANT //////////////////
 //
@@ -37,4 +38,24 @@ export const UsagersControllerSecurityTests: AppTestHttpClientSecurityTestDef[]
         ),
       }),
     },
+    {
+      label: `${CONTROLLER}.createUsager`,
+      query: async (context: AppTestContext) => ({
+        response: await AppTestHttpClient.post("/usagers", {
+          context,
+          body: {
+            ...CREATE_USAGER_DTO,
+            referrerId: 10000, // Fake referrerId
+          },
+        }),
+        expectedStatus: expectedResponseStatusBuilder.allowStructureOnly(
+          context.user,
+          {
+            validExpectedResponseStatus: HttpStatus.BAD_REQUEST,
+            invalidStructureIdExpectedResponseStatus: HttpStatus.BAD_REQUEST,
+            roles: ["simple", "responsable", "admin"],
+          }
+        ),
+      }),
+    },
   ];

packages/backend/src/usagers/controllers/security-tests/usagers.controller.security-tests.ts

@@ -75,10 +75,11 @@ describe("Usagers Controller", () => {
         context,
         body: POST_USAGER.payload,
       });
-      expect(response.status).toBe(201);
+      expect(response.status).toBe(200);
       expect(response.body).toBeDefined();
 
       const usager: Usager = response.body;
+
       const exceptedResponse: Usager = POST_USAGER.response;
       // Test des dates
       expect(new Date(usager.decision.dateDebut)).toEqual(new Date());
@@ -131,7 +132,7 @@ describe("Usagers Controller", () => {
         context,
         body: OK_DATAS_SUPP,
       });
-      expect(response.status).toBe(201);
+      expect(response.status).toBe(200);
       expect(response.body).toBeDefined();
 
       const usager: Usager = response.body;
@@ -153,6 +154,17 @@ describe("Usagers Controller", () => {
       expect(responseDelete.body).toBeDefined();
     });
 
+    it("❌ Référent qui n'existe pas", async () => {
+      const response = await AppTestHttpClient.post(ENDPOINT, {
+        context,
+        body: { ...POST_USAGER.payload, referrerId: 1000292 },
+      });
+
+      expect(response.status).toBe(400);
+      expect(response.body).toBeDefined();
+      expect(response.body?.message).toEqual("CANNOT_FIND_REFERRER");
+    });
+
     it("❌ Données manquantes", async () => {
       const NOT_OK = { ...POST_USAGER.payload };
       delete NOT_OK.prenom;
@@ -191,27 +203,29 @@ describe("Usagers Controller", () => {
     });
 
     it("✅ Patch Infos générales OK", async () => {
+      const editDto: any = {
+        ayantsDroits: [],
+        customRef: "265",
+        dateNaissance: "1995-06-01",
+        email: "",
+        langue: "",
+        nom: "Rami",
+        telephone: { countryCode: "fr", numero: "0600000001" },
+        prenom: "Phill",
+        sexe: "homme",
+        surnom: "",
+        contactByPhone: false,
+        villeNaissance: "Pakistan",
+        referrerId: null,
+        numeroDistribution: null,
+        nationalite: null,
+      };
+
       const response = await AppTestHttpClient.patch(
         ENDPOINT + "/" + usagerPatch.ref,
         {
           context,
-          body: {
-            ayantsDroits: [],
-            ayantsDroitsExist: false,
-            customRef: "265",
-            dateNaissance: "1995-06-01",
-            email: "",
-            ref: 265,
-            langue: "",
-            nom: "Rami",
-            telephone: { countryCode: "fr", numero: "0600000001" },
-            prenom: "Phill",
-            sexe: "homme",
-            surnom: "",
-            contactByPhone: false,
-            villeNaissance: "Pakistan",
-            etapeDemande: 3,
-          },
+          body: { ...editDto },
         }
       );
 
@@ -224,7 +238,7 @@ describe("Usagers Controller", () => {
       expect(updatedUsager.ayantsDroits.length).toEqual(0);
     });
 
-    it("✅ Patch Infos générales OK", async () => {
+    it("✅ Patch Infos générales OK: ajout d'ayants-droit", async () => {
       const response = await AppTestHttpClient.patch(
         ENDPOINT + "/" + usagerPatch.ref,
         {

packages/backend/src/usagers/controllers/tests/usagers.controller.spec.ts

@@ -34,7 +34,12 @@ import {
   USAGER_LIGHT_ATTRIBUTES,
 } from "../../database";
 
-import { anonymizeFullName, cleanPath, getPhoneString } from "../../util";
+import {
+  anonymizeFullName,
+  appLogger,
+  cleanPath,
+  getPhoneString,
+} from "../../util";
 import {
   UserStructureAuthenticated,
   USER_STRUCTURE_ROLE_ALL,
@@ -77,11 +82,35 @@ export class UsagersController {
   ) {}
 
   @Post()
-  public createUsager(
+  public async createUsager(
     @Body() usagerDto: CreateUsagerDto,
-    @CurrentUser() user: UserStructureAuthenticated
+    @CurrentUser() currentUser: UserStructureAuthenticated,
+    @Res() res: ExpressResponse
   ) {
-    return this.usagersService.create(usagerDto, user);
+    try {
+      // Check referrer
+      if (usagerDto?.referrerId) {
+        const user = await userStructureRepository.findOneBy({
+          id: usagerDto.referrerId,
+          structureId: currentUser.structureId,
+        });
+
+        if (!user) {
+          return res
+            .status(HttpStatus.BAD_REQUEST)
+            .json({ message: "CANNOT_FIND_REFERRER" });
+        }
+      }
+
+      const usager = await this.usagersService.create(usagerDto, currentUser);
+
+      return res.status(HttpStatus.OK).json(usager);
+    } catch (err) {
+      appLogger.error(err);
+      return res
+        .status(HttpStatus.BAD_REQUEST)
+        .json({ message: "CANNOT_CREATE_USAGER" });
+    }
   }
 
   @UseGuards(UsagerAccessGuard)
@@ -361,6 +390,7 @@ export class UsagersController {
       const buffer = await input(filePath).fillForm(pdfInfos).output();
       return res.setHeader("content-type", "application/pdf").send(buffer);
     } catch (err) {
+      appLogger.error(err);
       return res
         .status(HttpStatus.INTERNAL_SERVER_ERROR)
         .json({ message: "CERFA_ERROR" });

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

@@ -0,0 +1,16 @@
+import { CreateUsagerDto } from "../../dto/decision-form/create-usager.dto";
+
+const CREATE_USAGER_DTO = new CreateUsagerDto();
+CREATE_USAGER_DTO.nom = "Usager";
+CREATE_USAGER_DTO.prenom = "De test";
+CREATE_USAGER_DTO.surnom = "Chips";
+CREATE_USAGER_DTO.sexe = "homme";
+CREATE_USAGER_DTO.dateNaissance = new Date();
+CREATE_USAGER_DTO.villeNaissance = "Paris";
+CREATE_USAGER_DTO.email = "chips@gmail.com";
+CREATE_USAGER_DTO.telephone = {
+  countryCode: "fr",
+  numero: "",
+};
+
+export default CREATE_USAGER_DTO;

packages/backend/src/usagers/services/tests/CREATE_USAGER_DTO.const.ts

@@ -6,31 +6,16 @@ import {
 } from "../../../database";
 import { UsersModule } from "../../../modules/users/users.module";
 import { AppTestContext, AppTestHelper } from "../../../util/test";
-import { CreateUsagerDto } from "../../dto";
 import { UsagersService } from "../usagers.service";
 
 import { UsagerHistoryStateService } from "../usagerHistoryState.service";
 import { UserStructure } from "@domifa/common";
 import { UsagersLogsService } from "../usagers-logs.service";
 import { AppLogsModule } from "../../../modules/app-logs/app-logs.module";
+import CREATE_USAGER_DTO from "./CREATE_USAGER_DTO.const";
 
 describe("UsagersService", () => {
   let service: UsagersService;
-
-  const fakeUsagerDto = new CreateUsagerDto();
-
-  fakeUsagerDto.nom = "Usager";
-  fakeUsagerDto.prenom = "De test";
-  fakeUsagerDto.surnom = "Chips";
-  fakeUsagerDto.sexe = "homme";
-  fakeUsagerDto.dateNaissance = new Date();
-  fakeUsagerDto.villeNaissance = "Paris";
-  fakeUsagerDto.email = "chips@gmail.com";
-  fakeUsagerDto.telephone = {
-    countryCode: "fr",
-    numero: null,
-  };
-
   let context: AppTestContext;
 
   beforeAll(async () => {
@@ -58,7 +43,7 @@ describe("UsagersService", () => {
     })) as UserStructure;
     user.structure = await structureRepository.findOneBy({ id: 5 });
 
-    const usagerTest = await service.create(fakeUsagerDto, user);
+    const usagerTest = await service.create(CREATE_USAGER_DTO, user);
 
     expect(usagerTest).toBeDefined();
 
@@ -68,8 +53,8 @@ describe("UsagersService", () => {
       structureId: user.structureId,
     });
     expect(usager).toBeTruthy();
-    expect(usager.nom).toEqual(fakeUsagerDto.nom);
-    expect(usager.sexe).toEqual(fakeUsagerDto.sexe);
+    expect(usager.nom).toEqual(CREATE_USAGER_DTO.nom);
+    expect(usager.sexe).toEqual(CREATE_USAGER_DTO.sexe);
 
     await usagerRepository.delete({ uuid: usager.uuid });
 

packages/backend/src/usagers/services/tests/usagers.service.spec.ts

@@ -31,13 +31,13 @@ function setUsagerDefaultAttributes(usager: Partial<Usager>): void {
   };
   usager.typeDom = usager?.typeDom ?? "PREMIERE_DOM";
   usager.pinnedNote = null;
-  usager.referrerId = null;
+  usager.referrerId = usager?.referrerId ?? null;
 
-  if (!usager.ayantsDroits) {
+  if (!usager?.ayantsDroits?.length) {
     usager.ayantsDroits = [];
   }
 
-  if (!usager.historique) {
+  if (!usager?.historique?.length) {
     usager.historique = [];
   }
 
@@ -52,10 +52,9 @@ function setUsagerDefaultAttributes(usager: Partial<Usager>): void {
     };
   }
 
-  if (!usager.langue || usager.langue === "") {
+  if (!usager?.langue || usager.langue === "") {
     usager.langue = null;
   }
-
   if (!usager.lastInteraction) {
     usager.lastInteraction = {
       dateInteraction: new Date(),