From d7a1032e158dc66c733b8e66debedb427d007e0d 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: Wed, 21 Jun 2023 13:17:25 +0900
Subject: [PATCH] cfmgrv3 init...3

---
 app/Controllers/Admin/Cloudflare/API/ZoneController.php | 8 ++++++--
 app/Controllers/Common/CommonController.php             | 1 +
 app/Libraries/Cloudflare/API/Record.php                 | 9 ---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Admin/Cloudflare/API/ZoneController.php b/app/Controllers/Admin/Cloudflare/API/ZoneController.php
index db4ce06..6ef8f6e 100644
--- a/app/Controllers/Admin/Cloudflare/API/ZoneController.php
+++ b/app/Controllers/Admin/Cloudflare/API/ZoneController.php
@@ -141,8 +141,12 @@ class ZoneController extends APIController
     protected function delete_process($entity)
     {
         //Zone삭제전에 Record부터 삭제하기위함
-        $api = new \App\Libraries\Cloudflare\API\Record($entity);
-        $api->deleteByZone();
+        $recordModel = new \App\Models\Cloudflare\API\RecordModel();
+        $records = $recordModel->where($recordModel::PARENT_FIELD, $entity->getPrimaryKey())->findAll();
+        foreach ($records as $record) {
+            $api = new \App\Libraries\Cloudflare\API\Record($entity);
+            $api->delete($record);
+        }
         $api = new Zone($this->getAccountModel()->getEntity($entity->getParentFieldData()));
         $api->delete($entity);
         return parent::delete_process($entity);
diff --git a/app/Controllers/Common/CommonController.php b/app/Controllers/Common/CommonController.php
index 8ee17d9..2e6812d 100644
--- a/app/Controllers/Common/CommonController.php
+++ b/app/Controllers/Common/CommonController.php
@@ -357,6 +357,7 @@ class CommonController extends BaseController
         $entity = $this->_model->getEntity($uid);
         $message = "";
         try {
+            $this->delete_process($entity);
             $message = "{$entity->getTitle()} " . __FUNCTION__ . " 완료하였습니다.";
             Log::save("{$this->_viewDatas['title']} {$message}");
             return alert_CommonHelper($message, session()->get(RETURN_URL));
diff --git a/app/Libraries/Cloudflare/API/Record.php b/app/Libraries/Cloudflare/API/Record.php
index 50caffc..5bf6e8f 100644
--- a/app/Libraries/Cloudflare/API/Record.php
+++ b/app/Libraries/Cloudflare/API/Record.php
@@ -87,15 +87,6 @@ class Record extends API
     }
     return $this->getEntityByResult($cfResult->result);
   }
-  //Zone삭제전에 Record부터 삭제하기위함
-  public function deleteByZone()
-  {
-    $records = $this->_model->where($this->_model::PARENT_FIELD, $this->getParent()->getPrimaryKey())->findAll();
-    foreach ($records as $record) {
-      $this->delete($record);
-      $this->_model->delete($record->getPrimaryKey());
-    }
-  }
   public function delete(\App\Entities\Cloudflare\API\RecordEntity $entity)
   {
     $cfResult = $this->getAdapter()->delete('zones/' . $this->getParent()->getPrimaryKey() . '/dns_records/' . $entity->getPrimaryKey());