From 75af5278b9a7f4ba8e363a9eb81a426fc6253e52 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 20 Aug 2025 07:49:59 +1000 Subject: [PATCH 1/8] Add admin to project result endpoint, since they should be able to see everything --- src/api/project-result/projectResult.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/project-result/projectResult.controller.ts b/src/api/project-result/projectResult.controller.ts index f199203..70f951f 100644 --- a/src/api/project-result/projectResult.controller.ts +++ b/src/api/project-result/projectResult.controller.ts @@ -35,7 +35,7 @@ export class ProjectResultController { } @Get('/projectResult') - @Roles(UserRole.Reviewer, UserRole.Copilot, UserRole.Submitter) + @Roles(UserRole.Reviewer, UserRole.Copilot, UserRole.Submitter, UserRole.Admin) @Scopes(Scope.ReadProjectResult) @ApiOperation({ summary: 'Get project results', From 8075297feca10f3d31ba9b4d3005abd4026c46b1 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 20 Aug 2025 07:53:00 +1000 Subject: [PATCH 2/8] Lint --- src/api/project-result/projectResult.controller.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api/project-result/projectResult.controller.ts b/src/api/project-result/projectResult.controller.ts index 70f951f..d9236e1 100644 --- a/src/api/project-result/projectResult.controller.ts +++ b/src/api/project-result/projectResult.controller.ts @@ -35,7 +35,12 @@ export class ProjectResultController { } @Get('/projectResult') - @Roles(UserRole.Reviewer, UserRole.Copilot, UserRole.Submitter, UserRole.Admin) + @Roles( + UserRole.Reviewer, + UserRole.Copilot, + UserRole.Submitter, + UserRole.Admin, + ) @Scopes(Scope.ReadProjectResult) @ApiOperation({ summary: 'Get project results', From 3af96fa123cc6865d09883a3b8bc170d7b94b9aa Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 13:20:15 +1000 Subject: [PATCH 3/8] Tweak review types response to match what we had in v5 --- src/api/review-type/review-type.controller.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/api/review-type/review-type.controller.ts b/src/api/review-type/review-type.controller.ts index 2ba6f9b..81b8c16 100644 --- a/src/api/review-type/review-type.controller.ts +++ b/src/api/review-type/review-type.controller.ts @@ -187,7 +187,7 @@ export class ReviewTypeController { @Query() queryDto: ReviewTypeQueryDto, @Query() paginationDto?: PaginationDto, @Query() sortDto?: SortDto, - ): Promise> { + ): Promise { this.logger.log( `Getting review types with filters - ${JSON.stringify(queryDto)}`, ); @@ -234,15 +234,7 @@ export class ReviewTypeController { `Found ${reviewTypes.length} review types (page ${page} of ${Math.ceil(totalCount / perPage)})`, ); - return { - data: reviewTypes as ReviewTypeResponseDto[], - meta: { - page, - perPage, - totalCount, - totalPages: Math.ceil(totalCount / perPage), - }, - }; + return reviewTypes as ReviewTypeResponseDto[]; } catch (error) { const errorResponse = this.prismaErrorService.handleError( error, From 80796182ac53b11320051f570fe009aa4c962c55 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 13:22:55 +1000 Subject: [PATCH 4/8] Lint --- src/api/review-type/review-type.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/review-type/review-type.controller.ts b/src/api/review-type/review-type.controller.ts index 81b8c16..2d1b31e 100644 --- a/src/api/review-type/review-type.controller.ts +++ b/src/api/review-type/review-type.controller.ts @@ -34,7 +34,7 @@ import { } from 'src/dto/reviewType.dto'; import { PrismaService } from '../../shared/modules/global/prisma.service'; import { LoggerService } from '../../shared/modules/global/logger.service'; -import { PaginatedResponse, PaginationDto } from '../../dto/pagination.dto'; +import { PaginationDto } from '../../dto/pagination.dto'; import { SortDto } from '../../dto/sort.dto'; import { PrismaErrorService } from '../../shared/modules/global/prisma-error.service'; From 91dc6a77be8a4f1e8491c1ed273b43ecba5434d9 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 13:37:37 +1000 Subject: [PATCH 5/8] Fix up submission response for v5 compatibility --- src/api/submission/submission.controller.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/api/submission/submission.controller.ts b/src/api/submission/submission.controller.ts index 637ee8c..b4bba7b 100644 --- a/src/api/submission/submission.controller.ts +++ b/src/api/submission/submission.controller.ts @@ -45,7 +45,7 @@ import { ArtifactsListResponseDto, } from 'src/dto/artifacts.dto'; import { LoggerService } from '../../shared/modules/global/logger.service'; -import { PaginatedResponse, PaginationDto } from '../../dto/pagination.dto'; +import { PaginationDto } from '../../dto/pagination.dto'; import { SortDto } from '../../dto/sort.dto'; import { SubmissionService } from './submission.service'; import { JwtUser } from 'src/shared/modules/global/jwt.service'; @@ -166,11 +166,16 @@ export class SubmissionController { @Query() queryDto: SubmissionQueryDto, @Query() paginationDto?: PaginationDto, @Query() sortDto?: SortDto, - ): Promise> { + ): Promise { this.logger.log( `Getting submissions with filters - ${JSON.stringify(queryDto)}`, ); - return this.service.listSubmission(queryDto, paginationDto, sortDto); + const paginatedData = await this.service.listSubmission( + queryDto, + paginationDto, + sortDto, + ); + return paginatedData.data; } @Get('/:submissionId') From 50fc6d38abb34057179e870cc54cabe49c389c56 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 14:06:52 +1000 Subject: [PATCH 6/8] Update loading submissions roles to match v5 --- src/api/submission/submission.controller.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/submission/submission.controller.ts b/src/api/submission/submission.controller.ts index b4bba7b..e1b3311 100644 --- a/src/api/submission/submission.controller.ts +++ b/src/api/submission/submission.controller.ts @@ -150,6 +150,7 @@ export class SubmissionController { UserRole.Admin, UserRole.Submitter, UserRole.Reviewer, + UserRole.Talent ) @Scopes(Scope.ReadSubmission) @ApiOperation({ From c49dbe1799758f99b77f80bdb2aa03133a8b9505 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 14:09:17 +1000 Subject: [PATCH 7/8] Lint --- src/api/submission/submission.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/submission/submission.controller.ts b/src/api/submission/submission.controller.ts index e1b3311..f27992a 100644 --- a/src/api/submission/submission.controller.ts +++ b/src/api/submission/submission.controller.ts @@ -150,7 +150,7 @@ export class SubmissionController { UserRole.Admin, UserRole.Submitter, UserRole.Reviewer, - UserRole.Talent + UserRole.Talent, ) @Scopes(Scope.ReadSubmission) @ApiOperation({ From 1f32d61684a8bb4016d3f1b41cc2ac84f59ce60c Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 27 Aug 2025 14:17:48 +1000 Subject: [PATCH 8/8] Additional permissions for pulling review types --- src/api/review-type/review-type.controller.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/review-type/review-type.controller.ts b/src/api/review-type/review-type.controller.ts index 2d1b31e..0424fc5 100644 --- a/src/api/review-type/review-type.controller.ts +++ b/src/api/review-type/review-type.controller.ts @@ -171,6 +171,7 @@ export class ReviewTypeController { UserRole.Admin, UserRole.Submitter, UserRole.Reviewer, + UserRole.Talent, ) @Scopes(Scope.ReadReviewType) @ApiOperation({