แก้ไขชื่อ และเงื่อนไขตอนลบ

src/controllers/ProfileDisciplineEmployeeController.ts

@@ -68,30 +68,6 @@ export class ProfileDisciplineEmployeeController extends Controller {
   }
 
   @Get("history/{disciplineId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        date: "2024-03-12T10:09:47.000Z",
-        level: "string",
-        detail: "string",
-        unStigma: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-      {
-        id: "ba0e2f82-014e-46c6-8b82-a7c28eb5325f",
-        date: "2024-03-12T10:09:47.000Z",
-        level: "string",
-        detail: "string",
-        unStigma: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async disciplineHistory(@Path() disciplineId: string) {
     const record = await this.disciplineHistoryRepository.find({
       where: { profileDisciplineId: disciplineId },
@@ -176,7 +152,7 @@ export class ProfileDisciplineEmployeeController extends Controller {
 
     const result = await this.disciplineRepository.delete({ id: disciplineId });
 
-    if (result.affected && result.affected <= 0) {
+    if (result.affected == undefined || result.affected <= 0) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }
 

src/controllers/ProfileDutyEmployeeController.ts

@@ -21,30 +21,15 @@ import { RequestWithUser } from "../middlewares/user";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
 import { CreateProfileEmployeeDuty, ProfileDuty, UpdateProfileDuty } from "../entities/ProfileDuty";
 
-@Route("api/v1/org/profile/duty")
+@Route("api/v1/org/profile-employee/duty")
 @Tags("ProfileDuty")
 @Security("bearerAuth")
-export class ProfileDutyController extends Controller {
+export class ProfileDutyEmployeeController extends Controller {
   private profileRepository = AppDataSource.getRepository(ProfileEmployee);
   private dutyRepository = AppDataSource.getRepository(ProfileDuty);
   private dutyHistoryRepository = AppDataSource.getRepository(ProfileDutyHistory);
 
   @Get("{profileId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        dateStart: "2024-03-12T10:09:47.000Z",
-        dateEnd: "string",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async getDuty(@Path() profileId: string) {
     const lists = await this.dutyRepository.find({
       where: { profileEmployeeId: profileId },
@@ -62,30 +47,6 @@ export class ProfileDutyController extends Controller {
   }
 
   @Get("history/{dutyId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        dateStart: "2024-03-12T10:09:47.000Z",
-        dateEnd: "string",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        dateStart: "2024-03-12T10:09:47.000Z",
-        dateEnd: "string",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async dutyHistory(@Path() dutyId: string) {
     const record = await this.dutyHistoryRepository.find({
       where: { profileDutyId: dutyId },
@@ -164,7 +125,7 @@ export class ProfileDutyController extends Controller {
 
     const result = await this.dutyRepository.delete({ id: dutyId });
 
-    if (result.affected && result.affected <= 0) {
+    if (result.affected == undefined || result.affected <= 0) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }
 

src/controllers/ProfileEmployeeLeaveController.ts

@@ -1,237 +0,0 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Example,
-  Get,
-  Patch,
-  Path,
-  Post,
-  Request,
-  Route,
-  Security,
-  Tags,
-} from "tsoa";
-import { AppDataSource } from "../database/data-source";
-import {
-  ProfileLeaveHistory,
-  CreateProfileEmployeeLeave,
-  ProfileLeave,
-  UpdateProfileLeave,
-} from "../entities/ProfileLeave";
-import HttpSuccess from "../interfaces/http-success";
-import HttpStatus from "../interfaces/http-status";
-import HttpError from "../interfaces/http-error";
-
-import { RequestWithUser } from "../middlewares/user";
-import { LeaveType } from "../entities/LeaveType";
-import { ProfileEmployee } from "../entities/ProfileEmployee";
-
-@Route("api/v1/org/profile/leave")
-@Tags("ProfileLeave")
-@Security("bearerAuth")
-export class ProfileLeaveController extends Controller {
-  private profileRepo = AppDataSource.getRepository(ProfileEmployee);
-  private leaveRepo = AppDataSource.getRepository(ProfileLeave);
-  private leaveHistoryRepo = AppDataSource.getRepository(ProfileLeaveHistory);
-  private leaveTypeRepository = AppDataSource.getRepository(LeaveType);
-
-  @Get("{profileId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: {
-      id: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
-      createdAt: "2024-03-20T23:35:45.230Z",
-      createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-      lastUpdatedAt: "2024-03-20T23:40:06.000Z",
-      lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-      createdFullName: "สาวิตรี ศรีสมัย",
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-      profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
-      leaveTypeId: "8dc5e672-b416-4323-b086-06dde8c4353c",
-      dateLeaveStart: "2024-03-21T06:39:46.000Z",
-      dateLeaveEnd: "2024-03-21T06:39:46.000Z",
-      leaveDays: 0,
-      leaveCount: null,
-      totalLeave: 0,
-      status: "string",
-      reason: "string",
-      leaveType: {
-        id: "8dc5e672-b416-4323-b086-06dde8c4353c",
-        createdAt: "2024-02-04T21:28:40.536Z",
-        createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        lastUpdatedAt: "2024-02-04T21:28:40.536Z",
-        lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        createdFullName: "สาวิตรี ศรีสมัย",
-        lastUpdateFullName: "สาวิตรี ศรีสมัย",
-        name: "ลาป่วย",
-        code: "CM-002",
-        limit: 1,
-      },
-    },
-  })
-  public async getLeave(@Path() profileId: string) {
-    const record = await this.leaveRepo.find({
-      relations: { leaveType: true },
-      where: { profileId },
-    });
-    return new HttpSuccess(record);
-  }
-
-  @Get("history/{leaveId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "7eed2e72-d71c-4b3b-a90b-e1b7abdaa838",
-        createdAt: "2024-03-20T23:35:45.230Z",
-        createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        lastUpdatedAt: "2024-03-20T23:40:06.000Z",
-        lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        createdFullName: "สาวิตรี ศรีสมัย",
-        lastUpdateFullName: "สาวิตรี ศรีสมัย",
-        profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
-        leaveTypeId: "8dc5e672-b416-4323-b086-06dde8c4353c",
-        dateLeaveStart: "2024-03-21T06:39:46.000Z",
-        dateLeaveEnd: "2024-03-21T06:39:46.000Z",
-        leaveDays: 0,
-        leaveCount: null,
-        totalLeave: 0,
-        status: "string",
-        reason: "string",
-        leaveType: {
-          id: "8dc5e672-b416-4323-b086-06dde8c4353c",
-          createdAt: "2024-02-04T21:28:40.536Z",
-          createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-          lastUpdatedAt: "2024-02-04T21:28:40.536Z",
-          lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-          createdFullName: "สาวิตรี ศรีสมัย",
-          lastUpdateFullName: "สาวิตรี ศรีสมัย",
-          name: "ลาป่วย",
-          code: "CM-002",
-          limit: 1,
-        },
-        profileLeaveId: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
-      },
-      {
-        id: "b1b9c291-9c96-4cbb-9309-6ff5a2a6e0e8",
-        createdAt: "2024-03-20T23:35:45.230Z",
-        createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        lastUpdatedAt: "2024-03-20T23:35:45.230Z",
-        lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-        createdFullName: "สาวิตรี ศรีสมัย",
-        lastUpdateFullName: "สาวิตรี ศรีสมัย",
-        profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
-        leaveTypeId: "7dc4e314-b456-4323-b086-06dde8c4353c",
-        dateLeaveStart: "2024-03-21T06:34:49.000Z",
-        dateLeaveEnd: "2024-03-21T06:34:49.000Z",
-        leaveDays: 2,
-        leaveCount: null,
-        totalLeave: 200,
-        status: "ไม่ผ่าน",
-        reason: "ติดงานสำคัญ",
-        leaveType: {
-          id: "7dc4e314-b456-4323-b086-06dde8c4353c",
-          createdAt: "2024-02-04T21:28:40.536Z",
-          createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-          lastUpdatedAt: "2024-02-04T21:28:40.536Z",
-          lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-          createdFullName: "สาวิตรี ศรีสมัย",
-          lastUpdateFullName: "สาวิตรี ศรีสมัย",
-          name: "ลาพักร้อน",
-          code: "CM-001",
-          limit: 356,
-        },
-        profileLeaveId: "adbb08a6-d2f4-41b0-a9c1-49e883ca96bc",
-      },
-    ],
-  })
-  public async leaveHistory(@Path() leaveId: string) {
-    const record = await this.leaveHistoryRepo.find({
-      relations: { leaveType: true },
-      where: { profileLeaveId: leaveId },
-    });
-    return new HttpSuccess(record);
-  }
-
-  @Post()
-  public async newLeave(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeLeave) {
-    if (!body.profileEmployeeId) {
-      throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
-    }
-
-    const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
-
-    if (!profile) {
-      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
-    }
-    const leaveType = await this.leaveTypeRepository.findOne({
-      where: { id: body.leaveTypeId },
-    });
-    if (!leaveType) {
-      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
-    }
-
-    const data = new ProfileLeave();
-
-    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.leaveRepo.save(data);
-
-    return new HttpSuccess();
-  }
-
-  @Patch("{leaveId}")
-  public async editLeave(
-    @Request() req: RequestWithUser,
-    @Body() body: UpdateProfileLeave,
-    @Path() leaveId: string,
-  ) {
-    const record = await this.leaveRepo.findOneBy({ id: leaveId });
-
-    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
-
-    const leaveType = await this.leaveTypeRepository.findOne({
-      where: { id: body.leaveTypeId },
-    });
-    if (!leaveType) {
-      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
-    }
-
-    const history = new ProfileLeaveHistory();
-
-    Object.assign(history, { ...record, id: undefined });
-    Object.assign(record, body);
-    history.profileLeaveId = leaveId;
-    record.lastUpdateFullName = req.user.name;
-    history.lastUpdateFullName = req.user.name;
-
-    await Promise.all([this.leaveRepo.save(record), this.leaveHistoryRepo.save(history)]);
-
-    return new HttpSuccess();
-  }
-
-  @Delete("{leaveId}")
-  public async deleteTraning(@Path() leaveId: string) {
-    await this.leaveHistoryRepo.delete({
-      profileLeaveId: leaveId,
-    });
-
-    const result = await this.leaveRepo.delete({ id: leaveId });
-
-    if (result.affected && result.affected <= 0) {
-      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
-    }
-
-    return new HttpSuccess();
-  }
-}

src/controllers/ProfileLeaveEmployeeController.ts

@@ -0,0 +1,135 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Example,
+  Get,
+  Patch,
+  Path,
+  Post,
+  Request,
+  Route,
+  Security,
+  Tags,
+} from "tsoa";
+import { AppDataSource } from "../database/data-source";
+import {
+  ProfileLeaveHistory,
+  CreateProfileEmployeeLeave,
+  ProfileLeave,
+  UpdateProfileLeave,
+} from "../entities/ProfileLeave";
+import HttpSuccess from "../interfaces/http-success";
+import HttpStatus from "../interfaces/http-status";
+import HttpError from "../interfaces/http-error";
+
+import { RequestWithUser } from "../middlewares/user";
+import { LeaveType } from "../entities/LeaveType";
+import { ProfileEmployee } from "../entities/ProfileEmployee";
+
+@Route("api/v1/org/profile-employee/leave")
+@Tags("ProfileLeave")
+@Security("bearerAuth")
+export class ProfileLeaveEmployeeController extends Controller {
+  private profileRepo = AppDataSource.getRepository(ProfileEmployee);
+  private leaveRepo = AppDataSource.getRepository(ProfileLeave);
+  private leaveHistoryRepo = AppDataSource.getRepository(ProfileLeaveHistory);
+  private leaveTypeRepository = AppDataSource.getRepository(LeaveType);
+
+  @Get("{profileId}")
+  public async getLeave(@Path() profileId: string) {
+    const record = await this.leaveRepo.find({
+      relations: { leaveType: true },
+      where: { profileId },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Get("history/{leaveId}")
+  public async leaveHistory(@Path() leaveId: string) {
+    const record = await this.leaveHistoryRepo.find({
+      relations: { leaveType: true },
+      where: { profileLeaveId: leaveId },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newLeave(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeLeave) {
+    if (!body.profileEmployeeId) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
+    }
+
+    const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
+
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    const leaveType = await this.leaveTypeRepository.findOne({
+      where: { id: body.leaveTypeId },
+    });
+    if (!leaveType) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
+    }
+
+    const data = new ProfileLeave();
+
+    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.leaveRepo.save(data);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{leaveId}")
+  public async editLeave(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileLeave,
+    @Path() leaveId: string,
+  ) {
+    const record = await this.leaveRepo.findOneBy({ id: leaveId });
+
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    const leaveType = await this.leaveTypeRepository.findOne({
+      where: { id: body.leaveTypeId },
+    });
+    if (!leaveType) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลประเภทลานี้");
+    }
+
+    const history = new ProfileLeaveHistory();
+
+    Object.assign(history, { ...record, id: undefined });
+    Object.assign(record, body);
+    history.profileLeaveId = leaveId;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateFullName = req.user.name;
+
+    await Promise.all([this.leaveRepo.save(record), this.leaveHistoryRepo.save(history)]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{leaveId}")
+  public async deleteTraning(@Path() leaveId: string) {
+    await this.leaveHistoryRepo.delete({
+      profileLeaveId: leaveId,
+    });
+
+    const result = await this.leaveRepo.delete({ id: leaveId });
+
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}

src/controllers/ProfileNopaidEmployeeController.ts

@@ -25,10 +25,10 @@ import {
   UpdateProfileNopaid,
 } from "../entities/ProfileNopaid";
 
-@Route("api/v1/org/profile/nopaid")
+@Route("api/v1/org/profile-employee/nopaid")
 @Tags("ProfileNopaid")
 @Security("bearerAuth")
-export class ProfileNopaidController extends Controller {
+export class ProfileNopaidEmployeeController extends Controller {
   private profileRepository = AppDataSource.getRepository(ProfileEmployee);
   private nopaidRepository = AppDataSource.getRepository(ProfileNopaid);
   private nopaidHistoryRepository = AppDataSource.getRepository(ProfileNopaidHistory);
@@ -56,28 +56,6 @@ export class ProfileNopaidController extends Controller {
   }
 
   @Get("history/{nopaidId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        date: "2024-03-12T10:09:47.000Z",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        date: "2024-03-12T10:09:47.000Z",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async nopaidHistory(@Path() nopaidId: string) {
     const record = await this.nopaidHistoryRepository.find({
       where: { profileNopaidId: nopaidId },
@@ -151,7 +129,7 @@ export class ProfileNopaidController extends Controller {
 
     const result = await this.nopaidRepository.delete({ id: nopaidId });
 
-    if (result.affected && result.affected <= 0) {
+    if (result.affected == undefined || result.affected <= 0) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }
 

src/controllers/ProfileOtherEmployeeController.ts

@@ -18,7 +18,6 @@ import HttpStatus from "../interfaces/http-status";
 import HttpError from "../interfaces/http-error";
 import { ProfileOtherHistory } from "../entities/ProfileOtherHistory";
 import { RequestWithUser } from "../middlewares/user";
-import { Profile } from "../entities/Profile";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
 import {
   CreateProfileEmployeeOther,
@@ -26,30 +25,15 @@ import {
   UpdateProfileOther,
 } from "../entities/ProfileOther";
 
-@Route("api/v1/org/profile/other")
+@Route("api/v1/org/profile-employee/other")
 @Tags("ProfileOther")
 @Security("bearerAuth")
-export class ProfileOtherController extends Controller {
+export class ProfileOtherEmployeeController extends Controller {
   private profileRepository = AppDataSource.getRepository(ProfileEmployee);
   private otherRepository = AppDataSource.getRepository(ProfileOther);
   private otherHistoryRepository = AppDataSource.getRepository(ProfileOtherHistory);
 
   @Get("{profileId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        isActive: true,
-        date: "2024-03-12T10:09:47.000Z",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async getOther(@Path() profileId: string) {
     const lists = await this.otherRepository.find({
       where: { profileEmployeeId: profileId },
@@ -58,24 +42,6 @@ export class ProfileOtherController extends Controller {
   }
 
   @Get("history/{otherId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        isActive: true,
-        date: "2024-03-12T10:09:47.000Z",
-        detail: "string",
-      },
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        isActive: true,
-        date: "2024-03-12T10:09:47.000Z",
-        detail: "string",
-      },
-    ],
-  })
   public async otherHistory(@Path() otherId: string) {
     const record = await this.otherHistoryRepository.find({
       where: { profileOtherId: otherId },
@@ -146,7 +112,7 @@ export class ProfileOtherController extends Controller {
 
     const result = await this.otherRepository.delete({ id: otherId });
 
-    if (result.affected && result.affected <= 0) {
+    if (result.affected == undefined || result.affected <= 0) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }