From d259add7f2deac1ac735457e2b2a42d528a6ef03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Fri, 14 Mar 2025 11:39:06 +0900
Subject: [PATCH] cfmgrv4 init...10

---
 app/Controllers/Admin/Cloudflare/ZoneController.php | 3 +--
 app/Services/Cloudflare/RecordService.php           | 4 ++--
 app/Services/Cloudflare/ZoneService.php             | 4 ++--
 app/Services/MapurlService.php                      | 5 +++--
 app/Traits/MylogTrait.php                           | 9 ++++++---
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Admin/Cloudflare/ZoneController.php b/app/Controllers/Admin/Cloudflare/ZoneController.php
index 66d6a00..c2e0287 100644
--- a/app/Controllers/Admin/Cloudflare/ZoneController.php
+++ b/app/Controllers/Admin/Cloudflare/ZoneController.php
@@ -7,7 +7,6 @@ use App\Helpers\Cloudflare\ZoneHelper;
 use App\Models\Cloudflare\AccountModel;
 use App\Services\Cloudflare\RecordService;
 use App\Services\Cloudflare\ZoneService;
-use App\Services\MyLogService;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -176,9 +175,9 @@ class ZoneController extends CloudflareController
             throw new \Exception("{$uid} 정보를 찾을수 없습니다.");
         }
         //Record부터 삭제필요
+        $record = new RecordService();
         $this->getRecordModel()->where($this->getRecordModel()::PARENT, $this->entity->getPK());
         foreach ($this->getRecordModel()->getEntitys() as $record_entity) {
-            $record = new RecordService();
             $record->delete($this->entity, $record_entity);
         }
         //Zone 삭제
diff --git a/app/Services/Cloudflare/RecordService.php b/app/Services/Cloudflare/RecordService.php
index b24ac65..c72d675 100644
--- a/app/Services/Cloudflare/RecordService.php
+++ b/app/Services/Cloudflare/RecordService.php
@@ -91,10 +91,10 @@ class RecordService extends CloudflareService
         $response = $this->getMySocket()->post("zones/{$this->getParentEntity()->getPK()}/dns_records", $datas);
         $body = json_decode($response->getBody());
         $formDatas = $this->getArrayByResult($body->result);
-        //생성값 formDatas Log남기기
-        $this->add_MylogTrait(__FUNCTION__, $formDatas);
         //DB생성
         $entity = $this->getModel()->create($formDatas);
+        //생성값 formDatas Log남기기
+        $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity);
         // log_message("debug", $this->getModel()->getLastQuery());
         return $entity;
     }
diff --git a/app/Services/Cloudflare/ZoneService.php b/app/Services/Cloudflare/ZoneService.php
index d7a696f..baf0b3e 100644
--- a/app/Services/Cloudflare/ZoneService.php
+++ b/app/Services/Cloudflare/ZoneService.php
@@ -121,11 +121,11 @@ class ZoneService extends CloudflareService
         foreach ($this->_setting_fields as $field => $default) {
             $formDatas[$field] = $this->setCFSetting($formDatas[ZoneModel::PK], $field, $default);
         }
-        //생성값 formDatas Log남기기
-        $this->add_MylogTrait(__FUNCTION__, $formDatas);
         //DB생성
         $entity = $this->getModel()->create($formDatas);
         // log_message("debug", $this->getModel()->getLastQuery());
+        //생성값 formDatas Log남기기
+        $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity);
         return $entity;
     }
 
diff --git a/app/Services/MapurlService.php b/app/Services/MapurlService.php
index fc612c4..319698b 100644
--- a/app/Services/MapurlService.php
+++ b/app/Services/MapurlService.php
@@ -23,9 +23,10 @@ class MapurlService extends CommonService
     }
     public function create(array $formDatas): MapurlEntity
     {
+        $entity =  $this->getModel()->create($formDatas);
         //생성값 formDatas Log남기기
-        $this->add_MylogTrait(__FUNCTION__, $formDatas);
-        return $this->getModel()->create($formDatas);
+        $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity);
+        return $entity;
     }
     public function modify(MapurlEntity $entity, array $formDatas): MapurlEntity
     {
diff --git a/app/Traits/MylogTrait.php b/app/Traits/MylogTrait.php
index baa3dba..5e1c34b 100644
--- a/app/Traits/MylogTrait.php
+++ b/app/Traits/MylogTrait.php
@@ -8,23 +8,26 @@ use App\Services\MyLogService;
 
 trait MylogTrait
 {
-  final public function add_MylogTrait(string $action, array $formDatas, ?CommonEntity $entity = null): void
+  final public function add_MylogTrait(string $action, array $formDatas, CommonEntity $entity): void
   {
     switch ($action) {
       case 'create':
         foreach ($formDatas as $field => $value) {
-          MyLogService::add("info", "{$field}:{$value}");
+          MyLogService::add("info", "{$field}:{$entity->$field}");
         }
+        MyLogService::add("info", "{$entity->getTitle()}를 생성하였습니다.");
         break;
       case 'modify':
         foreach ($formDatas as $field => $value) {
-          MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}");
+          MyLogService::add("info", "{$field}:{$entity->$field}=>{$value}");
         }
+        MyLogService::add("info", "{$entity->getTitle()}를 수정하였습니다.");
         break;
       case 'delete':
         foreach ($this->getModel()->getFields() as $field) {
           MyLogService::add("info", "{$field}:{$entity->$field}");
         }
+        MyLogService::add("info", "{$entity->getTitle()}를 삭제하였습니다.");
         break;
     }
   }