diff --git a/src/api/project-result/projectResult.controller.ts b/src/api/project-result/projectResult.controller.ts index f199203..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) + @Roles( + UserRole.Reviewer, + UserRole.Copilot, + UserRole.Submitter, + UserRole.Admin, + ) @Scopes(Scope.ReadProjectResult) @ApiOperation({ summary: 'Get project results', diff --git a/src/api/review-type/review-type.controller.ts b/src/api/review-type/review-type.controller.ts index 2ba6f9b..0424fc5 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'; @@ -171,6 +171,7 @@ export class ReviewTypeController { UserRole.Admin, UserRole.Submitter, UserRole.Reviewer, + UserRole.Talent, ) @Scopes(Scope.ReadReviewType) @ApiOperation({ @@ -187,7 +188,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 +235,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, diff --git a/src/api/submission/submission.controller.ts b/src/api/submission/submission.controller.ts index 637ee8c..f27992a 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'; @@ -150,6 +150,7 @@ export class SubmissionController { UserRole.Admin, UserRole.Submitter, UserRole.Reviewer, + UserRole.Talent, ) @Scopes(Scope.ReadSubmission) @ApiOperation({ @@ -166,11 +167,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')