Merge pull request #64 from richard483/fix-1

updated update contract access control, order recruiter contract list…
richard483 · Jan 21, 2024 · e66ad8c · e66ad8c
2 parents bc6d2ad + 547c08a
commit e66ad8c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend-8tech",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "",
   "author": "8tech",
   "private": true,

diff --git a/src/contract/contract.controller.ts b/src/contract/contract.controller.ts
@@ -50,7 +50,7 @@ export class ContractController {
   }
 
   @ApiBearerAuth()
-  @Roles(Role.RECRUITER)
+  @Roles(Role.USER)
   @UseGuards(JwtAuthGuard, RoleGuard)
   @Post('update')
   async updateContract(@Res() res, @Body() data: ContractUpdateDto) {

diff --git a/src/contract/contract.repository.ts b/src/contract/contract.repository.ts
@@ -96,6 +96,9 @@ export class ContractRepository {
             },
           },
         },
+        orderBy: {
+          updatedAt: 'desc',
+        },
         include: {
           payment: true,
           jobVacancy: true,

diff --git a/src/job/job.repository.ts b/src/job/job.repository.ts
@@ -92,6 +92,11 @@ export class JobRepository {
       res = await this.prisma.jobVacancy.findUnique({
         where: {
           id: jobId,
+          contracts: {
+            every: {
+              status: 'PENDING',
+            },
+          },
         },
         include: {
           contracts: {