Merge pull request #55 from richard483/fix-1

updated jansen request jobFilter, updated contract update API
richard483 · Jan 16, 2024 · dfba7b7 · dfba7b7
2 parents a807578 + 5b6fc5e
commit dfba7b7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 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.0.6",
+  "version": "4.0.7",
   "description": "",
   "author": "8tech",
   "private": true,

diff --git a/src/contract/dto/contract-create.dto.ts b/src/contract/dto/contract-create.dto.ts
@@ -30,17 +30,25 @@ export class ContractCreateDto {
   @ApiProperty()
   @IsString()
   @IsOptional()
-  readonly paymentRequestId?: string;
+  readonly paymentId?: string;
 
   @ApiProperty()
-  @IsNotEmpty()
   @IsString()
   @IsOptional()
   readonly template?: string;
 
   @ApiProperty()
-  @IsNotEmpty()
   @IsString()
   @IsOptional()
   readonly customField?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly workSubmission?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly ratingId?: string;
 }
diff --git a/src/contract/dto/contract-update.dto.ts b/src/contract/dto/contract-update.dto.ts
@@ -19,6 +19,11 @@ export class ContractUpdateDto {
   @IsOptional()
   readonly jobId: string;
 
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly paymentId?: string;
+
   @ApiProperty()
   @IsString()
   @IsOptional()
@@ -37,15 +42,25 @@ export class ContractUpdateDto {
   @ApiProperty()
   @IsString()
   @IsOptional()
-  readonly paymentRequestId?: string;
+  readonly template?: string;
 
   @ApiProperty()
   @IsString()
   @IsOptional()
-  readonly template?: string;
+  readonly status?: string;
 
   @ApiProperty()
   @IsString()
   @IsOptional()
   readonly customField?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly workSubmission?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly ratingId?: string;
 }
diff --git a/src/job/job.repository.ts b/src/job/job.repository.ts
@@ -123,6 +123,9 @@ export class JobRepository {
         ? this.field[reqData.field](reqData.keyword)
         : this.field['description'](reqData.keyword),
       orderBy: this.orderBy[reqData.sort] || this.orderBy['-createdAt'],
+      include: {
+        company: true,
+      },
     });
 
     const total = this.prisma.jobVacancy.count({