Fixes, dead code, add tests on objects repo

lib/GaletteObjectsLend/Repository/Objects.php

@@ -209,25 +209,6 @@ public function removeObjects(array $ids): bool
         return false;
     }
 
-    /**
-     * Disable selected objects
-     *
-     * @param array<int> $ids List of objects id to disable
-     *
-     * @return ResultSet
-     */
-    public function disableObjects(array $ids): ResultSet
-    {
-        $update = $this->zdb->update(LEND_PREFIX . self::TABLE);
-        $update->set(['is_active' => false]);
-        $update->where->in(
-            self::PK,
-            $ids
-        );
-        $results = $this->zdb->execute($update);
-        return $results;
-    }
-
     /**
      * Get Objects list
      *
@@ -359,7 +340,7 @@ private function proceedCount(Select $select): void
 
             $results = $zdb->execute($countSelect);
 
-            $this->count = $results->current()->count;
+            $this->count = (int)$results->current()->count;
             if (isset($this->filters) && $this->count > 0) {
                 $this->filters->setCounter($this->count);
             }
@@ -493,7 +474,7 @@ public function buildWhereClause(Select $select): void
                             );
                         } else {
                             $select->where(
-                                'o.name LIKE ' . $token
+                                'LOWER(o.name) LIKE ' . $token
                             );
                         }
                         break;
@@ -551,9 +532,9 @@ private function canOrderBy(string $field_name, ?array $fields): bool
     /**
      * Get count for current query
      *
-     * @return int
+     * @return ?int
      */
-    public function getCount(): int
+    public function getCount(): ?int
     {
         return $this->count;
     }

tests/GaletteObjectsLend/Repository/tests/units/Objects.php

@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * Copyright © 2003-2024 The Galette Team
+ *
+ * This file is part of Galette (https://galette.eu).
+ *
+ * Galette is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Galette 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Galette. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace GaletteObjectsLends\Repository\tests\units;
+
+use Galette\GaletteTestCase;
+
+/**
+ * Categories tests
+ *
+ * @author Johan Cwiklinski <johan@x-tnd.be>
+ */
+class Objects extends GaletteTestCase
+{
+    protected int $seed = 20240526224135;
+
+    protected \Galette\Core\Plugins $plugins;
+    protected \GaletteObjectsLend\Entity\Preferences $lend_prefs;
+
+    /**
+     * Set up tests
+     *
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->plugins = $this->container->get('plugins');
+        $this->lend_prefs = new \GaletteObjectsLend\Entity\Preferences($this->zdb);
+    }
+
+    /**
+     * Cleanup after each test method
+     *
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        $delete = $this->zdb->delete(LEND_PREFIX . \GaletteObjectsLend\Entity\LendObject::TABLE);
+        $this->zdb->execute($delete);
+
+        $delete = $this->zdb->delete(LEND_PREFIX . \GaletteObjectsLend\Entity\LendCategory::TABLE);
+        $this->zdb->execute($delete);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test getList
+     *
+     * @return void
+     */
+    public function testGetList(): void
+    {
+        $objects = new \GaletteObjectsLend\Repository\Objects($this->zdb, $this->plugins, $this->lend_prefs);
+
+        $rs_list = $objects->getList();
+        $this->assertInstanceOf(\Laminas\Db\ResultSet\ResultSet::class, $rs_list);
+        $this->assertSame(0, $rs_list->count());
+        $this->assertSame([], $objects->getList(true));
+        $this->assertNull($objects->getCount());
+
+        $this->assertSame([], $objects->getObjectsList(true));
+        $this->assertSame(0, $objects->getCount());
+
+        $category = new \GaletteObjectsLend\Entity\LendCategory($this->zdb, $this->plugins);
+        $category->name = 'First category';
+        $category->is_active = true;
+        $this->assertTrue($category->store());
+        $first_category_id = $category->getId();
+        $this->assertGreaterThan(0, $first_category_id);
+
+        $category = new \GaletteObjectsLend\Entity\LendCategory($this->zdb, $this->plugins);
+        $category->name = 'Second category';
+        $category->is_active = true;
+        $this->assertTrue($category->store());
+        $second_category_id = $category->getId();
+        $this->assertGreaterThan(0, $second_category_id);
+
+        $object = new \GaletteObjectsLend\Entity\LendObject($this->zdb, $this->plugins);
+        $object->name = 'First object';
+        $object->category_id = $first_category_id;
+        $object->is_active = true;
+        $this->assertTrue($object->store());
+        $first_object_id = $object->getId();
+
+        $object = new \GaletteObjectsLend\Entity\LendObject($this->zdb, $this->plugins);
+        $object->name = 'Second object';
+        $object->description = 'First description';
+        $object->category_id = $first_category_id;
+        $object->is_active = true;
+        $this->assertTrue($object->store());
+        $second_object_id = $object->getId();
+
+        $object = new \GaletteObjectsLend\Entity\LendObject($this->zdb, $this->plugins);
+        $object->name = 'Third object';
+        $object->category_id = $second_category_id;
+        $object->is_active = true;
+        $this->assertTrue($object->store());
+        $third_object_id = $object->getId();
+
+        $object = new \GaletteObjectsLend\Entity\LendObject($this->zdb, $this->plugins);
+        $object->name = 'Fourth object';
+        $object->serial_number = 'GGABCDEXX';
+        $object->dimension = '210x297';
+        $object->is_active = false;
+        $this->assertTrue($object->store());
+        $fourth_object_id = $object->getId();
+
+        $filters = new \GaletteObjectsLend\Filters\ObjectsList();
+        $objects = new \GaletteObjectsLend\Repository\Objects($this->zdb, $this->plugins, $this->lend_prefs, $filters);
+
+        $this->assertCount(4, $objects->getObjectsList(true));
+        $this->assertSame(4, $objects->getCount());
+
+        $selected = [
+            $first_object_id,
+            $third_object_id
+        ];
+        $filters->selected = $selected;
+        $this->assertCount(2, $objects->getObjectsList(true));
+        $this->assertSame(2, $objects->getCount());
+
+        $filters->reinit();
+        $filters->active_filter = \GaletteObjectsLend\Repository\Objects::ACTIVE_OBJECTS;
+        $this->assertCount(3, $objects->getObjectsList(true));
+        $this->assertSame(3, $objects->getCount());
+
+        $filters->active_filter = \GaletteObjectsLend\Repository\Objects::INACTIVE_OBJECTS;
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        $filters->reinit();
+        $filters->category_filter = -1;
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        $filters->category_filter = $first_category_id;
+        $this->assertCount(2, $objects->getObjectsList(true));
+        $this->assertSame(2, $objects->getCount());
+
+        $filters->category_filter = $second_category_id;
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        $filters->reinit();
+        $filters->filter_str = 'OBJECT';
+        $this->assertCount(4, $objects->getObjectsList(true));
+        $this->assertSame(4, $objects->getCount());
+
+        $filters->filter_str = 'first';
+        $this->assertCount(2, $objects->getObjectsList(true));
+        $this->assertSame(2, $objects->getCount());
+
+        //disable view description
+        $orig_prefs = $this->lend_prefs->getPreferences();
+        $all_prefs = $orig_prefs;
+        $all_prefs[\GaletteObjectsLend\Entity\Preferences::PARAM_VIEW_DESCRIPTION] = 0;
+        $this->assertTrue($this->lend_prefs->store($all_prefs));
+
+        //only one result (first in name only)
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        //reset prefs
+        $this->assertTrue($this->lend_prefs->store($orig_prefs));
+
+        $filters->field_filter = \GaletteObjectsLend\Repository\Objects::FILTER_ID;
+        $filters->filter_str = (string)$third_object_id;
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        $filters->filter_str = '42';
+        $this->assertCount(0, $objects->getObjectsList(true));
+        $this->assertSame(0, $objects->getCount());
+
+        $filters->field_filter = \GaletteObjectsLend\Repository\Objects::FILTER_SERIAL;
+        $filters->filter_str = 'ABCDE';
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        $filters->field_filter = \GaletteObjectsLend\Repository\Objects::FILTER_DIM;
+        $filters->filter_str = '297';
+        $this->assertCount(1, $objects->getObjectsList(true));
+        $this->assertSame(1, $objects->getCount());
+
+        //quick test ordering
+        $filters->reinit();
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_NAME;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_SERIAL;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_PRICE;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_RENTPRICE;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_WEIGHT;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_STATUS;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_BDATE;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_FDATE;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_MEMBER;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $filters->orderby = \GaletteObjectsLend\Repository\Objects::ORDERBY_CATEGORY;
+        $this->assertCount(4, $objects->getObjectsList(true));
+
+        $this->assertTrue($objects->removeObjects([$first_object_id, $second_object_id, $third_object_id]));
+        $this->assertCount(1, $objects->getObjectsList(true));
+    }
+}

tests/GaletteObjectsLend/Repository/tests/units/Status.php

@@ -28,7 +28,7 @@
  *
  * @author Johan Cwiklinski <johan@x-tnd.be>
  */
-class STatus extends GaletteTestCase
+class Status extends GaletteTestCase
 {
     protected int $seed = 20240526084251;
 
@@ -55,8 +55,6 @@ public function tearDown(): void
         $delete = $this->zdb->delete(LEND_PREFIX . \GaletteObjectsLend\Entity\LendStatus::TABLE);
         $this->zdb->execute($delete);
 
-        /*$delete = $this->zdb->delete(LEND_PREFIX . \GaletteObjectsLend\Entity\LendCategory::TABLE);
-        $this->zdb->execute($delete);*/
         parent::tearDown();
     }