From 7f1fda63d52adbde001cf90cf1bc0a35d49cf485 Mon Sep 17 00:00:00 2001
From: Rekryt <rekrytkw@gmail.com>
Date: Thu, 5 Sep 2024 15:58:32 +0300
Subject: [PATCH] feat: use groups for mikrotik lists names, update script
 format

---
 .../Controller/AbstractIPListController.php   | 11 +++++
 src/App/Controller/MainController.php         | 10 ----
 src/App/Controller/MikrotikController.php     | 47 +++++++++++--------
 src/App/Template/IndexTemplate.php            |  2 +-
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/App/Controller/AbstractIPListController.php b/src/App/Controller/AbstractIPListController.php
index 42d27fc..965f121 100644
--- a/src/App/Controller/AbstractIPListController.php
+++ b/src/App/Controller/AbstractIPListController.php
@@ -45,4 +45,15 @@ abstract class AbstractIPListController extends AbstractController {
             return $site;
         }, $this->service->sites);
     }
+
+    /**
+     * @return array<string, array<string, Site>>
+     */
+    protected function getGroups(): array {
+        $groups = [];
+        foreach ($this->service->sites as $siteEntity) {
+            $groups[$siteEntity->group][$siteEntity->name] = $siteEntity;
+        }
+        return $groups;
+    }
 }
diff --git a/src/App/Controller/MainController.php b/src/App/Controller/MainController.php
index 22789db..8097f1f 100644
--- a/src/App/Controller/MainController.php
+++ b/src/App/Controller/MainController.php
@@ -6,21 +6,11 @@ use OpenCCK\Domain\Entity\Site;
 use OpenCCK\Domain\Factory\SiteFactory;
 
 class MainController extends AbstractIPListController {
-    /**
-     * @var array<string, array<string, Site>>
-     */
-    private array $groups = [];
-
     /**
      * @return string
      */
     public function getBody(): string {
         $this->setHeaders(['content-type' => 'text/html; charset=utf-8']);
-
-        foreach ($this->service->sites as $siteEntity) {
-            $this->groups[$siteEntity->group][$siteEntity->name] = $siteEntity;
-        }
-
         return $this->renderTemplate('index');
     }
 
diff --git a/src/App/Controller/MikrotikController.php b/src/App/Controller/MikrotikController.php
index ecd6423..f4cb44d 100644
--- a/src/App/Controller/MikrotikController.php
+++ b/src/App/Controller/MikrotikController.php
@@ -2,6 +2,7 @@
 
 namespace OpenCCK\App\Controller;
 
+use OpenCCK\Domain\Entity\Site;
 use OpenCCK\Domain\Factory\SiteFactory;
 
 class MikrotikController extends AbstractIPListController {
@@ -18,36 +19,44 @@ class MikrotikController extends AbstractIPListController {
         }
 
         $response = [];
-        if (count($sites)) {
-            foreach ($sites as $site) {
-                $response = array_merge($response, $this->generateList($site, $this->getSites()[$site]->$data));
+        foreach ($this->getGroups() as $groupName => $groupSites) {
+            if (count($sites)) {
+                $groupSites = array_filter($groupSites, fn(Site $siteEntity) => in_array($siteEntity->name, $sites));
             }
-        } else {
-            foreach ($this->getSites() as $siteEntity) {
-                $response = array_merge($response, $this->generateList($siteEntity->name, $siteEntity->$data));
+            if (!count($groupSites)) {
+                continue;
             }
+
+            $response = array_merge($response, [
+                '/ip firewall address-list remove [find list="' . $groupName . '"];',
+                '/ip firewall address-list',
+            ]);
+            $items = [];
+            foreach ($groupSites as $siteName => $siteEntity) {
+                if (count($sites) && !in_array($siteName, $sites)) {
+                    continue;
+                }
+                $items = array_merge($items, $this->generateList($siteEntity, $siteEntity->$data));
+            }
+            $items = SiteFactory::normalizeArray($items, in_array($data, ['ip4', 'ip6', 'cidr4', 'cidr6']));
+            $items[count($items) - 1] = $items[count($items) - 1] . ';';
+
+            $response = array_merge($response, $items, ['']);
         }
 
-        return implode(
-            "\n",
-            array_merge(
-                ['/ip firewall address-list'],
-                SiteFactory::normalizeArray($response, in_array($data, ['ipv4', 'ipv6', 'cidr4', 'cidr6']))
-            )
-        );
+        return implode("\n", $response);
     }
 
     /**
-     * @param string $site
+     * @param Site $siteEntity
      * @param array $array
      * @return array
      */
-    private function generateList(string $site, array $array): array {
-        $response = [];
-        $listName = str_replace(' ', '', $site);
+    private function generateList(Site $siteEntity, array $array): array {
+        $items = [];
         foreach ($array as $item) {
-            $response[] = 'add list=' . $listName . ' address=' . $item . ' comment=' . $listName;
+            $items[] = 'add list=' . $siteEntity->group . ' address=' . $item . ' comment=' . $siteEntity->name;
         }
-        return $response;
+        return $items;
     }
 }
diff --git a/src/App/Template/IndexTemplate.php b/src/App/Template/IndexTemplate.php
index 5ff901c..8aa16c2 100644
--- a/src/App/Template/IndexTemplate.php
+++ b/src/App/Template/IndexTemplate.php
@@ -647,7 +647,7 @@ use OpenCCK\App\Controller\MainController;
                     <span>
                         Site:
                         <select name="site" class="main-formSelect main-formSelect_site" multiple>
-                            <?php foreach ($this->groups as $group => $items): ?>
+                            <?php foreach ($this->getGroups() as $group => $items): ?>
                                 <optgroup label="<?= $group ?>">
                                     <?php foreach ($items as $site): ?>
                                         <option value="<?= $site->name ?>"><?= $site->name ?></option>