Merge branch 'develop' into develop-Bright

# Conflicts:
#	src/entities/Profile.ts
#	src/entities/ProfileEmployee.ts

src/controllers/OrganizationUnauthorizeController.ts

@@ -60,7 +60,7 @@ export class OrganizationUnauthorizeController extends Controller {
       .leftJoinAndSelect("posMaster.positions", "positions")
       .leftJoinAndSelect("positions.posExecutive", "posExecutive")
       .leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
-      .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
+      .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines")
       .leftJoinAndSelect("current_holder.posLevel", "posLevel")
       .leftJoinAndSelect("current_holder.posType", "posType")
       .where({
@@ -219,7 +219,7 @@ export class OrganizationUnauthorizeController extends Controller {
         result: null,
         duration: null,
         isPunish:
-          item.current_holder.profileDiscipline.filter(
+          item.current_holder.profileDisciplines.filter(
             (x: any) =>
               new Date(
                 `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
@@ -278,7 +278,7 @@ export class OrganizationUnauthorizeController extends Controller {
       .leftJoinAndSelect("employeePosMaster.orgChild4", "orgChild4")
       .leftJoinAndSelect("employeePosMaster.positions", "positions")
       .leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
-      .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
+      .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines")
       .leftJoinAndSelect("current_holder.posLevel", "posLevel")
       .leftJoinAndSelect("current_holder.posType", "posType")
       .where({
@@ -426,7 +426,7 @@ export class OrganizationUnauthorizeController extends Controller {
         result: null,
         duration: null,
         isPunish:
-          item.current_holder.profileDiscipline.filter(
+          item.current_holder.profileDisciplines.filter(
             (x: any) =>
               new Date(
                 `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,

src/controllers/ProfileChangeNameController.ts

@@ -126,6 +126,11 @@ export class ProfileChangeNameController extends Controller {
 
     await this.changeNameRepository.save(data);
 
+    profile.firstName = body.firstName ?? profile.firstName;
+    profile.lastName = body.lastName ?? profile.lastName;
+    profile.prefix = body.prefix ?? profile.prefix;
+    await this.profileRepository.save(profile);
+
     return new HttpSuccess(data.id);
   }
 
@@ -152,6 +157,25 @@ export class ProfileChangeNameController extends Controller {
       this.changeNameHistoryRepository.save(history),
     ]);
 
+    const chkLastRecord = await this.changeNameRepository.findOne({
+      where:{
+        profileEmployeeId: record.profileEmployeeId
+      },
+      order:{
+        createdAt: "DESC"
+      }
+    })
+    if (!chkLastRecord) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    
+    const profile = await this.profileRepository.findOneBy({ id: record.profileId });
+    
+    if (profile && chkLastRecord.id === record.id) {
+      profile.firstName = body.firstName ?? profile.firstName;
+      profile.lastName = body.lastName ?? profile.lastName;
+      profile.prefix = body.prefix ?? profile.prefix;
+      await this.profileRepository.save(profile);
+    }
+
     return new HttpSuccess();
   }
 

src/controllers/ProfileChangeNameEmployeeController.ts

@@ -128,6 +128,11 @@ export class ProfileChangeNameEmployeeController extends Controller {
 
     await this.changeNameRepository.save(data);
 
+    profile.firstName = body.firstName ?? profile.firstName;
+    profile.lastName = body.lastName ?? profile.lastName;
+    profile.prefix = body.prefix ?? profile.prefix;
+    await this.profileEmployeeRepo.save(profile);
+    
     return new HttpSuccess(data.id);
   }
 
@@ -154,7 +159,26 @@ export class ProfileChangeNameEmployeeController extends Controller {
       this.changeNameHistoryRepository.save(history),
     ]);
 
-    return new HttpSuccess();
+    const chkLastRecord = await this.changeNameRepository.findOne({
+      where:{
+        profileEmployeeId: record.profileEmployeeId
+      },
+      order:{
+        createdAt: "DESC"
+      }
+    })
+    if (!chkLastRecord) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    
+    const profile = await this.profileEmployeeRepo.findOneBy({ id: record.profileEmployeeId });
+    
+    if (profile && chkLastRecord.id === record.id) {
+      profile.firstName = body.firstName ?? profile.firstName;
+      profile.lastName = body.lastName ?? profile.lastName;
+      profile.prefix = body.prefix ?? profile.prefix;
+      await this.profileEmployeeRepo.save(profile);
+    }
+
+    return new HttpSuccess([chkLastRecord.id,record.id]);
   }
 
   @Delete("{changeNameId}")

src/controllers/ProfileChildrenController.ts

@@ -0,0 +1,117 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Example,
+  Get,
+  Patch,
+  Path,
+  Post,
+  Request,
+  Route,
+  Security,
+  Tags,
+} from "tsoa";
+import { AppDataSource } from "../database/data-source";
+import HttpSuccess from "../interfaces/http-success";
+import HttpStatus from "../interfaces/http-status";
+import HttpError from "../interfaces/http-error";
+import { ProfileChildrenHistory } from "../entities/ProfileChildrenHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { Profile } from "../entities/Profile";
+import {
+  CreateProfileChildren,
+  ProfileChildren,
+  UpdateProfileChildren,
+} from "../entities/ProfileChildren";
+
+@Route("api/v1/org/profile/children")
+@Tags("ProfileChildren")
+@Security("bearerAuth")
+export class ProfileChildrenController extends Controller {
+  private profileRepository = AppDataSource.getRepository(Profile);
+  private childrenRepository = AppDataSource.getRepository(ProfileChildren);
+  private childrenHistoryRepository = AppDataSource.getRepository(ProfileChildrenHistory);
+
+  @Get("{profileId}")
+  public async getChildren(@Path() profileId: string) {
+    const lists = await this.childrenRepository.find({
+      where: { profileId: profileId },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("history/{childrenId}")
+  public async childrenHistory(@Path() childrenId: string) {
+    const record = await this.childrenHistoryRepository.find({
+      where: { profileChildrenId: childrenId },
+      order: { createdAt: "DESC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newChildren(@Request() req: RequestWithUser, @Body() body: CreateProfileChildren) {
+    const profile = await this.profileRepository.findOneBy({ id: body.profileId });
+
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+
+    const data = new ProfileChildren();
+
+    const meta = {
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+
+    await this.childrenRepository.save(data);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{childrenId}")
+  public async editChildren(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileChildren,
+    @Path() childrenId: string,
+  ) {
+    const record = await this.childrenRepository.findOneBy({ id: childrenId });
+
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    const history = new ProfileChildrenHistory();
+
+    Object.assign(history, { ...record, id: undefined });
+    Object.assign(record, body);
+    history.profileChildrenId = childrenId;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateFullName = req.user.name;
+
+    await Promise.all([
+      this.childrenRepository.save(record),
+      this.childrenHistoryRepository.save(history),
+    ]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{childrenId}")
+  public async deleteTraning(@Path() childrenId: string) {
+    await this.childrenHistoryRepository.delete({
+      profileChildrenId: childrenId,
+    });
+
+    const result = await this.childrenRepository.delete({ id: childrenId });
+
+    if (result.affected && result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}

src/controllers/ProfileChildrenEmployeeController.ts

@@ -0,0 +1,122 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Example,
+  Get,
+  Patch,
+  Path,
+  Post,
+  Request,
+  Route,
+  Security,
+  Tags,
+} from "tsoa";
+import { AppDataSource } from "../database/data-source";
+import HttpSuccess from "../interfaces/http-success";
+import HttpStatus from "../interfaces/http-status";
+import HttpError from "../interfaces/http-error";
+import { ProfileChildrenHistory } from "../entities/ProfileChildrenHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { Profile } from "../entities/Profile";
+import {
+  CreateProfileChildren,
+  CreateProfileChildrenEmployee,
+  ProfileChildren,
+  UpdateProfileChildren,
+} from "../entities/ProfileChildren";
+import { ProfileEmployee } from "../entities/ProfileEmployee";
+
+@Route("api/v1/org/profile-employee/children")
+@Tags("ProfileChildren")
+@Security("bearerAuth")
+export class ProfileChildrenEmployeeController extends Controller {
+  private profileRepository = AppDataSource.getRepository(ProfileEmployee);
+  private childrenRepository = AppDataSource.getRepository(ProfileChildren);
+  private childrenHistoryRepository = AppDataSource.getRepository(ProfileChildrenHistory);
+
+  @Get("{profileId}")
+  public async getChildren(@Path() profileId: string) {
+    const lists = await this.childrenRepository.find({
+      where: { profileEmployeeId: profileId },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("history/{childrenId}")
+  public async childrenHistory(@Path() childrenId: string) {
+    const record = await this.childrenHistoryRepository.find({
+      where: { profileChildrenId: childrenId },
+      order: { createdAt: "DESC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newChildren(
+    @Request() req: RequestWithUser,
+    @Body() body: CreateProfileChildrenEmployee,
+  ) {
+    const profile = await this.profileRepository.findOneBy({ id: body.profileEmployeeId });
+
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+
+    const data = new ProfileChildren();
+
+    const meta = {
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+
+    await this.childrenRepository.save(data);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{childrenId}")
+  public async editChildren(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileChildren,
+    @Path() childrenId: string,
+  ) {
+    const record = await this.childrenRepository.findOneBy({ id: childrenId });
+
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    const history = new ProfileChildrenHistory();
+
+    Object.assign(history, { ...record, id: undefined });
+    Object.assign(record, body);
+    history.profileChildrenId = childrenId;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateFullName = req.user.name;
+
+    await Promise.all([
+      this.childrenRepository.save(record),
+      this.childrenHistoryRepository.save(history),
+    ]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{childrenId}")
+  public async deleteTraning(@Path() childrenId: string) {
+    await this.childrenHistoryRepository.delete({
+      profileChildrenId: childrenId,
+    });
+
+    const result = await this.childrenRepository.delete({ id: childrenId });
+
+    if (result.affected && result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}

src/controllers/ProfileController.ts

@@ -195,6 +195,10 @@ export class ProfileController extends Controller {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่งนี้");
     }
 
+    if (body.citizenId && (await this.profileRepo.findOneBy({ citizenId: body.citizenId }))) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ข้อมูลรหัสบัตรประจำตัวประชาชนนี้มีอยู่ในระบบแล้ว");
+    }
+
     const profile = Object.assign(new Profile(), body);
     profile.isProbation = false;
     profile.isLeave = false;
@@ -218,7 +222,7 @@ export class ProfileController extends Controller {
     @Request() request: RequestWithUser,
     @Body() body: CreateProfileAllFields,
   ) {
-    const profileExist = await this.profileRepo.findOneBy({ citizenId: body.citizenId })
+    const profileExist = await this.profileRepo.findOneBy({ citizenId: body.citizenId });
     if (profileExist) {
       return new HttpSuccess(profileExist.id);
     }
@@ -755,11 +759,11 @@ export class ProfileController extends Controller {
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
 
-    const position = await this.positionRepository.findOne({ 
+    const position = await this.positionRepository.findOne({
       relations: ["posExecutive"],
-      where: { 
+      where: {
-        posMasterId: posMaster?.id 
+        posMasterId: posMaster?.id,
-      } 
+      },
     });
 
     const _profile: any = {
@@ -777,15 +781,16 @@ export class ProfileController extends Controller {
       posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
       posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
       posTypeId: profile.posType == null ? null : profile.posType.id,
-      posExecutiveName: position == null || position.posExecutive == null 
+      posExecutiveName:
-        ? null 
+        position == null || position.posExecutive == null
-        : position.posExecutive.posExecutiveName,
+          ? null
-      posExecutivePriority: position == null || position.posExecutive == null 
+          : position.posExecutive.posExecutiveName,
-        ? null 
+      posExecutivePriority:
-        : position.posExecutive.posExecutivePriority,
+        position == null || position.posExecutive == null
-      posExecutiveId: position == null || position.posExecutive == null 
+          ? null
-        ? null 
+          : position.posExecutive.posExecutivePriority,
-        : position.posExecutive.id,
+      posExecutiveId:
+        position == null || position.posExecutive == null ? null : position.posExecutive.id,
       rootId:
         profile.current_holders == null ||
         profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot ==
@@ -1725,7 +1730,7 @@ export class ProfileController extends Controller {
       .leftJoinAndSelect("posMaster.positions", "positions")
       .leftJoinAndSelect("positions.posExecutive", "posExecutive")
       .leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
-      .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
+      .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines")
       .leftJoinAndSelect("current_holder.posLevel", "posLevel")
       .leftJoinAndSelect("current_holder.posType", "posType")
       .where((qb) => {
@@ -1886,7 +1891,7 @@ export class ProfileController extends Controller {
         result: null,
         duration: null,
         isPunish:
-          item.current_holder.profileDiscipline.filter(
+          item.current_holder.profileDisciplines.filter(
             (x: any) =>
               new Date(
                 `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
@@ -1933,14 +1938,14 @@ export class ProfileController extends Controller {
     const posMaster = await this.posMasterRepo.findOne({
       where: {
         current_holderId: profile.id,
-        orgRevisionId: revisionId
+        orgRevisionId: revisionId,
-      }
+      },
     });
-    const position = await this.positionRepository.findOne({ 
+    const position = await this.positionRepository.findOne({
       relations: ["posExecutive"],
-      where: { 
+      where: {
-        posMasterId: posMaster?.id 
+        posMasterId: posMaster?.id,
-      } 
+      },
     });
 
     const _profile = {
@@ -1957,15 +1962,16 @@ export class ProfileController extends Controller {
       posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
       posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
       posTypeId: profile.posType == null ? null : profile.posType.id,
-      posExecutiveName: position == null || position.posExecutive == null 
+      posExecutiveName:
-        ? null 
+        position == null || position.posExecutive == null
-        : position.posExecutive.posExecutiveName,
+          ? null
-      posExecutivePriority: position == null || position.posExecutive == null 
+          : position.posExecutive.posExecutiveName,
-        ? null 
+      posExecutivePriority:
-        : position.posExecutive.posExecutivePriority,
+        position == null || position.posExecutive == null
-      posExecutiveId: position == null || position.posExecutive == null 
+          ? null
-        ? null 
+          : position.posExecutive.posExecutivePriority,
-        : position.posExecutive.id,
+      posExecutiveId:
+        position == null || position.posExecutive == null ? null : position.posExecutive.id,
       rootId:
         profile.current_holders == null ||
         profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||

src/controllers/ProfileDisciplineController.ts

@@ -169,7 +169,7 @@ export class ProfileDisciplineController extends Controller {
   }
 
   @Delete("{disciplineId}")
-  public async deleteTraning(@Path() disciplineId: string) {
+  public async deleteDiscipline(@Path() disciplineId: string) {
     await this.disciplineHistoryRepository.delete({
       profileDisciplineId: disciplineId,
     });

src/controllers/ProfileDisciplineEmployeeController.ts

@@ -145,7 +145,7 @@ export class ProfileDisciplineEmployeeController extends Controller {
   }
 
   @Delete("{disciplineId}")
-  public async deleteTraning(@Path() disciplineId: string) {
+  public async deleteDiscipline(@Path() disciplineId: string) {
     await this.disciplineHistoryRepository.delete({
       profileDisciplineId: disciplineId,
     });

src/controllers/ProfileDutyController.ts

@@ -157,7 +157,7 @@ export class ProfileDutyController extends Controller {
   }
 
   @Delete("{dutyId}")
-  public async deleteTraning(@Path() dutyId: string) {
+  public async deleteDuty(@Path() dutyId: string) {
     await this.dutyHistoryRepository.delete({
       profileDutyId: dutyId,
     });

src/controllers/ProfileDutyEmployeeController.ts

@@ -118,7 +118,7 @@ export class ProfileDutyEmployeeController extends Controller {
   }
 
   @Delete("{dutyId}")
-  public async deleteTraning(@Path() dutyId: string) {
+  public async deleteDuty(@Path() dutyId: string) {
     await this.dutyHistoryRepository.delete({
       profileDutyId: dutyId,
     });

src/controllers/ProfileEmployeeController.ts

@@ -33,7 +33,7 @@ import { EmployeePosType } from "../entities/EmployeePosType";
 import { RequestWithUser } from "../middlewares/user";
 
 @Route("api/v1/org/profile-employee")
-@Tags("Profile")
+@Tags("ProfileEmployee")
 @Security("bearerAuth")
 @Response(
   HttpStatus.INTERNAL_SERVER_ERROR,
@@ -975,7 +975,7 @@ export class ProfileEmployeeController extends Controller {
       .leftJoinAndSelect("employeePosMaster.orgChild4", "orgChild4")
       .leftJoinAndSelect("employeePosMaster.positions", "positions")
       .leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
-      .leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
+      .leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines")
       .leftJoinAndSelect("current_holder.posLevel", "posLevel")
       .leftJoinAndSelect("current_holder.posType", "posType")
       .where((qb) => {
@@ -1128,7 +1128,7 @@ export class ProfileEmployeeController extends Controller {
         result: null,
         duration: null,
         isPunish:
-          item.current_holder.profileDiscipline.filter(
+          item.current_holder.profileDisciplines.filter(
             (x: any) =>
               new Date(
                 `${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,

src/controllers/ProfileFamilyHistoryController.ts

@@ -16,8 +16,6 @@ import { AppDataSource } from "../database/data-source";
 import {
   CreateChildren,
   CreateProfileFamily,
-  ProfileChildren,
-  ProfileChildrenHistory,
   ProfileFamilyHistory,
   UpdateProfileFamily,
 } from "../entities/ProfileFamily";
@@ -26,6 +24,8 @@ import HttpStatus from "../interfaces/http-status";
 import HttpError from "../interfaces/http-error";
 import { RequestWithUser } from "../middlewares/user";
 import { Profile } from "../entities/Profile";
+import { ProfileChildren } from "../entities/ProfileChildren";
+import { ProfileChildrenHistory } from "../entities/ProfileChildrenHistory";
 
 @Route("api/v1/org/profile/family")
 @Tags("ProfileFamilyHistory")
@@ -228,7 +228,7 @@ export class ProfileFamilyHistoryController extends Controller {
         ...v,
         children: await this.childrenHistoryRepo.find({
           order: { createdAt: "ASC" },
-          where: { profileFamilyHistoryId: v.id },
+          //   where: { profileFamilyHistoryId: v.id },
         }),
       })),
     );
@@ -340,7 +340,7 @@ export class ProfileFamilyHistoryController extends Controller {
           return await this.childrenHistoryRepo.save(
             this.childrenHistoryRepo.create({
               ...v,
-              profileFamilyHistoryId: familyRecord.id,
+              //   profileFamilyHistoryId: familyRecord.id,
               profileChildrenId: v.id,
               id: undefined,
             }),

src/controllers/ProfileFamilyHistoryEmployeeController.ts

@@ -15,10 +15,7 @@ import {
 import { AppDataSource } from "../database/data-source";
 import {
   CreateChildren,
-  CreateProfileFamily,
   CreateProfileFamilyEmployee,
-  ProfileChildren,
-  ProfileChildrenHistory,
   ProfileFamilyHistory,
   UpdateProfileFamily,
 } from "../entities/ProfileFamily";
@@ -26,8 +23,9 @@ import HttpSuccess from "../interfaces/http-success";
 import HttpStatus from "../interfaces/http-status";
 import HttpError from "../interfaces/http-error";
 import { RequestWithUser } from "../middlewares/user";
-import { Profile } from "../entities/Profile";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
+import { ProfileChildren } from "../entities/ProfileChildren";
+import { ProfileChildrenHistory } from "../entities/ProfileChildrenHistory";
 
 @Route("api/v1/org/profile-employee/family")
 @Tags("ProfileFamilyHistoryEmployee")
@@ -230,7 +228,7 @@ export class ProfileFamilyHistoryEmployeeController extends Controller {
         ...v,
         children: await this.childrenHistoryRepo.find({
           order: { createdAt: "ASC" },
-          where: { profileFamilyHistoryId: v.id },
+          //   where: { profileFamilyHistoryId: v.id },
         }),
       })),
     );
@@ -342,7 +340,7 @@ export class ProfileFamilyHistoryEmployeeController extends Controller {
           return await this.childrenHistoryRepo.save(
             this.childrenHistoryRepo.create({
               ...v,
-              profileFamilyHistoryId: familyRecord.id,
+              //   profileFamilyHistoryId: familyRecord.id,
               profileChildrenId: v.id,
               id: undefined,
             }),
@@ -361,7 +359,7 @@ export class ProfileFamilyHistoryEmployeeController extends Controller {
     if (result.affected == undefined || result.affected <= 0) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }
-    
+
     return new HttpSuccess();
   }
 }

src/controllers/ProfileLeaveController.ts

@@ -221,7 +221,7 @@ export class ProfileLeaveController extends Controller {
   }
 
   @Delete("{leaveId}")
-  public async deleteTraning(@Path() leaveId: string) {
+  public async deleteLeave(@Path() leaveId: string) {
     await this.leaveHistoryRepo.delete({
       profileLeaveId: leaveId,
     });

src/controllers/ProfileLeaveEmployeeController.ts

@@ -119,7 +119,7 @@ export class ProfileLeaveEmployeeController extends Controller {
   }
 
   @Delete("{leaveId}")
-  public async deleteTraning(@Path() leaveId: string) {
+  public async deleteLeave(@Path() leaveId: string) {
     await this.leaveHistoryRepo.delete({
       profileLeaveId: leaveId,
     });

src/controllers/ProfileOtherController.ts

@@ -134,7 +134,7 @@ export class ProfileOtherController extends Controller {
   }
 
   @Delete("{otherId}")
-  public async deleteTraning(@Path() otherId: string) {
+  public async deleteOther(@Path() otherId: string) {
     await this.otherHistoryRepository.delete({
       profileOtherId: otherId,
     });

src/controllers/ProfileOtherEmployeeController.ts

@@ -105,7 +105,7 @@ export class ProfileOtherEmployeeController extends Controller {
   }
 
   @Delete("{otherId}")
-  public async deleteTraning(@Path() otherId: string) {
+  public async deleteOther(@Path() otherId: string) {
     await this.otherHistoryRepository.delete({
       profileOtherId: otherId,
     });

src/entities/Profile.ts

@@ -4,7 +4,6 @@ import { PosMaster } from "./PosMaster";
 import { PosLevel } from "./PosLevel";
 import { PosType } from "./PosType";
 import { ProfileSalary } from "./ProfileSalary";
-import { ProfileDiscipline } from "./ProfileDiscipline";
 import { ProfileCertificate } from "./ProfileCertificate";
 import { ProfileEducation } from "./ProfileEducation";
 import { ProfileTraining } from "./ProfileTraining";
@@ -16,7 +15,7 @@ import { ProfileAbility } from "./ProfileAbility";
 import { ProfileDuty } from "./ProfileDuty";
 import { ProfileNopaid } from "./ProfileNopaid";
 import { ProfileOther } from "./ProfileOther";
-import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
+import { ProfileFamilyHistory } from "./ProfileFamily";
 import { ProfileGovernment } from "./ProfileGovernment";
 import { Province } from "./Province";
 import { SubDistrict } from "./SubDistrict";
@@ -25,6 +24,8 @@ import { ProfileAvatar } from "./ProfileAvatar";
 import { ProfileFamilyFather } from "./ProfileFamilyFather";
 import { ProfileFamilyMother } from "./ProfileFamilyMother";
 import { ProfileFamilyCouple } from "./ProfileFamilyCouple";
+import { ProfileChildren } from "./ProfileChildren";
+import { ProfileDiscipline } from "./ProfileDiscipline";
 
 @Entity("profile")
 export class Profile extends EntityBase {
@@ -270,7 +271,7 @@ export class Profile extends EntityBase {
   profileSalary: ProfileSalary[];
 
   @OneToMany(() => ProfileDiscipline, (profileDiscipline) => profileDiscipline.profile)
-  profileDiscipline: ProfileDiscipline[];
+  profileDisciplines: ProfileDiscipline[];
 
   @OneToMany(() => ProfileCertificate, (profileCertificate) => profileCertificate.profile)
   profileCertificates: ProfileCertificate[];
@@ -312,7 +313,7 @@ export class Profile extends EntityBase {
   profileFamily: ProfileFamilyHistory[];
 
   @OneToMany(() => ProfileChildren, (profileChildren) => profileChildren.profile)
-  profileChildren: ProfileChildren[];
+  profileChildrens: ProfileChildren[];
 
   @OneToMany(() => ProfileGovernment, (profileGovernment) => profileGovernment.profile)
   profileGovernment: ProfileGovernment[];

src/entities/ProfileChildren.ts

@@ -0,0 +1,112 @@
+import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm";
+import { EntityBase } from "./base/Base";
+import { Profile } from "./Profile";
+import { ProfileEmployee } from "./ProfileEmployee";
+import { ProfileChildrenHistory } from "./ProfileChildrenHistory";
+
+@Entity("profileChildren")
+export class ProfileChildren extends EntityBase {
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "อาชีพบุตร",
+  })
+  childrenCareer: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "ชื่อบุตร",
+  })
+  childrenFirstName: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "นามสกุลบุตร",
+  })
+  childrenLastName: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "คำนำหน้าบุตร",
+  })
+  childrenPrefix: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    type: "boolean",
+    comment: "มีชีวิตบุตร",
+  })
+  childrenLive: boolean;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "เลขที่บัตรประชาชนบุตร",
+  })
+  childrenCitizenId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    type: "uuid",
+    comment: "คีย์นอก(FK) ของตาราง Profile",
+    default: null,
+  })
+  profileId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง ProfileEmployee",
+    default: null,
+  })
+  profileEmployeeId: string;
+
+  @ManyToOne(() => Profile, (Profile) => Profile.profileChildrens)
+  @JoinColumn({ name: "profileId" })
+  profile: Profile;
+
+  @ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileChildrens)
+  @JoinColumn({ name: "profileEmployeeId" })
+  profileEmployee: ProfileEmployee;
+
+  @OneToMany(
+    () => ProfileChildrenHistory,
+    (profileChildrenHistory) => profileChildrenHistory.histories,
+  )
+  profileChildrenHistories: ProfileChildrenHistory[];
+}
+
+export type CreateProfileChildren = {
+  profileId: string;
+  childrenCareer: string;
+  childrenFirstName: string;
+  childrenLastName: string;
+  childrenPrefix: string;
+  childrenLive: boolean;
+  childrenCitizenId: string;
+};
+
+export type CreateProfileChildrenEmployee = {
+  profileEmployeeId: string;
+  childrenCareer: string;
+  childrenFirstName: string;
+  childrenLastName: string;
+  childrenPrefix: string;
+  childrenLive: boolean;
+  childrenCitizenId: string;
+};
+
+export type UpdateProfileChildren = {
+  id: string;
+  childrenCareer?: string | null;
+  childrenFirstName?: string | null;
+  childrenLastName?: string | null;
+  childrenPrefix?: string | null;
+  childrenLive?: boolean | null;
+  childrenCitizenId?: string | null;
+};

src/entities/ProfileChildrenHistory.ts

@@ -0,0 +1,155 @@
+import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm";
+import { EntityBase } from "./base/Base";
+import { Profile } from "./Profile";
+import { ProfileEmployee } from "./ProfileEmployee";
+import { ProfileChildren } from "./ProfileChildren";
+
+@Entity("profileChildrenHistory")
+export class ProfileChildrenHistory extends EntityBase {
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "อาชีพบุตร",
+  })
+  childrenCareer: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "ชื่อบุตร",
+  })
+  childrenFirstName: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "นามสกุลบุตร",
+  })
+  childrenLastName: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "คำนำหน้าบุตร",
+  })
+  childrenPrefix: string;
+
+  @Column({
+    nullable: true,
+    default: null,
+    type: "boolean",
+    comment: "มีชีวิตบุตร",
+  })
+  childrenLive: boolean;
+
+  @Column({
+    nullable: true,
+    default: null,
+    comment: "เลขที่บัตรประชาชนบุตร",
+  })
+  childrenCitizenId: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง ProfileChildren",
+    default: null,
+  })
+  profileChildrenId: string;
+
+  @ManyToOne(() => ProfileChildren, (profileChildren) => profileChildren.profileChildrenHistories)
+  @JoinColumn({ name: "profileChildrenId" })
+  histories: ProfileChildren;
+}
+
+export type CreateChildren = {
+  childrenCareer: string;
+  childrenFirstName: string;
+  childrenLastName: string;
+  childrenPrefix: string;
+  childrenLive: boolean;
+  childrenCitizenId: string;
+};
+
+export type UpdateChildren = {
+  id: string;
+  childrenCareer?: string | null;
+  childrenFirstName?: string | null;
+  childrenLastName?: string | null;
+  childrenPrefix?: string | null;
+  childrenLive?: boolean | null;
+  childrenCitizenId?: string | null;
+};
+
+export type CreateProfileFamily = {
+  couple: boolean | null;
+  couplePrefix: string | null;
+  coupleFirstName: string | null;
+  coupleLastName: string | null;
+  coupleLastNameOld: string | null;
+  coupleCareer: string | null;
+  coupleCitizenId: string | null;
+  coupleLive: boolean | null;
+  fatherPrefix: string | null;
+  fatherFirstName: string | null;
+  fatherLastName: string | null;
+  fatherCareer: string | null;
+  fatherCitizenId: string | null;
+  fatherLive: boolean | null;
+  motherPrefix: string | null;
+  motherFirstName: string | null;
+  motherLastName: string | null;
+  motherCareer: string | null;
+  motherCitizenId: string | null;
+  motherLive: boolean | null;
+  profileId: string;
+  children: CreateChildren[];
+};
+export type CreateProfileFamilyEmployee = {
+  couple: boolean | null;
+  couplePrefix: string | null;
+  coupleFirstName: string | null;
+  coupleLastName: string | null;
+  coupleLastNameOld: string | null;
+  coupleCareer: string | null;
+  coupleCitizenId: string | null;
+  coupleLive: boolean | null;
+  fatherPrefix: string | null;
+  fatherFirstName: string | null;
+  fatherLastName: string | null;
+  fatherCareer: string | null;
+  fatherCitizenId: string | null;
+  fatherLive: boolean | null;
+  motherPrefix: string | null;
+  motherFirstName: string | null;
+  motherLastName: string | null;
+  motherCareer: string | null;
+  motherCitizenId: string | null;
+  motherLive: boolean | null;
+  profileEmployeeId: string | null;
+  children: CreateChildren[];
+};
+
+export type UpdateProfileFamily = {
+  couple?: boolean | null;
+  couplePrefix?: string | null;
+  coupleFirstName?: string | null;
+  coupleLastName?: string | null;
+  coupleLastNameOld?: string | null;
+  coupleCareer?: string | null;
+  coupleCitizenId?: string | null;
+  coupleLive?: boolean | null;
+  fatherPrefix?: string | null;
+  fatherFirstName?: string | null;
+  fatherLastName?: string | null;
+  fatherCareer?: string | null;
+  fatherCitizenId?: string | null;
+  fatherLive?: boolean | null;
+  motherPrefix?: string | null;
+  motherFirstName?: string | null;
+  motherLastName?: string | null;
+  motherCareer?: string | null;
+  motherCitizenId?: string | null;
+  motherLive?: boolean | null;
+  children: UpdateChildren[];
+};

src/entities/ProfileDiscipline.ts

@@ -75,7 +75,7 @@ export class ProfileDiscipline extends EntityBase {
   )
   profileDisciplineHistories: ProfileDisciplineHistory[];
 
-  @ManyToOne(() => Profile, (profile) => profile.profileDiscipline)
+  @ManyToOne(() => Profile, (profile) => profile.profileDisciplines)
   @JoinColumn({ name: "profileId" })
   profile: Profile;
 

src/entities/ProfileDisciplineEmployee.ts

@@ -1,106 +0,0 @@
-import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
-import { EntityBase } from "./base/Base";
-import { ProfileEmployee } from "./ProfileEmployee";
-import { ProfileDisciplineEmployeeHistory } from "./ProfileDisciplineEmployeeHistory";
-
-@Entity("profileDisciplineEmployee")
-export class ProfileDisciplineEmployee extends EntityBase {
-  @Column({
-    nullable: true,
-    type: "datetime",
-    comment: "วันที่",
-    default: null,
-  })
-  date: Date;
-
-  @Column({
-    length: 40,
-    comment: "ไอดีโปรไฟล์",
-    type: "uuid",
-  })
-  profileId: string;
-
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
-  @Column({
-    nullable: true,
-    comment: "ระดับความผิด",
-    type: "text",
-    default: null,
-  })
-  level: string;
-
-  @Column({
-    nullable: true,
-    comment: "รายละเอียด",
-    type: "text",
-    default: null,
-  })
-  detail: string;
-
-  @Column({
-    nullable: true,
-    type: "datetime",
-    comment: "เอกสารอ้างอิง (ลงวันที่)",
-    default: null,
-  })
-  refCommandDate: Date;
-
-  @Column({
-    nullable: true,
-    comment: "เอกสารอ้างอิง (เลขที่คำสั่ง)",
-    type: "text",
-    default: null,
-  })
-  refCommandNo: string;
-
-  @Column({
-    nullable: true,
-    comment: "ล้างมลทิน",
-    type: "text",
-    default: null,
-  })
-  unStigma: string;
-
-  @OneToMany(
-    () => ProfileDisciplineEmployeeHistory,
-    (profileDisciplineHistory) => profileDisciplineHistory.histories,
-  )
-  profileDisciplineHistories: ProfileDisciplineEmployeeHistory[];
-
-  @ManyToOne(() => ProfileEmployee, (profile) => profile.profileDiscipline)
-  @JoinColumn({ name: "profileId" })
-  profile: ProfileEmployee;
-}
-
-export class CreateProfileDisciplineEmployee {
-  @Column()
-  date: Date | null;
-
-  @Column()
-  profileId: string;
-
-  @Column()
-  isActive: boolean | null;
-
-  @Column()
-  level: string | null;
-
-  @Column()
-  detail: string | null;
-
-  @Column()
-  refCommandDate: Date | null;
-
-  @Column()
-  refCommandNo: string | null;
-
-  @Column()
-  unStigma: string | null;
-}
-
-export type UpdateProfileDisciplineEmployee = Partial<CreateProfileDisciplineEmployee>;

src/entities/ProfileDisciplineEmployeeHistory.ts

@@ -1,74 +0,0 @@
-import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
-import { EntityBase } from "./base/Base";
-import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee";
-
-@Entity("profileDisciplineEmployeeHistory")
-export class ProfileDisciplineEmployeeHistory extends EntityBase {
-  @Column({
-    nullable: true,
-    type: "datetime",
-    comment: "วันที่",
-    default: null,
-  })
-  date: Date;
-
-  @Column({
-    length: 40,
-    comment: "ล้างมลทิน",
-    type: "uuid",
-  })
-  profileDisciplineId: string;
-
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
-  @Column({
-    nullable: true,
-    comment: "ระดับความผิด",
-    type: "text",
-    default: null,
-  })
-  level: string;
-
-  @Column({
-    nullable: true,
-    comment: "รายละเอียด",
-    type: "text",
-    default: null,
-  })
-  detail: string;
-
-  @Column({
-    nullable: true,
-    type: "datetime",
-    comment: "เอกสารอ้างอิง (ลงวันที่)",
-    default: null,
-  })
-  refCommandDate: Date;
-
-  @Column({
-    nullable: true,
-    comment: "เอกสารอ้างอิง (เลขที่คำสั่ง)",
-    type: "text",
-    default: null,
-  })
-  refCommandNo: string;
-
-  @Column({
-    nullable: true,
-    comment: "ล้างมลทิน",
-    type: "text",
-    default: null,
-  })
-  unStigma: string;
-
-  @ManyToOne(
-    () => ProfileDisciplineEmployee,
-    (profileDiscipline) => profileDiscipline.profileDisciplineHistories,
-  )
-  @JoinColumn({ name: "profileDisciplineId" })
-  histories: ProfileDisciplineEmployee;
-}

src/entities/ProfileEmployee.ts

@@ -4,7 +4,6 @@ import { EmployeePosLevel } from "./EmployeePosLevel";
 import { EmployeePosType } from "./EmployeePosType";
 import { EmployeePosMaster } from "./EmployeePosMaster";
 import { ProfileSalaryEmployee } from "./ProfileSalaryEmployee";
-import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee";
 import { ProfileCertificate } from "./ProfileCertificate";
 import { ProfileTraining } from "./ProfileTraining";
 import { ProfileInsignia } from "./ProfileInsignia";
@@ -15,7 +14,7 @@ import { ProfileDuty } from "./ProfileDuty";
 import { ProfileNopaid } from "./ProfileNopaid";
 import { ProfileDiscipline } from "./ProfileDiscipline";
 import { ProfileChangeName } from "./ProfileChangeName";
-import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
+import { ProfileFamilyHistory } from "./ProfileFamily";
 import { ProfileEducation } from "./ProfileEducation";
 import { ProfileAbility } from "./ProfileAbility";
 import { ProfileOther } from "./ProfileOther";
@@ -25,6 +24,7 @@ import { ProfileFamilyFather } from "./ProfileFamilyFather";
 import { ProfileFamilyMother } from "./ProfileFamilyMother";
 import { ProfileFamilyCouple } from "./ProfileFamilyCouple";
 
+import { ProfileChildren } from "./ProfileChildren";
 @Entity("profileEmployee")
 export class ProfileEmployee extends EntityBase {
   @Column({
@@ -220,9 +220,6 @@ export class ProfileEmployee extends EntityBase {
   @OneToMany(() => ProfileSalaryEmployee, (v) => v.profile)
   profileSalary: ProfileSalaryEmployee[];
 
-  @OneToMany(() => ProfileDisciplineEmployee, (v) => v.profile)
-  profileDiscipline: ProfileDisciplineEmployee[];
-
   @OneToMany(() => ProfileCertificate, (v) => v.profileEmployee)
   profileCertificates: ProfileCertificate[];
 

src/entities/ProfileFamily.ts

@@ -167,114 +167,11 @@ export class ProfileFamilyHistory extends EntityBase {
   @ManyToOne(() => Profile, (v) => v.profileFamily)
   profile: Profile;
 
-  @OneToMany(() => ProfileChildrenHistory, (v) => v.profileFamilyHistory)
-  profileChildrenHistories: ProfileChildrenHistory[];
-
   @ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileFamilys)
   @JoinColumn({ name: "profileEmployeeId" })
   profileEmployee: ProfileEmployee;
 }
 
-@Entity("profileChildren")
-export class ProfileChildren extends EntityBase {
-  @Column({
-    nullable: true,
-    default: null,
-    comment: "อาชีพบุตร",
-  })
-  childrenCareer: string;
-
-  @Column({
-    nullable: true,
-    default: null,
-    comment: "ชื่อบุตร",
-  })
-  childrenFirstName: string;
-
-  @Column({
-    nullable: true,
-    default: null,
-    comment: "นามสกุลบุตร",
-  })
-  childrenLastName: string;
-
-  @Column({
-    nullable: true,
-    default: null,
-    comment: "คำนำหน้าบุตร",
-  })
-  childrenPrefix: string;
-
-  @Column({
-    nullable: true,
-    default: null,
-    type: "boolean",
-    comment: "มีชีวิตบุตร",
-  })
-  childrenLive: boolean;
-
-  @Column({
-    nullable: true,
-    default: null,
-    comment: "เลขที่บัตรประชาชนบุตร",
-  })
-  childrenCitizenId: string;
-
-  @Column({
-    nullable: true,
-    length: 40,
-    type: "uuid",
-    comment: "คีย์นอก(FK) ของตาราง Profile",
-    default: null,
-  })
-  profileId: string;
-
-  @Column({
-    nullable: true,
-    length: 40,
-    comment: "คีย์นอก(FK)ของตาราง ProfileEmployee",
-    default: null,
-  })
-  profileEmployeeId: string;
-
-  @ManyToOne(() => Profile, (v) => v.profileFamily, { onDelete: "CASCADE" })
-  profile: Profile;
-
-  @OneToMany(() => ProfileChildrenHistory, (v) => v.profileChildren)
-  histories: Profile;
-  
-  @ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileChildrens)
-  @JoinColumn({ name: "profileEmployeeId" })
-  profileEmployee: ProfileEmployee;
-}
-
-@Entity("profileChildrenHistory")
-export class ProfileChildrenHistory extends ProfileChildren {
-  @Column({
-    nullable: true,
-    length: 40,
-    type: "uuid",
-    comment: "คีย์นอก(FK) ของตาราง Profile",
-    default: null,
-  })
-  profileFamilyHistoryId: string;
-
-  @ManyToOne(() => ProfileFamilyHistory, (v) => v.profileChildrenHistories, { onDelete: "CASCADE" })
-  profileFamilyHistory: ProfileFamilyHistory;
-
-  @Column({
-    nullable: true,
-    length: 40,
-    type: "uuid",
-    comment: "คีย์นอก(FK) ของตาราง Profile",
-    default: null,
-  })
-  profileChildrenId: string;
-
-  @ManyToOne(() => ProfileChildren, (v) => v.histories, { onDelete: "CASCADE" })
-  profileChildren: ProfileChildren;
-}
-
 export type CreateChildren = {
   childrenCareer: string;
   childrenFirstName: string;

src/migration/1715682448384-add_table_ProfileChildren.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddTableProfileChildren1715682448384 implements MigrationInterface {
+    name = 'AddTableProfileChildren1715682448384'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP FOREIGN KEY \`FK_a0467be33be13ab1ba0b21acc7a\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP FOREIGN KEY \`FK_b357180653180284b853f0bb18d\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP FOREIGN KEY \`FK_ff56943048f9616e96cd8e3507d\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP FOREIGN KEY \`FK_6a37dfb48ea6108cba60b9d4f69\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildren\` DROP FOREIGN KEY \`FK_b7de772d753b42334c98536eccb\``);
+        await queryRunner.query(`DROP INDEX \`FK_f5758428d496b6d2a051c8af92b\` ON \`profileSalary\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP COLUMN \`profileEmployeeId\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP COLUMN \`profileFamilyHistoryId\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP COLUMN \`profileId\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` CHANGE \`profileChildrenId\` \`profileChildrenId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง ProfileChildren'`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD CONSTRAINT \`FK_ff56943048f9616e96cd8e3507d\` FOREIGN KEY (\`profileChildrenId\`) REFERENCES \`profileChildren\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`profileChildren\` ADD CONSTRAINT \`FK_b7de772d753b42334c98536eccb\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileChildren\` DROP FOREIGN KEY \`FK_b7de772d753b42334c98536eccb\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` DROP FOREIGN KEY \`FK_ff56943048f9616e96cd8e3507d\``);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` CHANGE \`profileChildrenId\` \`profileChildrenId\` varchar(40) NULL COMMENT 'คีย์นอก(FK) ของตาราง Profile'`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD \`profileId\` varchar(40) NULL COMMENT 'คีย์นอก(FK) ของตาราง Profile'`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD \`profileFamilyHistoryId\` varchar(40) NULL COMMENT 'คีย์นอก(FK) ของตาราง Profile'`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD \`profileEmployeeId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง ProfileEmployee'`);
+        await queryRunner.query(`CREATE INDEX \`FK_f5758428d496b6d2a051c8af92b\` ON \`profileSalary\` (\`profileEmployeeId\`)`);
+        await queryRunner.query(`ALTER TABLE \`profileChildren\` ADD CONSTRAINT \`FK_b7de772d753b42334c98536eccb\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD CONSTRAINT \`FK_6a37dfb48ea6108cba60b9d4f69\` FOREIGN KEY (\`profileEmployeeId\`) REFERENCES \`profileEmployee\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD CONSTRAINT \`FK_ff56943048f9616e96cd8e3507d\` FOREIGN KEY (\`profileChildrenId\`) REFERENCES \`profileChildren\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD CONSTRAINT \`FK_b357180653180284b853f0bb18d\` FOREIGN KEY (\`profileId\`) REFERENCES \`profile\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`profileChildrenHistory\` ADD CONSTRAINT \`FK_a0467be33be13ab1ba0b21acc7a\` FOREIGN KEY (\`profileFamilyHistoryId\`) REFERENCES \`profileFamilyHistory\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+}