Merge branch 'develop' into adiDev

src/controllers/PermissionController.ts

@@ -14,6 +14,7 @@ import { In } from "typeorm";
 import permission from "../interfaces/permission";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
 import { EmployeePosMaster } from "../entities/EmployeePosMaster";
+import { OrgRevision } from "../entities/OrgRevision";
 const REDIS_HOST = process.env.REDIS_HOST;
 const REDIS_PORT = process.env.REDIS_PORT;
 
@@ -28,6 +29,7 @@ export class PermissionController extends Controller {
   private authRoleRepo = AppDataSource.getRepository(AuthRole);
   private authRoleAttrRepo = AppDataSource.getRepository(AuthRoleAttr);
   private authSysRepo = AppDataSource.getRepository(AuthSys);
+  private orgRevisionRepository = AppDataSource.getRepository(OrgRevision);
   private redis = require("redis");
 
   @Get("")
@@ -118,6 +120,13 @@ export class PermissionController extends Controller {
 
   @Get("menu")
   public async listAuthSys(@Request() request: { user: Record<string, any> }) {
+    const orgRevision = await this.orgRevisionRepository.findOne({
+      select: ["id"],
+      where: { 
+          orgRevisionIsDraft: false,
+          orgRevisionIsCurrent: true,
+      },
+    });
     const redisClient = await this.redis.createClient({
       host: REDIS_HOST,
       port: REDIS_PORT,
@@ -148,10 +157,11 @@ export class PermissionController extends Controller {
         select: ["authRoleId"],
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {
@@ -159,10 +169,11 @@ export class PermissionController extends Controller {
             select: ["authRoleId"],
           where: {
             current_holderId: profile.id,
-            orgRevision: {
-              orgRevisionIsDraft: false,
-              orgRevisionIsCurrent: true,
-            },
+            // orgRevision: {
+            //   orgRevisionIsDraft: false,
+            //   orgRevisionIsCurrent: true,
+            // },
+            orgRevisionId: orgRevision?.id
           },
         });
         if (!posMaster) {

src/controllers/ProfileDevelopmentController.ts

@@ -0,0 +1,231 @@
+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 { ProfileDevelopmentHistory } from "../entities/ProfileDevelopmentHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { Profile } from "../entities/Profile";
+import { CreateProfileDevelopment, ProfileDevelopment, UpdateProfileDevelopment } from "../entities/ProfileDevelopment";
+import permission from "../interfaces/permission";
+import { DevelopmentProject } from "../entities/developmentProject";
+@Route("api/v1/org/profile/development")
+@Tags("ProfileDevelopment")
+@Security("bearerAuth")
+export class ProfileDevelopmentController extends Controller {
+  private profileRepository = AppDataSource.getRepository(Profile);
+  private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
+  private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
+  private developmentProjectRepository = AppDataSource.getRepository(DevelopmentProject);
+
+  @Get("user")
+  public async getDevelopmentUser(@Request() request: { user: Record<string, any> }) {
+    const profile = await this.profileRepository.findOneBy({ keycloak: request.user.sub });
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    const lists = await this.developmentRepository.find({
+      where: { profileId: profile.id },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @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 getDevelopment(@Path() profileId: string, @Request() req: RequestWithUser) {
+    await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
+    const lists = await this.developmentRepository.find({
+      where: { profileId: profileId },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("history/{developmentId}")
+  @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 developmentHistory(@Path() developmentId: string, @Request() req: RequestWithUser) {
+    const _record = await this.developmentRepository.findOneBy({ id: developmentId });
+    if (_record) {
+      await new permission().PermissionOrgUserList(req, "SYS_REGISTRY_OFFICER", _record.profileId);
+    }
+    const record = await this.developmentHistoryRepository.find({
+      where: { profileDevelopmentId: developmentId },
+      order: { createdAt: "DESC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newDevelopment(@Request() req: RequestWithUser, @Body() body: CreateProfileDevelopment) {
+    if (!body.profileId) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
+    }
+    
+    const profile = await this.profileRepository.findOneBy({ id: body.profileId });
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    await new permission().PermissionOrgUserCreate(req, "SYS_REGISTRY_OFFICER", profile.id);
+
+    const data = new ProfileDevelopment();
+
+    const meta = {
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+    const history = new ProfileDevelopmentHistory();
+    Object.assign(history, { ...data, id: undefined });
+
+    await this.developmentRepository.save(data);
+    history.profileDevelopmentId = data.id;
+    await this.developmentHistoryRepository.save(history);
+
+    if (body.developmentProjects != null) {
+        await Promise.all(
+          body.developmentProjects.map(async (x) => {
+            let data1 = new DevelopmentProject();
+            data1.name = x;
+            data1.createdUserId = req.user.sub;
+            data1.createdFullName = req.user.name;
+            data1.lastUpdateUserId = req.user.sub;
+            data1.lastUpdateFullName = req.user.name;
+            data1.profileDevelopmentId = data.id;
+            await this.developmentProjectRepository.save(data1);
+            let data2 = new DevelopmentProject();
+            data2.name = x;
+            data2.createdUserId = req.user.sub;
+            data2.createdFullName = req.user.name;
+            data2.lastUpdateUserId = req.user.sub;
+            data2.lastUpdateFullName = req.user.name;
+            data2.profileDevelopmentId = data.id;
+            await this.developmentProjectRepository.save(data2);
+          }),
+        );
+      }
+    return new HttpSuccess();
+  }
+
+  @Patch("{developmentId}")
+  public async editDevelopment(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileDevelopment,
+    @Path() developmentId: string,
+  ) {
+    const record = await this.developmentRepository.findOne({ where:{id: developmentId},
+        relations: ["developmentProjects"], });
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", record.profileId);
+
+    const history = new ProfileDevelopmentHistory();
+
+    Object.assign(record, body);
+    Object.assign(history, body);
+
+    history.profileDevelopmentId = developmentId;
+    record.lastUpdateUserId = req.user.sub;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateUserId = req.user.sub;
+    history.lastUpdateFullName = req.user.name;
+    history.createdUserId = req.user.sub;
+    history.createdFullName = req.user.name;
+
+    await Promise.all([
+      this.developmentRepository.save(record),
+      this.developmentHistoryRepository.save(history),
+    ]);
+    await this.developmentProjectRepository.remove(record.developmentProjects);
+
+    if (body.developmentProjects != null) {
+        await Promise.all(
+          body.developmentProjects.map(async (x) => {
+            let data1 = new DevelopmentProject();
+            data1.name = x;
+            data1.createdUserId = req.user.sub;
+            data1.createdFullName = req.user.name;
+            data1.lastUpdateUserId = req.user.sub;
+            data1.lastUpdateFullName = req.user.name;
+            data1.profileDevelopmentId = record.id;
+            await this.developmentProjectRepository.save(data1);
+            let data2 = new DevelopmentProject();
+            data2.name = x;
+            data2.createdUserId = req.user.sub;
+            data2.createdFullName = req.user.name;
+            data2.lastUpdateUserId = req.user.sub;
+            data2.lastUpdateFullName = req.user.name;
+            data2.profileDevelopmentId = history.id;
+            await this.developmentProjectRepository.save(data2);
+          }),
+        );
+      }
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{developmentId}")
+  public async deleteDevelopment(@Path() developmentId: string, @Request() req: RequestWithUser) {
+     const _record = await this.developmentRepository.findOneBy({ id: developmentId });
+     if (_record) {
+       await new permission().PermissionOrgUserDelete(req, "SYS_REGISTRY_OFFICER", _record.profileId);
+     }
+     await this.developmentProjectRepository.delete({profileDevelopmentId:developmentId});
+     await this.developmentProjectRepository.delete({profileDevelopmentHistory:{profileDevelopmentId:developmentId}});
+    await this.developmentHistoryRepository.delete({
+      profileDevelopmentId: developmentId,
+    });
+
+    const result = await this.developmentRepository.delete({ id: developmentId });
+
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}

src/controllers/ProfileDevelopmentEmployeeController.ts

@@ -0,0 +1,153 @@
+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 { ProfileDevelopmentHistory } from "../entities/ProfileDevelopmentHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { ProfileEmployee } from "../entities/ProfileEmployee";
+import {
+  CreateProfileEmployeeDevelopment,
+  ProfileDevelopment,
+  UpdateProfileDevelopment,
+} from "../entities/ProfileDevelopment";
+import permission from "../interfaces/permission";
+@Route("api/v1/org/profile-employee/development")
+@Tags("ProfileDevelopment")
+@Security("bearerAuth")
+export class ProfileDevelopmentEmployeeController extends Controller {
+  private profileRepository = AppDataSource.getRepository(ProfileEmployee);
+  private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
+  private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
+
+  @Get("user")
+  public async getDevelopmentUser(@Request() request: RequestWithUser) {
+    const profile = await this.profileRepository.findOneBy({ keycloak: request.user.sub });
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    const lists = await this.developmentRepository.find({
+      where: { profileEmployeeId: profile.id },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("{profileId}")
+  public async getDevelopment(@Path() profileId: string, @Request() req: RequestWithUser) {
+    await new permission().PermissionOrgUserList(req, "SYS_REGISTRY_EMP", profileId);
+    const lists = await this.developmentRepository.find({
+      where: { profileEmployeeId: profileId },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("history/{developmentId}")
+  public async developmentHistory(@Path() developmentId: string, @Request() req: RequestWithUser) {
+    const _record = await this.developmentRepository.findOneBy({ id: developmentId });
+    if (_record) {
+      await new permission().PermissionOrgUserDelete(req, "SYS_REGISTRY_EMP", _record.profileEmployeeId);
+    }
+    const record = await this.developmentHistoryRepository.find({
+      where: { profileDevelopmentId: developmentId },
+      order: { createdAt: "DESC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newDevelopment(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeDevelopment) {
+    if (!body.profileEmployeeId) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
+    }
+
+    const profile = await this.profileRepository.findOneBy({ id: body.profileEmployeeId });
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    await new permission().PermissionOrgUserCreate(req, "SYS_REGISTRY_EMP", profile.id);
+
+    const data = new ProfileDevelopment();
+
+    const meta = {
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+    const history = new ProfileDevelopmentHistory();
+    Object.assign(history, { ...data, id: undefined });
+
+    await this.developmentRepository.save(data);
+    history.profileDevelopmentId = data.id;
+    await this.developmentHistoryRepository.save(history);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{developmentId}")
+  public async editDevelopment(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileDevelopment,
+    @Path() developmentId: string,
+  ) {
+   
+    const record = await this.developmentRepository.findOneBy({ id: developmentId });
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_EMP", record.profileEmployeeId)
+
+    const history = new ProfileDevelopmentHistory();
+
+    Object.assign(record, body);
+    Object.assign(history, body);
+
+    history.profileDevelopmentId = developmentId;
+    record.lastUpdateUserId = req.user.sub;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateUserId = req.user.sub;
+    history.lastUpdateFullName = req.user.name;
+    history.createdUserId = req.user.sub;
+    history.createdFullName = req.user.name;
+
+    await Promise.all([
+      this.developmentRepository.save(record),
+      this.developmentHistoryRepository.save(history),
+    ]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{developmentId}")
+  public async deleteDevelopment(@Path() developmentId: string, @Request() req: RequestWithUser) {
+    const _record = await this.developmentRepository.findOneBy({ id: developmentId });
+    if (_record) {
+      await new permission().PermissionOrgUserDelete(req, "SYS_REGISTRY_EMP", _record.profileEmployeeId);
+    }
+
+    await this.developmentHistoryRepository.delete({
+      profileDevelopmentId: developmentId,
+    });
+
+    const result = await this.developmentRepository.delete({ id: developmentId });
+
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}

src/controllers/ProfileDevelopmentEmployeeTempController.ts

@@ -0,0 +1,147 @@
+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 { ProfileDevelopmentHistory } from "../entities/ProfileDevelopmentHistory";
+import { RequestWithUser } from "../middlewares/user";
+import { ProfileEmployee } from "../entities/ProfileEmployee";
+import {
+  CreateProfileEmployeeDevelopment,
+  ProfileDevelopment,
+  UpdateProfileDevelopment,
+} from "../entities/ProfileDevelopment";
+import permission from "../interfaces/permission";
+@Route("api/v1/org/profile-temp/development")
+@Tags("ProfileDevelopment")
+@Security("bearerAuth")
+export class ProfileDevelopmentEmployeeTempController extends Controller {
+  private profileRepository = AppDataSource.getRepository(ProfileEmployee);
+  private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
+  private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
+
+  @Get("user")
+  public async getDevelopmentUser(@Request() request: { user: Record<string, any> }) {
+    const profile = await this.profileRepository.findOneBy({ keycloak: request.user.sub });
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+    const lists = await this.developmentRepository.find({
+      where: { profileEmployeeId: profile.id },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("{profileId}")
+  public async getDevelopment(@Path() profileId: string, @Request() req: RequestWithUser) {
+    await new permission().PermissionList(req, "SYS_REGISTRY_TEMP");
+    const lists = await this.developmentRepository.find({
+      where: { profileEmployeeId: profileId },
+    });
+    return new HttpSuccess(lists);
+  }
+
+  @Get("history/{developmentId}")
+  public async developmentHistory(@Path() developmentId: string, @Request() req: RequestWithUser) {
+    await new permission().PermissionList(req, "SYS_REGISTRY_TEMP");
+    const record = await this.developmentHistoryRepository.find({
+      where: { profileDevelopmentId: developmentId },
+      order: { createdAt: "DESC" },
+    });
+    return new HttpSuccess(record);
+  }
+
+  @Post()
+  public async newDevelopment(@Request() req: RequestWithUser, @Body() body: CreateProfileEmployeeDevelopment) {
+    await new permission().PermissionCreate(req, "SYS_REGISTRY_TEMP");
+    if (!body.profileEmployeeId) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
+    }
+
+    const profile = await this.profileRepository.findOneBy({ id: body.profileEmployeeId });
+
+    if (!profile) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
+    }
+
+    const data = new ProfileDevelopment();
+
+    const meta = {
+      createdUserId: req.user.sub,
+      createdFullName: req.user.name,
+      lastUpdateUserId: req.user.sub,
+      lastUpdateFullName: req.user.name,
+    };
+
+    Object.assign(data, { ...body, ...meta });
+    const history = new ProfileDevelopmentHistory();
+    Object.assign(history, { ...data, id: undefined });
+
+    await this.developmentRepository.save(data);
+    history.profileDevelopmentId = data.id;
+    await this.developmentHistoryRepository.save(history);
+
+    return new HttpSuccess();
+  }
+
+  @Patch("{developmentId}")
+  public async editDevelopment(
+    @Request() req: RequestWithUser,
+    @Body() body: UpdateProfileDevelopment,
+    @Path() developmentId: string,
+  ) {
+    await new permission().PermissionUpdate(req, "SYS_REGISTRY_TEMP");
+    const record = await this.developmentRepository.findOneBy({ id: developmentId });
+
+    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    const history = new ProfileDevelopmentHistory();
+
+    Object.assign(record, body);
+    Object.assign(history, body);
+
+    history.profileDevelopmentId = developmentId;
+    record.lastUpdateUserId = req.user.sub;
+    record.lastUpdateFullName = req.user.name;
+    history.lastUpdateUserId = req.user.sub;
+    history.lastUpdateFullName = req.user.name;
+    history.createdUserId = req.user.sub;
+    history.createdFullName = req.user.name;
+
+    await Promise.all([
+      this.developmentRepository.save(record),
+      this.developmentHistoryRepository.save(history),
+    ]);
+
+    return new HttpSuccess();
+  }
+
+  @Delete("{developmentId}")
+  public async deleteDevelopment(@Path() developmentId: string, @Request() req: RequestWithUser) {
+    await new permission().PermissionDelete(req, "SYS_REGISTRY_TEMP");
+    await this.developmentHistoryRepository.delete({
+      profileDevelopmentId: developmentId,
+    });
+
+    const result = await this.developmentRepository.delete({ id: developmentId });
+
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+    }
+
+    return new HttpSuccess();
+  }
+}