test fixes fleet+expense tests

Admin/Updater.php

@@ -26,4 +26,11 @@ use phpOMS\Module\UpdaterAbstract;
  */
 final class Updater extends UpdaterAbstract
 {
+    /**
+     * Path of the file
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public const PATH = __DIR__;
 }

Controller/ApiBillController.php

@@ -509,9 +509,7 @@ final class ApiBillController extends Controller
     {
         return '/Modules/Billing/Bills/'
             . $this->app->unitId . '/'
-            . $bill->createdAt->format('Y') . '/'
+            . $bill->createdAt->format('Y/m/d') . '/'
-            . $bill->createdAt->format('m') . '/'
-            . $bill->createdAt->format('d') . '/'
             . $bill->id;
     }
 

Controller/ApiPurchaseController.php

@@ -39,7 +39,7 @@ use phpOMS\Uri\HttpUri;
  */
 final class ApiPurchaseController extends Controller
 {
-        /**
+    /**
      * Api method to create bill files
      *
      * @param RequestAbstract  $request  Request

Models/PurchaseBillMapper.php

@@ -248,29 +248,6 @@ final class PurchaseBillMapper extends BillMapper
         return [$suppliers, $data];
     }
 
-    /**
-     * Placeholder
-     */
-    public static function getItemRegionPurchase(int $id, \DateTime $start, \DateTime $end) : array
-    {
-        $query  = new Builder(self::$db);
-        $result = $query->select(CountryMapper::TABLE . '.country_region')
-            ->selectAs('SUM(billing_bill_element_total_netpurchaseprice)', 'net_purchase')
-            ->from(self::TABLE)
-            ->leftJoin(BillElementMapper::TABLE)
-                ->on(self::TABLE . '.billing_bill_id', '=', BillElementMapper::TABLE . '.billing_bill_element_bill')
-            ->leftJoin(CountryMapper::TABLE)
-                ->on(self::TABLE . '.billing_bill_billCountry', '=', CountryMapper::TABLE . '.country_code2')
-            ->where(BillElementMapper::TABLE . '.billing_bill_element_item', '=', $id)
-            ->andWhere(self::TABLE . '.billing_bill_performance_date', '>=', $start)
-            ->andWhere(self::TABLE . '.billing_bill_performance_date', '<=', $end)
-            ->groupBy(CountryMapper::TABLE . '.country_region')
-            ->execute()
-            ?->fetchAll(\PDO::FETCH_KEY_PAIR);
-
-        return $result ?? [];
-    }
-
     /**
      * Placeholder
      */

Models/SalesBillMapper.php

@@ -306,29 +306,6 @@ final class SalesBillMapper extends BillMapper
         return BillElementMapper::getAll()->execute($query);
     }
 
-    /**
-     * Placeholder
-     */
-    public static function getItemRegionSales(int $id, \DateTime $start, \DateTime $end) : array
-    {
-        $query  = new Builder(self::$db);
-        $result = $query->select(CountryMapper::TABLE . '.country_region')
-            ->selectAs('SUM(billing_bill_element_total_netsalesprice)', 'net_sales')
-            ->from(self::TABLE)
-            ->leftJoin(BillElementMapper::TABLE)
-                ->on(self::TABLE . '.billing_bill_id', '=', BillElementMapper::TABLE . '.billing_bill_element_bill')
-            ->leftJoin(CountryMapper::TABLE)
-                ->on(self::TABLE . '.billing_bill_billCountry', '=', CountryMapper::TABLE . '.country_code2')
-            ->where(BillElementMapper::TABLE . '.billing_bill_element_item', '=', $id)
-            ->andWhere(self::TABLE . '.billing_bill_performance_date', '>=', $start)
-            ->andWhere(self::TABLE . '.billing_bill_performance_date', '<=', $end)
-            ->groupBy(CountryMapper::TABLE . '.country_region')
-            ->execute()
-            ?->fetchAll(\PDO::FETCH_KEY_PAIR);
-
-        return $result ?? [];
-    }
-
     /**
      * Placeholder
      */

tests/Models/PurchaseBillMapperTest.php

@@ -113,15 +113,6 @@ final class PurchaseBillMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([[], []], PurchaseBillMapper::getItemTopSuppliers(99999, new \DateTime('now'), new \DateTime('now')));
     }
 
-    /**
-     * @covers Modules\Billing\Models\PurchaseBillMapper
-     * @group module
-     */
-    public function testGetItemRegionPurchaseInvalid() : void
-    {
-        self::assertEquals([], PurchaseBillMapper::getItemRegionPurchase(99999, new \DateTime('now'), new \DateTime('now')));
-    }
-
     /**
      * @covers Modules\Billing\Models\PurchaseBillMapper
      * @group module

tests/Models/SalesBillMapperTest.php

@@ -131,15 +131,6 @@ final class SalesBillMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([], SalesBillMapper::getClientItem(99999, new \DateTime('now'), new \DateTime('now')));
     }
 
-    /**
-     * @covers Modules\Billing\Models\SalesBillMapper
-     * @group module
-     */
-    public function testGetItemRegionSalesInvalid() : void
-    {
-        self::assertEquals([], SalesBillMapper::getItemRegionSales(99999, new \DateTime('now'), new \DateTime('now')));
-    }
-
     /**
      * @covers Modules\Billing\Models\SalesBillMapper
      * @group module