fix(backend): fix referrerId and unit tests

SocialGouv · Jan 27, 2025 · 0f362f4 · 0f362f4
1 parent 1a9cbf4
commit 0f362f4
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 19 deletions.
diff --git a/packages/backend/src/usagers/controllers/security-tests/agenda.controller.security-tests.ts b/packages/backend/src/usagers/controllers/security-tests/agenda.controller.security-tests.ts
@@ -28,18 +28,4 @@ export const AgendaControllerSecurityTests: AppTestHttpClientSecurityTestDef[] =
         ),
       }),
     },
-    {
-      label: `${CONTROLLER}.getAllUsersForAgenda`,
-      query: async (context: AppTestContext) => ({
-        response: await AppTestHttpClient.get("/agenda/users", {
-          context,
-        }),
-        expectedStatus: expectedResponseStatusBuilder.allowStructureOnly(
-          context.user,
-          {
-            roles: ["simple", "responsable", "admin"],
-          }
-        ),
-      }),
-    },
   ];
diff --git a/...es/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts b/...es/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts
@@ -87,4 +87,5 @@ export const CUSTOM_DOC_ATTESTATION_POSTALE: StructureCustomDocTags = {
   PROCURATION_DATE_FIN: "",
   PROCURATION_DATE_NAISSANCE: "",
   PROCURATIONS_NOMBRE: 0,
+  REFERENT: "",
 };
diff --git a/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts b/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts
@@ -40,7 +40,7 @@ export const CUSTOM_DOC_COURRIER_REFUS: StructureCustomDocTags = {
   DATE_PREMIERE_DOM: "11 janvier 2018",
   DATE_RADIATION: "",
   PREMIERE_DOM_NOM_AGENT: "",
-
+  REFERENT: "",
   ENTRETIEN_ACCOMPAGNEMENT: "NON",
   ENTRETIEN_ACCOMPAGNEMENT_DETAIL: "",
   ENTRETIEN_ORIENTATION: "OUI",

diff --git a/packages/backend/src/usagers/services/usagersCreator.service.ts b/packages/backend/src/usagers/services/usagersCreator.service.ts
@@ -31,6 +31,7 @@ function setUsagerDefaultAttributes(usager: Partial<Usager>): void {
   };
   usager.typeDom = usager?.typeDom ?? "PREMIERE_DOM";
   usager.pinnedNote = null;
+  usager.referrerId = null;
 
   if (!usager.ayantsDroits) {
     usager.ayantsDroits = [];

diff --git a/...nd/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts b/...nd/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts
@@ -34,6 +34,7 @@ export const FIRST_SHEET_USAGERS = [
     TRANSFERT_NOM: "",
     MON_DOMIFA_ACTIVATION: "NON",
     SMS_ACTIVATION: "NON",
+    REFERENT: "",
   },
   {
     AD_DATE_NAISSANCE_0: "20/12/1978",
@@ -74,5 +75,6 @@ export const FIRST_SHEET_USAGERS = [
     TRANSFERT_NOM: "",
     MON_DOMIFA_ACTIVATION: "NON",
     SMS_ACTIVATION: "NON",
+    REFERENT: "",
   },
 ];
diff --git a/packages/backend/src/users/controllers/users.controller.security-tests.ts b/packages/backend/src/users/controllers/users.controller.security-tests.ts
@@ -11,6 +11,7 @@ import {
   expectedResponseStatusBuilder,
   securityTestDataBuilder,
 } from "../../_tests";
+import { USER_STRUCTURE_ROLE_ALL } from "../../_common/model";
 
 const CONTROLLER = "UserController";
 
@@ -24,7 +25,7 @@ export const UserControllerSecurityTests: AppTestHttpClientSecurityTestDef[] = [
       expectedStatus: expectedResponseStatusBuilder.allowStructureOnly(
         context.user,
         {
-          roles: ["responsable", "admin"],
+          roles: USER_STRUCTURE_ROLE_ALL,
         }
       ),
     }),

diff --git a/packages/backend/src/users/controllers/users.controller.ts b/packages/backend/src/users/controllers/users.controller.ts
@@ -52,12 +52,22 @@ export class UsersController {
   @ApiBearerAuth()
   @ApiOperation({ summary: "Liste des utilisateurs" })
   @Get("")
-  public getUsers(
+  public async getUsers(
     @CurrentUser() user: UserStructureAuthenticated
   ): Promise<UserStructureProfile[]> {
-    return userStructureRepository.getVerifiedUsersByStructureId(
+    const users = await userStructureRepository.getVerifiedUsersByStructureId(
       user.structureId
     );
+    if (user.role === "facteur" || user.role === "simple") {
+      return users.map((user) => {
+        return {
+          id: user.id,
+          nom: user.nom,
+          prenom: user.prenom,
+        };
+      }) as UserStructureProfile[];
+    }
+    return users;
   }
 
   @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)

diff --git a/packages/common/src/search/classes/Search.class.ts b/packages/common/src/search/classes/Search.class.ts
@@ -4,7 +4,7 @@ export class Search {
   public searchString: string | null;
   public sortKey: string;
   public sortValue: SortValues;
-  public page: number;
+  public page = 1;
 
   constructor(search?: any) {
     this.searchString = search?.searchString ?? null;

diff --git a/packages/common/src/search/types/UsagersFilterCriteriaEntretien.enum.ts b/packages/common/src/search/types/UsagersFilterCriteriaEntretien.enum.ts
@@ -0,0 +1,4 @@
+export enum UsagersFilterCriteriaEntretien {
+  COMING = "COMING",
+  OVERDUE = "OVERDUE",
+}
diff --git a/packages/common/src/search/types/index.ts b/packages/common/src/search/types/index.ts
@@ -2,4 +2,5 @@
 export * from "./CriteriaSearchField.enum";
 export * from "./SortValues.type";
 export * from "./Timings.type";
+export * from "./UsagersFilterCriteriaEntretien.enum";
 export * from "./UsagersFilterCriteriaStatut.enum";
diff --git a/.../usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.spec.ts b/.../usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.spec.ts
@@ -71,6 +71,7 @@ describe("EtatCivilParentFormComponent", () => {
       nom: "TEST",
       prenom: "TEST PRENOM ",
       sexe: "homme",
+      referrerId: null,
       surnom: "Chips",
       numeroDistribution: "TSA 1000",
       telephone: {