From c329ba0b06d731cf90b712f0066ce496debe22af Mon Sep 17 00:00:00 2001
From: "choi.jh" <choi.jh@prime-idc.jp>
Date: Wed, 25 Jun 2025 15:36:48 +0900
Subject: [PATCH] dbms_init...1

---
 app/Controllers/Admin/Customer/ServiceController.php | 5 +++++
 app/Controllers/CommonController.php                 | 6 +-----
 app/Services/CommonService.php                       | 6 +++---
 app/Services/Customer/ServiceService.php             | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php
index ae85dc9..94c7117 100644
--- a/app/Controllers/Admin/Customer/ServiceController.php
+++ b/app/Controllers/Admin/Customer/ServiceController.php
@@ -81,6 +81,11 @@ class ServiceController extends CustomerController
         $this->setFilterOptionsByItemType();
         return $this->getService()->setItemEntitiesByService($entity);
     }
+    //Delete 관련
+    protected function delete_process(mixed $entity): mixed
+    {
+        return parent::delete_process($entity);
+    }
     //List 관련
     protected function setWordConditionForList(): void
     {
diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
index 0bc4aba..65adbca 100644
--- a/app/Controllers/CommonController.php
+++ b/app/Controllers/CommonController.php
@@ -481,11 +481,7 @@ abstract class CommonController extends BaseController
     //삭제,일괄삭제 공통사용
     protected function delete_process(mixed $entity): mixed
     {
-        $result = $this->getService()->delete($entity);
-        if (!$result) {
-            LogCollector::error("[{$entity->getTitle()}] 삭제실패");
-        }
-        return $entity;
+        return $this->getService()->delete($entity);
     }
     final public function delete(mixed $uid): RedirectResponse|string
     {
diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php
index 56b72c0..b26ff61 100644
--- a/app/Services/CommonService.php
+++ b/app/Services/CommonService.php
@@ -135,7 +135,7 @@ abstract class CommonService
         LogCollector::info("[{$entity->getTitle()}]" . MESSAGES["UPDATED"] . ":");
         return $entity;
     }
-    public function delete(mixed $entity): bool
+    public function delete(mixed $entity): mixed
     {
         $result = $this->getModel()->delete($entity->getPK());
         if (!$result) {
@@ -145,9 +145,9 @@ abstract class CommonService
                 $this->getModel()->getLastQuery()
             );
             LogCollector::error($message);
-            return false;
+            throw new \Exception($message);
         }
         LogCollector::info("[{$entity->getTitle()}]" . MESSAGES["DELETED"] . ":");
-        return true;
+        return $entity;
     }
 }
diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php
index 44c24d8..62ce8f3 100644
--- a/app/Services/Customer/ServiceService.php
+++ b/app/Services/Customer/ServiceService.php
@@ -209,7 +209,7 @@ class ServiceService extends CustomerService
         }
         return parent::modify($entity, $formDatas);
     }
-    final public function delete(mixed $entity): bool
+    public function delete(mixed $entity): ServiceEntity
     {
         //code의 경우 기존code는 사용가능으로 설정작업
         $this->getCodeService()->setStatus($entity->getCode(), CodeEntity::STATUS_AVAILABLE);