Merge branch 'develop' into adiDev

src/controllers/DistrictController.ts

@@ -41,7 +41,7 @@ export class DistrictController extends Controller {
   async GetResult() {
     const _district = await this.districtRepository.find({
       select: ["id", "name", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"],
-      order: { createdAt: "ASC" },
+      order: { name: "ASC" },
     });
     return new HttpSuccess(_district);
   }

src/controllers/ProfileSalaryEmployeeController.ts

@@ -0,0 +1,158 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Example,
+  Get,
+  Patch,
+  Path,
+  Post,
+  Request,
+  Route,
+  Security,
+  Tags,
+} from "tsoa";
+import { AppDataSource } from "../database/data-source";
+import {
+  CreateProfileSalaryEmployee,
+  ProfileSalary,
+  UpdateProfileSalary,
+} from "../entities/ProfileSalary";
+import HttpSuccess from "../interfaces/http-success";
+import HttpStatus from "../interfaces/http-status";
+import HttpError from "../interfaces/http-error";
+import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { Profile } from "../entities/Profile";
+import { ProfileEmployee } from "../entities/ProfileEmployee";
+import { LessThan, MoreThan } from "typeorm";
+
+@Route("api/v1/org/profile-employee/salary")
+@Tags("ProfileSalary")
+@Security("bearerAuth")
+export class ProfileSalaryEmployeeController extends Controller {
+  private profileRepo = AppDataSource.getRepository(ProfileEmployee);
+  private salaryRepo = AppDataSource.getRepository(ProfileSalary);
+  private salaryHistoryRepo = AppDataSource.getRepository(ProfileSalaryHistory);
+
+  @Get("{profileId}")
+  public async getSalary(@Path() profileId: string) {
+    const record = await this.salaryRepo.find({
+      where: { profileEmployeeId: profileId },
+      order: { order: "ASC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Get("history/{salaryId}")
+  public async salaryHistory(@Path() salaryId: string) {
+    const record = await this.salaryHistoryRepo.findBy({
+      profileSalaryId: salaryId,
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newSalary(
+    @Request() req: RequestWithUser,
+    @Body() body: CreateProfileSalaryEmployee,
+  ) {
+    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 dest_item = await this.salaryRepo.findOne({
+      where: { profileId: body.profileEmployeeId },
+      order: { order: "DESC" },
+    });
+
+    const data = new ProfileSalary();
+
+    const meta = {
+      order: dest_item == null ? 1 : dest_item.order + 1,
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+
+    await this.salaryRepo.save(data);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{salaryId}")
+  public async editSalary(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileSalary,
+    @Path() salaryId: string,
+  ) {
+    const record = await this.salaryRepo.findOneBy({ id: salaryId });
+
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    const history = new ProfileSalaryHistory();
+
+    Object.assign(history, { ...record, id: undefined });
+    Object.assign(record, body);
+    history.profileSalaryId = salaryId;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateFullName = req.user.name;
+
+    await Promise.all([this.salaryRepo.save(record), this.salaryHistoryRepo.save(history)]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{salaryId}")
+  public async deleteSalary(@Path() salaryId: string) {
+    await this.salaryHistoryRepo.delete({
+      profileSalaryId: salaryId,
+    });
+
+    const result = await this.salaryRepo.delete({ id: salaryId });
+
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+
+  @Get("swap/{direction}/{salaryId}")
+  public async swapSalary(@Path() direction: string, salaryId: string) {
+    const source_item = await this.salaryRepo.findOne({ where: { id: salaryId } });
+    if (source_item == null) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    const sourceOrder = source_item.order;
+    if (direction.trim().toUpperCase() == "UP") {
+      const dest_item = await this.salaryRepo.findOne({
+        where: { profileId: source_item.profileId, order: LessThan(sourceOrder) },
+        order: { order: "DESC" },
+      });
+      if (dest_item == null) return new HttpSuccess();
+      var destOrder = dest_item.order;
+      dest_item.order = sourceOrder;
+      source_item.order = destOrder;
+      await Promise.all([this.salaryRepo.save(source_item), this.salaryRepo.save(dest_item)]);
+    } else {
+      const dest_item = await this.salaryRepo.findOne({
+        where: { profileId: source_item.profileId, order: MoreThan(sourceOrder) },
+        order: { order: "ASC" },
+      });
+      if (dest_item == null) return new HttpSuccess();
+      var destOrder = dest_item.order;
+      dest_item.order = sourceOrder;
+      source_item.order = destOrder;
+      await Promise.all([this.salaryRepo.save(source_item), this.salaryRepo.save(dest_item)]);
+    }
+    return new HttpSuccess();
+  }
+}

src/controllers/ProvinceController.ts

@@ -41,7 +41,7 @@ export class ProvinceController extends Controller {
   async GetResult() {
     const _province = await this.provinceRepository.find({
       select: ["id", "name", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"],
-      order: { createdAt: "ASC" },
+      order: { name: "ASC" },
     });
     return new HttpSuccess(_province);
   }

src/controllers/SubDistrictController.ts

@@ -41,7 +41,7 @@ export class SubDistrictController extends Controller {
   async GetResult() {
     const _subDistrict = await this.subDistrictRepository.find({
       select: ["id", "name", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"],
-      order: { createdAt: "ASC" },
+      order: { name: "ASC" },
     });
     return new HttpSuccess(_subDistrict);
   }

src/entities/ProfileSalary.ts

@@ -10,6 +10,7 @@ import {
 } from "typeorm";
 import { EntityBase } from "./base/Base";
 import { Profile } from "./Profile";
+import { ProfileEmployee } from "./ProfileEmployee";
 import { ProfileSalaryHistory } from "./ProfileSalaryHistory";
 
 @Entity("profileSalary")
@@ -21,6 +22,14 @@ export class ProfileSalary extends EntityBase {
   })
   profileId: string;
 
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง ProfileEmployee",
+    default: null,
+  })
+  profileEmployeeId: string;
+
   @Column({
     comment: "วันที่",
     type: "datetime",
@@ -137,6 +146,10 @@ export class ProfileSalary extends EntityBase {
   @ManyToOne(() => Profile, (profile) => profile.profileSalary)
   @JoinColumn({ name: "profileId" })
   profile: Profile;
+
+  @ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileSalary)
+  @JoinColumn({ name: "profileEmployeeId" })
+  profileEmployee: ProfileEmployee;
 }
 
 export class CreateProfileSalary {
@@ -156,6 +169,23 @@ export class CreateProfileSalary {
   templateDoc: string | null;
 }
 
+export class CreateProfileSalaryEmployee {
+  profileEmployeeId: string | null;
+  date?: Date | null;
+  amount?: Double | null;
+  positionSalaryAmount?: Double | null;
+  mouthSalaryAmount?: Double | null;
+  posNo: string | null;
+  position: string | null;
+  positionLine: string | null;
+  positionPathSide: string | null;
+  positionExecutive: string | null;
+  positionType: string | null;
+  positionLevel: string | null;
+  refCommandNo: string | null;
+  templateDoc: string | null;
+}
+
 export type UpdateProfileSalary = {
   date?: Date | null;
   amount?: Double | null;