[M1_TR-210] Update tags in jobs table, job dtos, and job tests

framgia · Sep 7, 2023 · 6454a9a · 6454a9a
1 parent ebb36bd
commit 6454a9a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 40 deletions.
diff --git a/.sun-ci.yml b/.sun-ci.yml
@@ -34,12 +34,6 @@ jobs:
   - name: Backend Test Job
     stage: test-be
     image: node:16-alpine
-    cache: 
-      - key:
-          files: 
-            - server/yarn.lock
-        paths:
-          - server/node_modules
     script:
       - cd server
       - yarn install
@@ -58,12 +52,6 @@ jobs:
   - name: Frontend Test Job
     stage: test-fe
     image: node:16-alpine
-    cache: 
-      - key:
-          files:
-            - web/yarn.lock
-        paths:
-          - web/node_modules
     script:
       - cd web
       - yarn install

diff --git a/server/src/api/job/dtos/create-job-dto.ts b/server/src/api/job/dtos/create-job-dto.ts
@@ -1,7 +1,8 @@
-import { $Enums, PaymentMethod, Tag } from "@prisma/client";
+import { PaymentMethod, Tag } from "@prisma/client";
 import { ApiProperty } from "@nestjs/swagger";
 import {
-    IsIn,
+    IsArray,
+    IsEnum,
     IsNumber,
     IsOptional,
     IsString,
@@ -17,9 +18,9 @@ export class CreateJobDto {
     type: string;
 
     @ApiProperty()
-    @IsString()
-    @IsIn(Object.values(Tag))
-    tags: $Enums.Tag;
+    @IsArray()
+    @IsEnum(Tag, { each: true })
+    tags: Tag[]
 
     @ApiProperty()
     @IsOptional()
@@ -28,8 +29,8 @@ export class CreateJobDto {
 
     @ApiProperty()
     @IsString()
-    @IsIn(Object.values(PaymentMethod))
-    paymentMethod: $Enums.PaymentMethod;
+    @IsEnum(PaymentMethod)
+    paymentMethod: PaymentMethod;
 
     @ApiProperty()
     @IsNumber()

diff --git a/server/src/api/job/dtos/create-job-without-customer-id-and-user-id.dto.ts b/server/src/api/job/dtos/create-job-without-customer-id-and-user-id.dto.ts
@@ -1,6 +1,6 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { Tag, $Enums, PaymentMethod } from "@prisma/client";
-import { IsString, IsIn, IsOptional } from "class-validator";
+import { Tag, PaymentMethod } from "@prisma/client";
+import { IsString, IsOptional, IsEnum, IsArray } from "class-validator";
 
 export class CreateJobWithoutCustomerIdAndUserIdDto {
     @ApiProperty()
@@ -12,9 +12,9 @@ export class CreateJobWithoutCustomerIdAndUserIdDto {
     type: string;
 
     @ApiProperty()
-    @IsString()
-    @IsIn(Object.values(Tag))
-    tags: $Enums.Tag;
+    @IsArray()
+    @IsEnum(Tag, { each: true })
+    tags: Tag[]
 
     @ApiProperty()
     @IsOptional()
@@ -23,8 +23,8 @@ export class CreateJobWithoutCustomerIdAndUserIdDto {
 
     @ApiProperty()
     @IsString()
-    @IsIn(Object.values(PaymentMethod))
-    paymentMethod: $Enums.PaymentMethod;
+    @IsEnum(PaymentMethod)
+    paymentMethod: PaymentMethod;
 
     @ApiProperty()
     @IsOptional()

diff --git a/server/src/api/job/job.controller.spec.ts b/server/src/api/job/job.controller.spec.ts
@@ -30,7 +30,7 @@ describe('JobController', () => {
         job_information: {
           title: "string",
           type: "string",
-          tags: $Enums.Tag.TAG_A,
+          tags: [$Enums.Tag.TAG_A],
           remarks: "string",
           paymentMethod: $Enums.PaymentMethod.CASH,
         },
@@ -41,7 +41,7 @@ describe('JobController', () => {
         id: 1,
         title: "string",
         type: "string",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "string",
         customerId: 1,
         paymentMethod: $Enums.PaymentMethod.CASH,
@@ -64,7 +64,7 @@ describe('JobController', () => {
         id: 1,
         title: "Sample title 1",
         type: "A",
-        tags: "TAG_A",
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: "CARD",
@@ -73,7 +73,7 @@ describe('JobController', () => {
         id: 2,
         title: "Sample title 2",
         type: "A",
-        tags: "TAG_A",
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: "CARD",
@@ -94,7 +94,7 @@ describe('JobController', () => {
         id: 1,
         title: "Sample title 1",
         type: "A",
-        tags: "TAG_A",
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: "CARD",

diff --git a/server/src/api/job/job.service.spec.ts b/server/src/api/job/job.service.spec.ts
@@ -29,7 +29,7 @@ describe('JobController', () => {
         job_information: {
           title: "string",
           type: "string",
-          tags: $Enums.Tag.TAG_A,
+          tags: [$Enums.Tag.TAG_A],
           remarks: "string",
           paymentMethod: $Enums.PaymentMethod.CASH,
         },
@@ -40,7 +40,7 @@ describe('JobController', () => {
         id: 1,
         title: "string",
         type: "string",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "string",
         customerId: 1,
         paymentMethod: $Enums.PaymentMethod.CASH,
@@ -66,7 +66,7 @@ describe('JobController', () => {
         id: 1,
         title: "Sample title 1",
         type: "A",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: $Enums.PaymentMethod.CASH,
@@ -90,7 +90,7 @@ describe('JobController', () => {
         id: 1,
         title: "Sample title 1",
         type: "A",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: $Enums.PaymentMethod.CASH,
@@ -101,7 +101,7 @@ describe('JobController', () => {
         id: 2,
         title: "Sample title 2",
         type: "A",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         customerId: 1,
         paymentMethod: $Enums.PaymentMethod.CARD,
@@ -124,7 +124,7 @@ describe('JobController', () => {
       const jobInput = {
         title: "Sample title 1",
         type: "A",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         paymentMethod: $Enums.PaymentMethod.CASH,
         customerId: 1,
@@ -135,7 +135,7 @@ describe('JobController', () => {
         id: 1,
         title: "Sample title 1",
         type: "A",
-        tags: $Enums.Tag.TAG_A,
+        tags: [$Enums.Tag.TAG_A],
         remarks: "",
         paymentMethod: $Enums.PaymentMethod.CASH,
         customerId: 1,

diff --git a/...rations/20230904071055_init/migration.sql → ...rations/20230907112210_init/migration.sql b/...rations/20230904071055_init/migration.sql → ...rations/20230907112210_init/migration.sql
@@ -25,7 +25,7 @@ CREATE TABLE "Job" (
     "id" SERIAL NOT NULL,
     "title" TEXT NOT NULL,
     "type" TEXT NOT NULL,
-    "tags" "Tag" NOT NULL DEFAULT 'TAG_A',
+    "tags" "Tag"[] DEFAULT ARRAY['TAG_A']::"Tag"[],
     "remarks" TEXT NOT NULL,
     "customerId" INTEGER NOT NULL,
     "paymentMethod" "PaymentMethod" NOT NULL DEFAULT 'CASH',

diff --git a/server/src/models/schema.prisma b/server/src/models/schema.prisma
@@ -22,7 +22,7 @@ model Job {
     id             Int           @id @default(autoincrement())
     title          String        
     type           String
-    tags           Tag           @default(TAG_A)
+    tags           Tag[]           @default([TAG_A])
     remarks        String
     customer       Customer      @relation(fields: [customerId], references: [id])
     customerId     Int