From 585ae05d81208cfd7200c18628ca2b9157d87010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0git=20config=20git=20config=20-?=
 =?UTF-8?q?-helpgit=20config=20--global=20user=2Ename=20=EC=B5=9C=EC=A4=80?=
 =?UTF-8?q?=ED=9D=A0?= <choi.jh@withidc.jp>
Date: Sun, 25 Jun 2023 10:40:56 +0900
Subject: [PATCH] cfmgrv3 init...3

---
 app/Controllers/Common/CommonController.php | 23 ++++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/Common/CommonController.php b/app/Controllers/Common/CommonController.php
index 7950a2e..dc8b2ff 100644
--- a/app/Controllers/Common/CommonController.php
+++ b/app/Controllers/Common/CommonController.php
@@ -159,8 +159,8 @@ class CommonController extends BaseController
     }
     final public function update_form($uid)
     {
-        $entity = $this->_model->getEntity($uid);
         try {
+            $entity = $this->_model->getEntity($uid);
             $this->update_init();
             $this->update_form_init();
             $this->_viewDatas['entity'] = $this->update_form_process($entity);
@@ -211,9 +211,9 @@ class CommonController extends BaseController
     }
     protected function update_procedure($uid)
     {
-        $entity = $this->_model->getEntity($uid);
         $message = "";
         try {
+            $entity = $this->_model->getEntity($uid);
             $this->update_init();
             $entity = $this->update_validate($entity);
             $entity = $this->update_process($entity);
@@ -221,8 +221,9 @@ class CommonController extends BaseController
             Log::save("{$this->_viewDatas['title']} {$message}");
             return alert_CommonHelper($message, session()->get(RETURN_URL));
         } catch (\Exception $e) {
-            $message = "{$entity->getTitle()} " . __FUNCTION__ . " 실패하였습니다.";
+            $message = __FUNCTION__ . " 실패하였습니다.";
             Log::add("warning", $e->getMessage());
+            Log::add("warning", var_export($this->_viewDatas['fieldDatas'], true));
             Log::save("{$this->_viewDatas['title']} {$message}", false);
             return redirect()->back()->withInput()->with("error", $message . "<br>\n{$e->getMessage()}");
         }
@@ -244,9 +245,9 @@ class CommonController extends BaseController
     }
     protected function toggle_procedure($uid, string $field)
     {
-        $entity = $this->_model->getEntity($uid);
         $message = "";
         try {
+            $entity = $this->_model->getEntity($uid);
             $this->toggle_init($field);
             $entity = $this->toggle_validate($entity);
             $entity = $this->toggle_process($entity);
@@ -254,8 +255,9 @@ class CommonController extends BaseController
             Log::save("{$this->_viewDatas['title']} {$message}");
             return alert_CommonHelper($message, session()->get(RETURN_URL));
         } catch (\Exception $e) {
-            $message = "{$entity->getTitle()} " . __FUNCTION__ . " 실패하였습니다.";
+            $message = __FUNCTION__ . " 실패하였습니다.";
             Log::add("warning", $e->getMessage());
+            Log::add("warning", var_export($this->_viewDatas['fieldDatas'], true));
             Log::save("{$this->_viewDatas['title']} {$message}", false);
             return alert_CommonHelper($message . "<br>\n{$e->getMessage()}", 'back');
         }
@@ -310,6 +312,7 @@ class CommonController extends BaseController
         } catch (\Exception $e) {
             $message = "총: " . count($uids) . "개의 수정(Batchjob)을 실패하였습니다.";
             Log::add("warning", $e->getMessage());
+            Log::add("warning", var_export($this->_viewDatas['fieldDatas'], true));
             Log::save("{$this->_viewDatas['title']} {$message}", false);
             return alert_CommonHelper($message . "<br>\n{$e->getMessage()}", 'back');
         }
@@ -318,20 +321,24 @@ class CommonController extends BaseController
     //Delete 관련
     protected function delete_process($entity)
     {
-        $this->_model->delete($entity->getPrimaryKey());
+        if (!$this->_model->delete($entity->getPrimaryKey())) {
+            Log::add("error", __FUNCTION__ . "에서 호출:" . $this->_model->getLastQuery());
+            Log::add("error", implode("\n", $this->_model->errors()));
+            throw new \Exception(__FUNCTION__ . " 오류 발생.\n" . var_export($this->_model->errors(), true));
+        }
         return $entity;
     }
     protected function delete_procedure($uid)
     {
-        $entity = $this->_model->getEntity($uid);
         $message = "";
         try {
+            $entity = $this->_model->getEntity($uid);
             $this->delete_process($entity);
             $message = "{$entity->getTitle()} " . __FUNCTION__ . " 완료하였습니다.";
             Log::save("{$this->_viewDatas['title']} {$message}");
             return alert_CommonHelper($message, session()->get(RETURN_URL));
         } catch (\Exception $e) {
-            $message = "{$entity->getTitle()} " . __FUNCTION__ . " 실패하였습니다.";
+            $message = __FUNCTION__ . " 실패하였습니다.";
             Log::add("warning", $e->getMessage());
             Log::save("{$this->_viewDatas['title']} {$message}", false);
             return alert_CommonHelper($message . "<br>\n{$e->getMessage()}", 'back');