Merge branch 'develop' into adiDev

src/controllers/CommandController.ts

@@ -3121,7 +3121,7 @@ export class CommandController extends Controller {
       }[];
     },
   ) {
-    const posMasters = await this.posMasterRepository.find({ where: { id: In(body.refIds) } });
+    const posMasters = await this.posMasterRepository.find({ where: { id: In(body.refIds.map(x => x.refId)) } });
     const data = posMasters.map((_data) => ({
       ..._data,
       statusReport: "PENDING",

src/controllers/PositionController.ts

@@ -3199,7 +3199,7 @@ export class PositionController extends Controller {
   ) {
     let typeCondition: any = {};
     let conditionA =
-      "positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel AND positions.positionName LIKE :position";
+      "posType.posTypeName LIKE :posType AND posLevel.posLevelName LIKE :posLevel AND positions.positionName LIKE :position";
 
     let posType = await this.posTypeRepository.findOne({
       where: { id: String(body.posType) },

src/controllers/ProfileController.ts

@@ -312,7 +312,7 @@ export class ProfileController extends Controller {
       // ],
       relations: ["currentSubDistrict", "currentDistrict", "currentProvince", "profileAvatars"],
       order: {
-        profileAvatars: { createdAt: "DESC" },
+        profileAvatars: { createdAt: "ASC" },
       },
       where: { id: id },
     });
@@ -538,7 +538,7 @@ export class ProfileController extends Controller {
     });
     const Cert =
       certs.length > 0
-        ? certs.map((item) => ({
+        ? certs.slice(-3).map((item) => ({
             CertificateType: item.certificateType ?? null,
             Issuer: item.issuer ?? null,
             CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
@@ -558,7 +558,7 @@ export class ProfileController extends Controller {
     });
     const Training =
       trainings.length > 0
-        ? trainings.map((item) => ({
+        ? trainings.slice(-3).map((item) => ({
             Institute: item.department ?? "",
             Start:
               item.startDate == null
@@ -594,7 +594,7 @@ export class ProfileController extends Controller {
     });
     const Discipline =
       disciplines.length > 0
-        ? disciplines.map((item) => ({
+        ? disciplines.slice(-3).map((item) => ({
             DisciplineYear:
               Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
               null,
@@ -616,7 +616,7 @@ export class ProfileController extends Controller {
     });
     const Education =
       educations.length > 0
-        ? educations.map((item) => ({
+        ? educations.slice(-3).map((item) => ({
             Institute: item.institute,
             Start:
               item.startDate == null
@@ -3021,6 +3021,25 @@ export class ProfileController extends Controller {
     return new HttpSuccess(profile);
   }
 
+  /**
+   * API รายละเอียดรายการทะเบียนประวัติ
+   *
+   * @summary ORG_065 - รายละเอียดรายการทะเบียนประวัติ  (ADMIN) #70
+   *
+   * @param {string} id  Id ทะเบียนประวัติ
+   */
+  @Get("keycloak")
+  async getProfileIdByKeycloak(@Request() request: RequestWithUser) {
+    const profile = await this.profileRepo.findOne({
+      where: { keycloak: request.user.sub },
+      select:["id"]
+    });
+
+    if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
+
+    return new HttpSuccess(profile.id);
+  }
+
   @Get("type")
   async checkRole(@Request() request: RequestWithUser) {
     let role: any;

src/controllers/ProfileEmployeeController.ts

@@ -305,7 +305,7 @@ export class ProfileEmployeeController extends Controller {
       // ],
       relations: ["currentSubDistrict", "currentDistrict", "currentProvince", "profileAvatars"],
       order: {
-        profileAvatars: { createdAt: "DESC" },
+        profileAvatars: { createdAt: "ASC" },
       },
       where: { id: id },
     });