Refactoring repositories #1084

backend/controllers/OrderController.php

@@ -423,7 +423,7 @@ class OrderController extends BackendController
         $productManager = $this->getProductManager();
         $productDistributionManager = $this->getProductDistributionManager();
 
-        $distribution = $distributionManager->findOneDistributionByDate($date);
+        $distribution = $distributionManager->findOneDistribution($date);
         $selectedProductsArray = $productDistributionManager->findProductDistributionsByDistribution($distribution);
         $productsArray = $productManager->findProducts();
         $ordersArray = $orderManager->findOrdersByDate($date);
@@ -549,7 +549,7 @@ class OrderController extends BackendController
         $data = [];
         $filename = 'summary_' . $date;
 
-        $distribution = $distributionManager->findOneDistributionByDate($date);
+        $distribution = $distributionManager->findOneDistribution($date);
         $selectedProductsArray = $productDistributionManager->findProductDistributionsByDistribution($distribution);
 
         // head
@@ -608,7 +608,7 @@ class OrderController extends BackendController
         $productDistributionManager = $this->getProductDistributionManager();
 
         $data = [];
-        $distribution = $distributionManager->findOneDistributionByDate($date);
+        $distribution = $distributionManager->findOneDistribution($date);
         $selectedProductsArray = $productDistributionManager->findProductDistributionsByDistribution($distribution);
 
         // datas
@@ -782,7 +782,7 @@ class OrderController extends BackendController
 
         $products = json_decode($products);
         $pointSale = $pointSaleManager->findOnePointSaleById($idPointSale);
-        $distribution = $distributionManager->findOneDistributionByDate($date);
+        $distribution = $distributionManager->findOneDistribution($date);
         $producerCurrent = $this->getProducerCurrent();
 
         if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $date)

common/logic/AbstractRepository.php

@@ -4,5 +4,24 @@ namespace common\logic;
 
 abstract class AbstractRepository extends AbstractService implements RepositoryInterface
 {
+    public function createQuery()
+    {
+        $this->repositoryQuery->createQuery();
 
+        return $this->repositoryQuery;
+    }
+
+    public function createDefaultQuery()
+    {
+        $this->createQuery();
+
+        $defaultOptions = $this->getDefaultOptionsSearch();
+
+        // id producer
+        if(isset($defaultOptions['attribute_id_producer']) && $defaultOptions['attribute_id_producer']) {
+            $this->repositoryQuery->andWhere([$defaultOptions['attribute_id_producer'] => $this->getProducerContextId()]);
+        }
+
+        return $this->repositoryQuery;
+    }
 }

common/logic/AbstractRepositoryQuery.php

@@ -2,7 +2,31 @@
 
 namespace common\logic;
 
+use yii\db\ActiveQuery;
+
 class AbstractRepositoryQuery extends AbstractService implements RepositoryQueryInterface
 {
+    protected ActiveQuery $query;
+
+    public function __call(string $name, $params): self
+    {
+        call_user_func_array([$this->query, $name], $params);
+
+        return $this;
+    }
+
+    public function find()
+    {
+        return $this->query->all();
+    }
+
+    public function findOne()
+    {
+        return $this->query->one();
+    }
 
+    public function filterById(int $id)
+    {
+        $this->query->andWhere(['id' => $id]);
+    }
 }

common/logic/Config/TaxRate/Repository/TaxRateRepository.php

@@ -4,6 +4,7 @@ namespace common\logic\Config\TaxRate\Repository;
 
 use common\logic\AbstractRepository;
 use common\logic\Config\TaxRate\Model\TaxRate;
+use yii\db\ActiveQuery;
 
 class TaxRateRepository extends AbstractRepository
 {
@@ -26,15 +27,17 @@ class TaxRateRepository extends AbstractRepository
 
     public function findOneTaxRateById(int $id): ?TaxRate
     {
-        return TaxRate::searchOne(['id' => $id]);
+        $query = $this->createQuery();
+        $query->filterById($id);
+        return $query->findOne();
     }
 
     public function findTaxRates(): array
     {
-        return TaxRate::find()->all();
+        $query = $this->createQuery();
+        return $query->find();
     }
 
-    // getTaxRateArray
     public function findTaxRatesAsArray(): array
     {
         $taxRateArrayReturn = [];

common/logic/Config/TaxRate/Repository/TaxRateRepositoryQuery.php

@@ -3,8 +3,12 @@
 namespace common\logic\Config\TaxRate\Repository;
 
 use common\logic\AbstractRepositoryQuery;
+use common\logic\Config\TaxRate\Model\TaxRate;
 
 class TaxRateRepositoryQuery extends AbstractRepositoryQuery
 {
-
+    public function createQuery()
+    {
+        $this->query = TaxRate::find();
+    }
 }

common/logic/Distribution/Distribution/Repository/DistributionRepository.php

@@ -6,19 +6,18 @@ use common\helpers\GlobalParam;
 use common\logic\AbstractRepository;
 use common\logic\Distribution\Distribution\Model\Distribution;
 use common\logic\Distribution\Distribution\Service\DistributionSolver;
-use common\logic\Producer\Producer\Model\Producer;
 use common\logic\Subscription\Subscription\Model\Subscription;
 use common\logic\Subscription\Subscription\Service\SubscriptionSolver;
 
 class DistributionRepository extends AbstractRepository
 {
-    protected DistributionRepositoryQuery $query;
+    protected DistributionRepositoryQuery $repositoryQuery;
     protected DistributionSolver $distributionSolver;
     protected SubscriptionSolver $subscriptionSolver;
 
     public function loadDependencies(): void
     {
-        $this->query = $this->loadService(DistributionRepositoryQuery::class);
+        $this->repositoryQuery = $this->loadService(DistributionRepositoryQuery::class);
         $this->distributionSolver = $this->loadService(DistributionSolver::class);
         $this->subscriptionSolver = $this->loadService(SubscriptionSolver::class);
     }
@@ -35,30 +34,19 @@ class DistributionRepository extends AbstractRepository
 
     public function findOneDistributionById(int $id): ?Distribution
     {
-        return Distribution::searchOne([
-            'id' => $id
-        ]);
+        return $this->createQuery()
+            ->filterById($id)
+            ->findOne();
     }
 
     public function findOneDistribution(string $date, bool $active = null): ?Distribution
     {
-        $paramsDistribution = [
-            'date' => $date,
-            'distribution.id_producer' => $this->getProducerContext()->id
-        ];
-
+        $query = $this->createDefaultQuery();
+        $query->filterByDate($date);
         if(!is_null($active)) {
-            $paramsDistribution['active'] = $active;
+            $query->filterByActive($active);
         }
-
-        return Distribution::searchOne($paramsDistribution);
-    }
-
-    public function findOneDistributionByDate(string $date): ?Distribution
-    {
-        return Distribution::searchOne([
-            'distribution.date' => $date
-        ]);
+        return $query->findOne();
     }
 
     public function findOneFirstDistribution(): ?Distribution

common/logic/Distribution/Distribution/Repository/DistributionRepositoryQuery.php

@@ -3,8 +3,22 @@
 namespace common\logic\Distribution\Distribution\Repository;
 
 use common\logic\AbstractRepositoryQuery;
+use common\logic\Distribution\Distribution\Model\Distribution;
+use yii\db\ActiveQuery;
 
 class DistributionRepositoryQuery extends AbstractRepositoryQuery
 {
+    public function createQuery()
+    {
+        $this->query = Distribution::find();
 
+        return $this;
+    }
+
+    public function filterByDate(string $date)
+    {
+        $this->query->andWhere(['date' => $date]);
+
+        return $this;
+    }
 }

common/logic/Order/Order/Service/OrderBuilder.php

@@ -112,7 +112,7 @@ class OrderBuilder extends AbstractBuilder
     {
         $now = date('Y-m-d');
         $distributionDate = date('Y-m-d', strtotime($date));
-        $distribution = $this->distributionRepository->findOneDistributionByDate($distributionDate);
+        $distribution = $this->distributionRepository->findOneDistribution($distributionDate);
 
         if ($distribution
             && $distribution->active
@@ -137,7 +137,7 @@ class OrderBuilder extends AbstractBuilder
     public function createAllOrdersFromSubscriptions(string $date, bool $force = false): array
     {
         $orderArray = [];
-        $distribution = $this->distributionRepository->findOneDistributionByDate(date('Y-m-d', strtotime($date)));
+        $distribution = $this->distributionRepository->findOneDistribution(date('Y-m-d', strtotime($date)));
 
         if ($distribution) {
             $orderArray = $this->orderRepository->findOrdersByDistribution($distribution);

common/logic/ProducerContextTrait.php

@@ -24,4 +24,9 @@ trait ProducerContextTrait
 
         return $this->producerContext;
     }
+
+    public function getProducerContextId()
+    {
+        return $this->getProducerContext()->id;
+    }
 }