Merge pull request #52 from richard483/fix-1

fix username update validation, update contract schema, completed rat…

docs/rating-controller.md

@@ -0,0 +1,144 @@
+# User controller
+
+---
+
+[UserRatingAverageCount](#userRatingAverageCount)
+
+## get user rating average&count (update authorized user)
+
+| Key    | Description   |
+| ------ | ------------- |
+| Method | `GET`        |
+| Path   | `/rating/averageCount/:userId` |
+
+### Success Response
+
+HTTP Code: 200
+
+```json
+{
+  "status": true,
+  "statusCode": 200,
+  "data": {
+    "_avg": {
+      "ratingOf10": 6
+    },
+    "_count": {
+      "ratingOf10": 4
+    }
+  }
+}
+```
+
+### Invalid credential
+
+HTTP Code: 401
+
+```json
+{
+  "status": true,
+  "statusCode": 401,
+  "data": {
+    "access": "UNAUTHORIZED"
+  }
+}
+```
+
+### user not found
+
+HTTP Code: 200
+
+```json
+{
+  "status": true,
+  "statusCode": 200,
+  "data": {
+    "_avg": {
+      "ratingOf10": null
+    },
+    "_count": {
+      "ratingOf10": 0
+    }
+  }
+}
+
+```
+
+---
+
+# User controller
+
+---
+
+[CreateUserRating](#createUserRating)
+
+## get user rating average&count (update authorized user)
+
+| Key    | Description   |
+| ------ | ------------- |
+| Method | `POST`        |
+| Path   | `/rating/craete` |
+
+### Request Body
+
+| Key        | Type   |
+| ---------- | ------ |
+| `userId`    | String |
+| `recruiterUserId` | String |
+| `ratingOf10` | number |
+| `contractId` | String? |
+
+### Success Response
+
+HTTP Code: 200
+
+```json
+{
+  "status": true,
+  "statusCode": 200,
+  "data": {
+    "id": "de67c8bd-8637-4aa0-9983-31c602896672",
+    "userId": "5c03f41e-5c18-4ef2-adf2-9ef560c34ca0",
+    "recruiterUserId": "741c71e9-94dc-4ad8-98a6-9259c6b72f88",
+    "ratingOf10": 9,
+    "createdAt": "2024-01-15T16:16:41.196Z",
+    "updatedAt": "2024-01-15T16:16:41.196Z"
+  }
+}
+```
+
+### Invalid credential
+
+HTTP Code: 401
+
+```json
+{
+  "status": true,
+  "statusCode": 401,
+  "data": {
+    "access": "UNAUTHORIZED"
+  }
+}
+```
+
+### invalid field
+
+HTTP Code: 400
+
+```json
+{
+  "status": false,
+  "statusCode": 400,
+  "message": {
+    "name": "PrismaClientKnownRequestError",
+    "code": "P2003",
+    "clientVersion": "5.7.1",
+    "meta": {
+      "modelName": "Rating",
+      "field_name": "Rating_userId_fkey (index)"
+    }
+  },
+  "error": "BAD_REQUEST"
+}
+
+```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-8tech",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "",
   "author": "8tech",
   "private": true,

prisma/migrations/20240115160307_updated_contract/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "Contract" ADD COLUMN     "ratingId" TEXT,
+ADD COLUMN     "workSubmission" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "Contract" ADD CONSTRAINT "Contract_ratingId_fkey" FOREIGN KEY ("ratingId") REFERENCES "Rating"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/schema.prisma

@@ -60,21 +60,24 @@ model Company {
 }
 
 model Contract {
-  id          String         @id @default(uuid())
-  userId      String
-  jobId       String
-  paymentId   String?
-  title       String
-  description String
-  paymentRate Int
-  template    String?        @db.VarChar()
-  createdAt   DateTime       @default(now())
-  updatedAt   DateTime       @updatedAt
-  status      ContractStatus @default(PENDING)
-  customField String?
-  JobVacancy  JobVacancy?    @relation(fields: [jobId], references: [id])
-  User        User?          @relation(fields: [userId], references: [id])
-  Payment     Payment?       @relation(fields: [paymentId], references: [id])
+  id             String         @id @default(uuid())
+  userId         String
+  jobId          String
+  paymentId      String?
+  title          String
+  description    String
+  paymentRate    Int
+  template       String?        @db.VarChar()
+  createdAt      DateTime       @default(now())
+  updatedAt      DateTime       @updatedAt
+  status         ContractStatus @default(PENDING)
+  customField    String?
+  workSubmission String?
+  ratingId       String?
+  JobVacancy     JobVacancy?    @relation(fields: [jobId], references: [id])
+  User           User?          @relation(fields: [userId], references: [id])
+  Payment        Payment?       @relation(fields: [paymentId], references: [id])
+  Rating         Rating?        @relation(fields: [ratingId], references: [id])
 }
 
 model Payment {
@@ -88,13 +91,14 @@ model Payment {
 }
 
 model Rating {
-  id              String   @id @default(uuid())
-  User            User     @relation(fields: [userId], references: [id])
+  id              String     @id @default(uuid())
+  User            User       @relation(fields: [userId], references: [id])
   userId          String
   recruiterUserId String
   ratingOf10      Int
-  createdAt       DateTime @default(now())
-  updatedAt       DateTime @updatedAt
+  createdAt       DateTime   @default(now())
+  updatedAt       DateTime   @updatedAt
+  Contract        Contract[]
 }
 
 enum Role {

src/contract/contract.controller.ts

@@ -25,6 +25,7 @@ import {
   IContractPayoutLink,
 } from './interface/contract.interface';
 import { Contract } from '@prisma/client';
+import { ContractUpdateDto } from './dto/contract-update.dto';
 
 @ApiTags('Contract')
 @Controller('contract')
@@ -41,6 +42,17 @@ export class ContractController {
     return response;
   }
 
+  @ApiBearerAuth()
+  @Roles(Role.USER)
+  @UseGuards(JwtAuthGuard, RoleGuard)
+  @Post('update')
+  async updateContract(@Res() res, @Body() data: ContractUpdateDto) {
+    console.info('#ContractUpdate request incoming with: ', data);
+    const { id, ...contract } = data;
+    const response = await this.contractService.update(id, contract);
+    return response;
+  }
+
   @Get('generate/:contractId')
   @ApiParam({ name: 'contractId', type: String })
   @Roles(Role.USER)

src/contract/contract.repository.ts

@@ -16,6 +16,15 @@ export class ContractRepository {
     });
   }
 
+  async update(id: string, contract: any): Promise<Contract> {
+    return this.prisma.contract.update({
+      data: contract,
+      where: {
+        id: contract.id,
+      },
+    });
+  }
+
   async getAllbyUserId(userId: string): Promise<Contract[]> {
     return this.prisma.contract.findMany({
       where: {

src/contract/contract.service.ts

@@ -33,8 +33,12 @@ export class ContractService {
 
   //#region Contract
   //Create Contract
-  async create(user: any): Promise<Contract> {
-    return this.contractRepository.create(user);
+  async create(data: any): Promise<Contract> {
+    return this.contractRepository.create(data);
+  }
+
+  async update(id: string, data: any): Promise<Contract> {
+    return this.contractRepository.update(id, data);
   }
 
   async generate(contractId) {

src/contract/dto/contract-update.dto.ts

@@ -0,0 +1,51 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsNumber, IsOptional, IsString } from 'class-validator';
+
+export class ContractUpdateDto {
+  @ApiProperty()
+  @IsString()
+  @IsNotEmpty({
+    message: 'MUST_NOT_BE_EMPTY',
+  })
+  readonly id: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly userId: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly jobId: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly title: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly description: string;
+
+  @ApiProperty()
+  @IsNumber()
+  @IsOptional()
+  readonly paymentRate: number;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly paymentRequestId?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly template?: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  readonly customField?: string;
+}

src/contract/test/contract.controller.spec.ts

@@ -61,6 +61,8 @@ describe('ContractController', () => {
       createdAt: new Date(),
       updatedAt: new Date(),
       customField: null,
+      workSubmission: null,
+      ratingId: null,
     };
 
     const createSpy = jest

src/job/job.repository.ts

@@ -39,6 +39,11 @@ export class JobRepository {
           },
         };
       },
+      companyId(keyword: string) {
+        return {
+          companyId: keyword,
+        };
+      },
     };
   }
 

src/rating/dto/rating-create.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { IsNotEmpty, IsNumber, IsOptional, IsString } from 'class-validator';
 
 export class RatingCreateDto {
   @ApiProperty()
@@ -16,4 +16,9 @@ export class RatingCreateDto {
   @IsNotEmpty()
   @IsNumber()
   readonly ratingOf10: number;
+
+  @ApiProperty()
+  @IsOptional()
+  @IsString()
+  readonly contractId?: string;
 }