From e2168292ea07d045bc2ae8058a7027fa6332f15e Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 22 Feb 2024 13:53:58 +0700
Subject: [PATCH] fix null details

---
 src/controllers/SalaryController.ts | 9 ++++++---
 src/entities/Salarys.ts             | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts
index 5185c19..8bc9dae 100644
--- a/src/controllers/SalaryController.ts
+++ b/src/controllers/SalaryController.ts
@@ -18,7 +18,7 @@ import { Salarys, CreateSalary, UpdateSalary } from "../entities/Salarys";
 import { PosType } from "../entities/PosType";
 import { PosLevel } from "../entities/PosLevel";
 import { AppDataSource } from "../database/data-source";
-import { In, IsNull, Not } from "typeorm";
+import { DeepPartial, In, IsNull, Not } from "typeorm";
 import HttpSuccess from "../interfaces/http-success";
 import HttpError from "../interfaces/http-error";
 import HttpStatusCode from "../interfaces/http-status";
@@ -178,11 +178,14 @@ export class Salary extends Controller {
       if (!chk_posLevelId) {
         throw new HttpError(HttpStatusCode.NOT_FOUND, "ระดับของตำแหน่ง ไม่ถูกต้อง");
       }
-
+      const mergeData: DeepPartial<Salarys> = {
+        ...requestBody,
+        details: requestBody.details === null ? undefined : requestBody.details,
+      };
       chk_Salary.lastUpdateUserId = request.user.sub;
       chk_Salary.lastUpdateFullName = request.user.name;
       chk_Salary.lastUpdatedAt = new Date();
-      this.salaryRepository.merge(chk_Salary, requestBody);
+      this.salaryRepository.merge(chk_Salary, mergeData);
       await this.salaryRepository.save(chk_Salary);
       return new HttpSuccess(id);
     // } catch (error: any) {
diff --git a/src/entities/Salarys.ts b/src/entities/Salarys.ts
index 8900f2c..dd65fea 100644
--- a/src/entities/Salarys.ts
+++ b/src/entities/Salarys.ts
@@ -133,7 +133,7 @@ export class UpdateSalary {
   endDate?: Date;
 
   @Column()
-  details?: string;
+  details?: string | null;
 
   @Column()
   isSpecial: boolean;