From 555e56417bc98c26fd701303518e058a76b61540 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 11 Jul 2024 12:10:15 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=8A=E0=B8=B5=E0=B9=89?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/KpiPlanController.ts | 5 +++--
 src/controllers/KpiRoleController.ts | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/controllers/KpiPlanController.ts b/src/controllers/KpiPlanController.ts
index d2f558c..69cf6c8 100644
--- a/src/controllers/KpiPlanController.ts
+++ b/src/controllers/KpiPlanController.ts
@@ -48,14 +48,15 @@ export class kpiPlanController extends Controller {
     @Request() request: { user: Record<string, any> },
   ) {
     const kpiPlan = Object.assign(new KpiPlan(), requestBody);
-    if (requestBody.year != null) {
+    if (requestBody.year != null && requestBody.period != null) {
       const kpiPeriod = await this.kpiPeriodRepository
         .createQueryBuilder("kpiPeriod")
         .where("kpiPeriod.year = :year", { year: requestBody.year })
         .andWhere("kpiPeriod.durationKPI = :durationKPI", { durationKPI: requestBody.period })
         .getOne();
       if (!kpiPeriod) {
-        throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
+        // throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
+        throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลรอบการประเมินนี้ในปีงบประมาณ "+requestBody.year);
       }
     }
     await new CallAPI()
diff --git a/src/controllers/KpiRoleController.ts b/src/controllers/KpiRoleController.ts
index 98a3d55..04b80d8 100644
--- a/src/controllers/KpiRoleController.ts
+++ b/src/controllers/KpiRoleController.ts
@@ -48,14 +48,15 @@ export class kpiRoleController extends Controller {
     @Request() request: { user: Record<string, any> },
   ) {
     const kpiRole = Object.assign(new KpiRole(), requestBody);
-    if (requestBody.year != null) {
+    if (requestBody.year != null && requestBody.period != null) {
       const kpiPeriod = await this.kpiPeriodRepository
         .createQueryBuilder("kpiPeriod")
         .where("kpiPeriod.year = :year", { year: requestBody.year })
         .andWhere("kpiPeriod.durationKPI = :durationKPI", { durationKPI: requestBody.period })
         .getOne();
       if (!kpiPeriod) {
-        throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
+        // throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
+        throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลรอบการประเมินนี้ในปีงบประมาณ "+requestBody.year);
       }
     }
     await new CallAPI()