Merge branch 'develop' into adiDev

# Conflicts:
#	src/controllers/ProfileController.ts

src/controllers/ProfileController.ts

@@ -1875,10 +1875,10 @@ export class ProfileController extends Controller {
     return new HttpSuccess(profile.id);
   }
 
-   async sendVerifyEmail(
-    @Request() req:RequestWithUser,
-    @Body() 
-    body: { 
+  async sendVerifyEmail(
+    @Request() req: RequestWithUser,
+    @Body()
+    body: {
       profileId: string;
       email: string; 
       subject: string;  
@@ -1890,7 +1890,7 @@ export class ProfileController extends Controller {
       const link = process.env.URL + "/verifyemail/" + token;
       // console.log("[link]",link);
 
-      await new CallAPI()
+    await new CallAPI()
       .PostData(req, "/placement/noti/send-mail", {
         subject: body.subject,
         body: link,
@@ -1898,42 +1898,39 @@ export class ProfileController extends Controller {
       })
       .catch((error) => {
         console.error("Error calling API:", error);
-      }); 
-      return new HttpSuccess();
-    }
-    
-   /**
+      });
+    return new HttpSuccess();
+  }
+
+  /**
    * API ยืนยัน Email
    *
    * @summary ยืนยัน Email
    *
    */
-   @Post("verify-email")
-   async genLinkVerifyEmail(
-    @Body() body:{
-      token: string;
-    },
-   ) {
-    const jwt = require('jsonwebtoken');
+  @Post("verify-email")
+  async genLinkVerifyEmail(@Body() body: { token: string }) {
+    const jwt = require("jsonwebtoken");
     const secretKey = process.env.AUTH_ACCOUNT_SECRET || "defaultSecretKey";
     const decodedToken = jwt.verify(body.token, secretKey);
     // console.log("[email]",decodedToken);
     // console.log("[1]",decodedToken.email_id);
-    
-      const profile = await this.profileRepo.findOne({
-        where:{ 
-          id: decodedToken.profileId,
-          email: decodedToken.email_id,
-        }
-      });
-      if(!profile){ throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์");}
 
-      Object.assign(profile, body);
-      profile.statusEmail = "VERIFIED";
-      await this.profileRepo.save(profile)
+    const profile = await this.profileRepo.findOne({
+      where: {
+        id: decodedToken.profileId,
+        email: decodedToken.email_id,
+      },
+    });
+    if (!profile) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์");
     }
-   
-   
+
+    Object.assign(profile, body);
+    profile.statusEmail = "VERIFIED";
+    await this.profileRepo.save(profile);
+  }
+
   /**
    * API ออกคำสั่ง คำสั่งให้ข้าราชการที่มีผลการทดลองปฏิบัติหน้าที่ราชการไม่ต่ำกว่ามาตรฐานที่กำหนดรับราชการต่อไป
    *
@@ -4509,7 +4506,11 @@ export class ProfileController extends Controller {
         },
       });
       if (!profile) {
-        throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
+        if (request.user.role.includes("SUPER_ADMIN")) {
+          return new HttpSuccess(null);
+        } else {
+          throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
+        }
       }
 
       let orgRevisionPublish: any = await this.orgRevisionRepo
@@ -7984,8 +7985,8 @@ export class ProfileController extends Controller {
       profileId: profile.id,
       email: body.email,
       subject: "ยืนยันอีเมล",
-    }
-    this.sendVerifyEmail(request,verifyemailBody);
+    };
+    this.sendVerifyEmail(request, verifyemailBody);
     return new HttpSuccess();
   }