From 90fd41ed7631fc41c8b70cbee36df04ad5c1b1e1 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 12:04:19 +0900
Subject: [PATCH] cfmgrv3 init..3

---
 app/Controllers/Admin/Cloudflare/API/FirewallController.php | 2 +-
 app/Controllers/Admin/Cloudflare/API/RecordController.php   | 2 +-
 app/Libraries/Cloudflare/API/Record.php                     | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/Admin/Cloudflare/API/FirewallController.php b/app/Controllers/Admin/Cloudflare/API/FirewallController.php
index 2e5ab71..8821a8d 100644
--- a/app/Controllers/Admin/Cloudflare/API/FirewallController.php
+++ b/app/Controllers/Admin/Cloudflare/API/FirewallController.php
@@ -105,7 +105,7 @@ class FirewallController extends APIController
         return $builder;
     }
     //Index관련
-    protected function index_getRows_builder(int $page = 0, int $per_page = 0): array
+    protected function index_getRows(int $page = 0, int $per_page = 0): array
     {
         //모델 Join
         $builder = $this->_model->builder();
diff --git a/app/Controllers/Admin/Cloudflare/API/RecordController.php b/app/Controllers/Admin/Cloudflare/API/RecordController.php
index 8066620..25a2be6 100644
--- a/app/Controllers/Admin/Cloudflare/API/RecordController.php
+++ b/app/Controllers/Admin/Cloudflare/API/RecordController.php
@@ -160,7 +160,7 @@ class RecordController extends APIController
         return $builder;
     }
     //Index관련
-    protected function index_getRows_builder(int $page = 0, int $per_page = 0): array
+    protected function index_getRow(int $page = 0, int $per_page = 0): array
     {
         //Totalcount 처리
         $builder = $this->_model->builder();
diff --git a/app/Libraries/Cloudflare/API/Record.php b/app/Libraries/Cloudflare/API/Record.php
index 5a377a2..99d8007 100644
--- a/app/Libraries/Cloudflare/API/Record.php
+++ b/app/Libraries/Cloudflare/API/Record.php
@@ -87,7 +87,11 @@ class Record extends API
   }
   public function deleteByZone()
   {
-    $this->_model->where($this->_model::PARENT_FIELD, $this->getParent()->getPrimaryKey())->delete();
+    $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)
   {