fix(backend): fix unit tests

SocialGouv · Nov 17, 2024 · ddf81f6 · ddf81f6
1 parent 6d7d7f5
commit ddf81f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...s/backend/src/usagers/controllers/security-tests/usager-docs.controller.security-tests.ts b/...s/backend/src/usagers/controllers/security-tests/usager-docs.controller.security-tests.ts
@@ -29,6 +29,7 @@ export const UsagerDocsControllerSecurityTests: AppTestHttpClientSecurityTestDef
           {
             roles: ["simple", "responsable", "admin"],
             validExpectedResponseStatus: HttpStatus.BAD_REQUEST, // filesystem document does not exists in tests
+            invalidStructureIdExpectedResponseStatus: HttpStatus.BAD_REQUEST,
           }
         ),
       }),
@@ -45,6 +46,7 @@ export const UsagerDocsControllerSecurityTests: AppTestHttpClientSecurityTestDef
             roles: ["simple", "responsable", "admin"],
             validStructureIds: [1],
             validExpectedResponseStatus: HttpStatus.OK, // filesystem document does not exists in tests
+            invalidStructureIdExpectedResponseStatus: HttpStatus.BAD_REQUEST,
           }
         ),
       }),

diff --git a/packages/backend/src/usagers/controllers/usager-notes.controller.ts b/packages/backend/src/usagers/controllers/usager-notes.controller.ts
@@ -18,7 +18,10 @@ import { CurrentUsager } from "../../auth/decorators/current-usager.decorator";
 import { CurrentUser } from "../../auth/decorators/current-user.decorator";
 import { UsagerAccessGuard } from "../../auth/guards/usager-access.guard";
 
-import { UserStructureAuthenticated } from "../../_common/model";
+import {
+  USER_STRUCTURE_ROLE_ALL,
+  UserStructureAuthenticated,
+} from "../../_common/model";
 import {
   UserStructureResume,
   UsagerNote,
@@ -36,13 +39,15 @@ import { CurrentUsagerNote } from "../../auth/decorators/current-usager-note.dec
 import { AppUserGuard, UsagerNoteAccessGuard } from "../../auth/guards";
 import { PageResultsDto, PageMetaDto, PageOptionsDto } from "../dto/pagination";
 import { ObjectLiteral } from "typeorm";
+import { AllowUserStructureRoles } from "../../auth/decorators";
 
 @ApiTags("usagers-notes")
 @ApiBearerAuth()
 @Controller("usagers-notes")
 @UseGuards(AuthGuard("jwt"), AppUserGuard)
 export class UsagerNotesController {
   @Post("search/:usagerRef/:archived")
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
   @UseGuards(UsagerAccessGuard)
   public async getUsagerNotes(
     @CurrentUser() currentUser: UserStructureAuthenticated,
@@ -75,8 +80,9 @@ export class UsagerNotesController {
     return new PageResultsDto(entities, pageMetaDto);
   }
 
-  @Post(":usagerRef")
   @UseGuards(UsagerAccessGuard)
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
+  @Post(":usagerRef")
   public async createNote(
     @Body() createNoteDto: CreateNoteDto,
     @CurrentUser() currentUser: UserStructureAuthenticated,
@@ -98,6 +104,7 @@ export class UsagerNotesController {
   }
 
   @Delete(":usagerRef/:noteUUID")
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
   @UseGuards(UsagerAccessGuard, UsagerNoteAccessGuard)
   public async deleteNote(
     @CurrentUser() currentUser: UserStructureAuthenticated,
@@ -131,6 +138,7 @@ export class UsagerNotesController {
   }
 
   @Put(":usagerRef/pin/:noteUUID")
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
   @UseGuards(UsagerAccessGuard, UsagerNoteAccessGuard)
   public async pinNote(
     @CurrentUser() _currentUser: UserStructureAuthenticated,
@@ -164,6 +172,7 @@ export class UsagerNotesController {
   }
 
   @Get("count/:usagerRef")
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
   @UseGuards(UsagerAccessGuard)
   public async countNotes(
     @CurrentUser() _currentUser: UserStructureAuthenticated,
@@ -177,6 +186,7 @@ export class UsagerNotesController {
   }
 
   @Put(":usagerRef/archive/:noteUUID")
+  @AllowUserStructureRoles(...USER_STRUCTURE_ROLE_ALL)
   @UseGuards(UsagerAccessGuard, UsagerNoteAccessGuard)
   public async archiveNote(
     @CurrentUser() currentUser: UserStructureAuthenticated,

diff --git a/packages/backend/src/usagers/controllers/usagers.controller.ts b/packages/backend/src/usagers/controllers/usagers.controller.ts
@@ -182,7 +182,7 @@ export class UsagersController {
     if (search?.lastInteractionDate) {
       const deadlines = getUsagerDeadlines();
       const date = deadlines[search.lastInteractionDate].value;
-      console.log({ date, deadlines });
+
       query.andWhere(
         `  ("lastInteraction"->>'dateInteraction')::timestamp >= :date`,
         {