Actualizada la clase PageFilter y PageOption para utilizar las clases y traits correctos, se ha especificado el tipo de retorno en los métodos clear y loadFromData, y se ha añadido el método save para manejar la codificación de valores. Se ha creado la clase de pruebas unitarias PageFilterTest para verificar la funcionalidad de PageFilter.

Author: Carlos Garcia

Core/Model/PageFilter.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of FacturaScripts
- * Copyright (C) 2017-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,6 +19,8 @@
 
 namespace FacturaScripts\Core\Model;
 
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Template\ModelTrait;
 use FacturaScripts\Core\Tools;
 
 /**
@@ -27,9 +29,9 @@
  *
  * @author Artex Trading sa     <jcuello@artextrading.com>
  */
-class PageFilter extends Base\ModelClass
+class PageFilter extends ModelClass
 {
-    use Base\ModelTrait;
+    use ModelTrait;
 
     /**
      * Human description
@@ -66,7 +68,7 @@ class PageFilter extends Base\ModelClass
      */
     public $nick;
 
-    public function clear()
+    public function clear(): void
     {
         parent::clear();
         $this->filters = [];
@@ -86,17 +88,25 @@ public function install(): string
      * @param array $data
      * @param array $exclude
      */
-    public function loadFromData(array $data = [], array $exclude = [])
+    public function loadFromData(array $data = [], array $exclude = []): void
     {
         array_push($exclude, 'filters', 'code', 'action');
         parent::loadFromData($data, $exclude);
 
         $this->filters = isset($data['filters']) ? json_decode($data['filters'], true) : [];
     }
 
-    public static function primaryColumn(): string
+    public function save(): bool
     {
-        return 'id';
+        // Encode the filters values to JSON format
+        $this->filters = $this->getEncodeValues()['filters'];
+
+        $saved = parent::save();
+
+        // decode the filters values back to array format
+        $this->filters = json_decode($this->filters, true);
+
+        return $saved;
     }
 
     public static function tableName(): string
@@ -126,14 +136,4 @@ private function getEncodeValues(): array
             'filters' => json_encode($this->filters)
         ];
     }
-
-    protected function saveInsert(array $values = []): bool
-    {
-        return parent::saveInsert($this->getEncodeValues());
-    }
-
-    protected function saveUpdate(array $values = []): bool
-    {
-        return parent::saveUpdate($this->getEncodeValues());
-    }
 }

Core/Model/PageOption.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of FacturaScripts
- * Copyright (C) 2017-2024 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,6 +19,8 @@
 
 namespace FacturaScripts\Core\Model;
 
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Template\ModelTrait;
 use FacturaScripts\Core\Tools;
 
 /**
@@ -28,9 +30,9 @@
  * @author Jose Antonio Cuello  <yopli2000@gmail.com>
  * @author Carlos García Gómez  <carlos@facturascripts.com>
  */
-class PageOption extends Base\ModelClass
+class PageOption extends ModelClass
 {
-    use Base\ModelTrait;
+    use ModelTrait;
 
     /**
      * Definition of the columns. It is called columns but it always
@@ -82,7 +84,7 @@ class PageOption extends Base\ModelClass
      */
     public $rows;
 
-    public function clear()
+    public function clear(): void
     {
         parent::clear();
         $this->columns = [];
@@ -105,7 +107,7 @@ public function install(): string
      * @param array $data
      * @param array $exclude
      */
-    public function loadFromData(array $data = [], array $exclude = [])
+    public function loadFromData(array $data = [], array $exclude = []): void
     {
         array_push($exclude, 'columns', 'modals', 'filters', 'rows', 'code', 'action');
         parent::loadFromData($data, $exclude);
@@ -115,9 +117,21 @@ public function loadFromData(array $data = [], array $exclude = [])
         $this->rows = json_decode($data['rows'], true);
     }
 
-    public static function primaryColumn(): string
+    public function save(): bool
     {
-        return 'id';
+        // encode the values of the view configuration fields
+        $this->columns = $this->getEncodeValues()['columns'];
+        $this->modals = $this->getEncodeValues()['modals'];
+        $this->rows = $this->getEncodeValues()['rows'];
+
+        $saved = parent::save();
+
+        // decode the values of the view configuration fields
+        $this->columns = json_decode($this->columns, true);
+        $this->modals = json_decode($this->modals, true);
+        $this->rows = json_decode($this->rows, true);
+
+        return $saved;
     }
 
     public static function tableName(): string
@@ -145,18 +159,4 @@ private function getEncodeValues(): array
             'rows' => json_encode($this->rows),
         ];
     }
-
-    protected function saveInsert(array $values = []): bool
-    {
-        $this->last_update = Tools::dateTime();
-
-        return parent::saveInsert($this->getEncodeValues());
-    }
-
-    protected function saveUpdate(array $values = []): bool
-    {
-        $this->last_update = Tools::dateTime();
-
-        return parent::saveUpdate($this->getEncodeValues());
-    }
 }

Test/Core/Model/PageFilterTest.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of FacturaScripts
+ * Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FacturaScripts\Test\Core\Model;
+
+use FacturaScripts\Core\Model\PageFilter;
+use FacturaScripts\Test\Traits\LogErrorsTrait;
+use FacturaScripts\Test\Traits\RandomDataTrait;
+use PHPUnit\Framework\TestCase;
+
+final class PageFilterTest extends TestCase
+{
+    use LogErrorsTrait;
+    use RandomDataTrait;
+
+    public function testCreate(): void
+    {
+        // creamos un usuario
+        $user = $this->getRandomUser();
+        $this->assertTrue($user->save());
+
+        // creamos un filtro de página
+        $pageFilter = new PageFilter();
+        $pageFilter->name = 'TestController';
+        $pageFilter->nick = $user->nick;
+        $pageFilter->description = 'Test Filter';
+        $pageFilter->filters = ['field1' => 'value1', 'field2' => 'value2'];
+        $this->assertTrue($pageFilter->save(), 'Error saving PageFilter');
+
+        // comprobamos que existe en la base de datos
+        $this->assertTrue($pageFilter->exists());
+
+        // comprobamos que se ha asignado un id
+        $this->assertNotNull($pageFilter->id);
+
+        // eliminamos
+        $this->assertTrue($pageFilter->delete(), 'Error deleting PageFilter');
+        $this->assertTrue($user->delete());
+    }
+
+    protected function tearDown(): void
+    {
+        $this->logErrors();
+    }
+}

Test/Core/Model/PageOptionTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of FacturaScripts
- * Copyright (C) 2024 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2024-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,10 +20,13 @@
 namespace FacturaScripts\Test\Core\Model;
 
 use FacturaScripts\Core\Model\PageOption;
+use FacturaScripts\Test\Traits\LogErrorsTrait;
 use PHPUnit\Framework\TestCase;
 
 final class PageOptionTest extends TestCase
 {
+    use LogErrorsTrait;
+
     public function testCreate(): void
     {
         // creamos
@@ -34,4 +37,9 @@ public function testCreate(): void
         // eliminamos
         $this->assertTrue($pageOption->delete(), 'Error deleting PageOption');
     }
+
+    protected function tearDown(): void
+    {
+        $this->logErrors();
+    }
 }

Test/Traits/RandomDataTrait.php

@@ -19,6 +19,7 @@
 
 namespace FacturaScripts\Test\Traits;
 
+use FacturaScripts\Core\Tools;
 use FacturaScripts\Dinamic\Lib\Calculator;
 use FacturaScripts\Dinamic\Model\Agente;
 use FacturaScripts\Dinamic\Model\Almacen;
@@ -230,7 +231,7 @@ protected function getRandomUser(): User
         $user = new User();
         $user->nick = 'user_' . mt_rand(1, 999);
         $user->email = $user->nick . '@facturascripts.com';
-        $user->setPassword(mt_rand(1, 999999));
+        $user->setPassword(Tools::password());
 
         return $user;
     }