fix: "group by" error

src/Handler/ErrorHandler/ErrorHandler.php

@@ -51,10 +51,10 @@ class ErrorHandler
     public function __construct($sentryDsn, $sentryEnv)
     {
         try {
-            /** @var \ModuleCore $accountsModule */
+            /** @var false|\ModuleCore $accountsModule */
             $accountsModule = \Module::getInstanceByName('ps_accounts');
             /** @var mixed $accountService */
-            $accountService = $accountsModule->get('PrestaShop\Module\PsAccounts\Service\PsAccountsService');
+            $accountService = $accountsModule->getService('PrestaShop\Module\PsAccounts\Service\PsAccountsService');
 
             /** @var \ModuleCore $eventbusModule */
             $eventbusModule = \Module::getInstanceByName('ps_eventbus');

src/Repository/BundleRepository.php

@@ -38,7 +38,7 @@ class BundleRepository extends AbstractRepository implements RepositoryInterface
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */
@@ -103,7 +103,7 @@ public function retrieveContentsForIncremental($limit, $contentIds, $langIso)
 
         $this->query
             ->where('pac.id_product_pack IN(' . implode(',', array_map('intval', $contentIds)) . ')')
-            // ->limit($limit) Sub shop content depend from another, temporary disabled
+            ->limit($limit)
         ;
 
         return $this->runQuery();

src/Repository/CarrierDetailRepository.php

@@ -38,26 +38,28 @@ class CarrierDetailRepository extends AbstractRepository implements RepositoryIn
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */
     public function generateFullQuery($langIso, $withSelecParameters)
     {
         $this->generateMinimalQuery(self::TABLE_NAME, 'ca');
 
+        // minimal query for countable query
         $this->query
             ->innerJoin('delivery', 'd', 'ca.id_carrier = d.id_carrier AND d.id_zone IS NOT NULL')
             ->innerJoin('country', 'co', 'd.id_zone = co.id_zone AND co.iso_code IS NOT NULL AND co.active = 1')
             ->leftJoin('range_weight', 'rw', 'ca.id_carrier = rw.id_carrier AND d.id_range_weight = rw.id_range_weight')
             ->leftJoin('range_price', 'rp', 'ca.id_carrier = rp.id_carrier AND d.id_range_price = rp.id_range_price')
             ->leftJoin('state', 's', 'co.id_zone = s.id_zone AND co.id_country = s.id_country AND s.active = 1')
             ->leftJoin('configuration', 'conf', 'conf.name = "PS_SHIPPING_METHOD"')
+            ->select('ca.id_reference')
+            ->groupBy('ca.id_reference, co.id_zone, id_range')
         ;
 
         if ($withSelecParameters) {
             $this->query
-                ->select('ca.id_reference')
                 ->select('d.id_zone')
                 ->select('
                     CASE
@@ -111,8 +113,6 @@ public function generateFullQuery($langIso, $withSelecParameters)
                     ) AS price
                 ')
             ;
-
-            $this->query->groupBy('ca.id_reference, co.id_zone, id_range');
         }
     }
 
@@ -176,10 +176,10 @@ public function countFullSyncContentLeft($offset, $limit, $langIso)
         $this->generateFullQuery($langIso, true);
 
         $result = $this->db->executeS('
-            SELECT (COUNT(*) - ' . (int) $offset . ') AS count
+            SELECT COUNT(*) - ' . (int) $offset . ' AS count
                 FROM (' . $this->query->build() . ') as subquery;
         ');
 
-        return is_array($result) ? $result[0]['count'] : [];
+        return is_array($result) ? $result[0]['count'] : 0;
     }
 }

src/Repository/CarrierRepository.php

@@ -38,7 +38,7 @@ class CarrierRepository extends AbstractRepository implements RepositoryInterfac
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CarrierTaxeRepository.php

@@ -38,30 +38,29 @@ class CarrierTaxeRepository extends AbstractRepository implements RepositoryInte
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */
     public function generateFullQuery($langIso, $withSelecParameters)
     {
         $this->generateMinimalQuery(self::TABLE_NAME, 'ca');
 
+        // minimal query for countable query
         $this->query
             ->innerJoin('carrier_tax_rules_group_shop', 'ctrgs', 'ca.id_carrier = ctrgs.id_carrier')
             ->innerJoin('tax_rule', 'tr', 'ctrgs.id_tax_rules_group = tr.id_tax_rules_group')
             ->innerJoin('country', 'co', 'tr.id_country = co.id_country AND co.iso_code IS NOT NULL AND co.active = 1')
             ->innerJoin('delivery', 'd', 'ca.id_carrier = d.id_carrier AND d.id_zone IS NOT NULL')
             ->innerJoin('tax', 't', 'tr.id_tax = t.id_tax AND t.active = 1')
             ->leftJoin('state', 's', 'tr.id_state = s.id_state AND s.active = 1')
-        ;
-
-        $this->query
             ->where('(co.id_zone = d.id_zone OR s.id_zone = d.id_zone)')
+            ->select('ca.id_reference')
+            ->groupBy('ca.id_reference, co.id_zone, id_range, country_id')
         ;
 
         if ($withSelecParameters) {
             $this->query
-                ->select('ca.id_reference')
                 ->select('co.id_zone')
                 ->select('
                     CASE
@@ -81,8 +80,6 @@ public function generateFullQuery($langIso, $withSelecParameters)
                 ')
                 ->select('t.rate AS tax_rate')
             ;
-
-            $this->query->groupBy('ca.id_reference, co.id_zone, id_range, country_id');
         }
     }
 
@@ -146,10 +143,10 @@ public function countFullSyncContentLeft($offset, $limit, $langIso)
         $this->generateFullQuery($langIso, true);
 
         $result = $this->db->executeS('
-            SELECT (COUNT(*) - ' . (int) $offset . ') AS count
+            SELECT COUNT(*) - ' . (int) $offset . ' AS count
                 FROM (' . $this->query->build() . ') as subquery;
         ');
 
-        return is_array($result) ? $result[0]['count'] : [];
+        return is_array($result) ? $result[0]['count'] : 0;
     }
 }

src/Repository/CartProductRepository.php

@@ -38,7 +38,7 @@ class CartProductRepository extends AbstractRepository implements RepositoryInte
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CartRepository.php

@@ -38,7 +38,7 @@ class CartRepository extends AbstractRepository implements RepositoryInterface
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CartRuleRepository.php

@@ -38,7 +38,7 @@ class CartRuleRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CategoryRepository.php

@@ -38,7 +38,7 @@ class CategoryRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CurrencyRepository.php

@@ -38,7 +38,7 @@ class CurrencyRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CustomProductCarrierRepository.php

@@ -38,7 +38,7 @@ class CustomProductCarrierRepository extends AbstractRepository implements Repos
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/CustomerRepository.php

@@ -38,7 +38,7 @@ class CustomerRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/EmployeeRepository.php

@@ -38,7 +38,7 @@ class EmployeeRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/ImageRepository.php

@@ -38,7 +38,7 @@ class ImageRepository extends AbstractRepository implements RepositoryInterface
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/ImageTypeRepository.php

@@ -38,7 +38,7 @@ class ImageTypeRepository extends AbstractRepository implements RepositoryInterf
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/LanguageRepository.php

@@ -38,7 +38,7 @@ class LanguageRepository extends AbstractRepository implements RepositoryInterfa
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/ManufacturerRepository.php

@@ -38,7 +38,7 @@ class ManufacturerRepository extends AbstractRepository implements RepositoryInt
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/ModuleRepository.php

@@ -38,7 +38,7 @@ class ModuleRepository extends AbstractRepository implements RepositoryInterface
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/OrderCarrierRepository.php

@@ -38,7 +38,7 @@ class OrderCarrierRepository extends AbstractRepository implements RepositoryInt
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */

src/Repository/OrderCartRuleRepository.php

@@ -38,7 +38,7 @@ class OrderCartRuleRepository extends AbstractRepository implements RepositoryIn
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */
@@ -101,8 +101,8 @@ public function retrieveContentsForIncremental($limit, $contentIds, $langIso)
         $this->generateFullQuery($langIso, true);
 
         $this->query
-            ->where('ocr.id_order IN(' . implode(',', array_map('intval', $contentIds)) . ')')
-            // ->limit($limit) Sub shop content depend from another, temporary disabled
+            ->where('ocr.id_order_cart_rule IN(' . implode(',', array_map('intval', $contentIds)) . ')')
+            ->limit($limit)
         ;
 
         return $this->runQuery();

src/Repository/OrderDetailRepository.php

@@ -38,7 +38,7 @@ class OrderDetailRepository extends AbstractRepository implements RepositoryInte
      * @param string $langIso
      * @param bool $withSelecParameters
      *
-     * @return mixed
+     * @return void
      *
      * @throws \PrestaShopException
      */
@@ -56,18 +56,20 @@ public function generateFullQuery($langIso, $withSelecParameters)
 
         $this->generateMinimalQuery(self::TABLE_NAME, 'od');
 
+        // minimal query for countable query
         $this->query
             ->where('od.id_shop = ' . $context->shop->id)
             ->innerJoin('orders', 'o', 'od.id_order = o.id_order')
             ->leftJoin('order_slip_detail', 'osd', 'od.id_order_detail = osd.id_order_detail')
             ->leftJoin('product_shop', 'ps', 'od.product_id = ps.id_product AND ps.id_shop = ' . (int) $context->shop->id)
             ->leftJoin('currency', 'c', 'c.id_currency = o.id_currency')
             ->leftJoin('lang', 'l', 'o.id_lang = l.id_lang')
+            ->select('od.id_order_detail')
+            ->groupBy('od.id_order_detail')
         ;
 
         if ($withSelecParameters) {
             $this->query
-                ->select('od.id_order_detail')
                 ->select('od.id_order')
                 ->select('od.product_id')
                 ->select('od.product_attribute_id')
@@ -98,8 +100,6 @@ public function retrieveContentsForFull($offset, $limit, $langIso)
     {
         $this->generateFullQuery($langIso, true);
 
-        $this->query->groupBy('od.id_order_detail');
-
         $this->query->limit((int) $limit, (int) $offset);
 
         return $this->runQuery();
@@ -124,8 +124,8 @@ public function retrieveContentsForIncremental($limit, $contentIds, $langIso)
         $this->generateFullQuery($langIso, true);
 
         $this->query
-            ->where('od.id_order IN(' . implode(',', array_map('intval', $contentIds)) . ')')
-            // ->limit($limit) Sub shop content depend from another, temporary disabled
+            ->where('od.id_order_detail IN(' . implode(',', array_map('intval', $contentIds)) . ')')
+            ->limit($limit)
         ;
 
         return $this->runQuery();
@@ -143,12 +143,13 @@ public function retrieveContentsForIncremental($limit, $contentIds, $langIso)
      */
     public function countFullSyncContentLeft($offset, $limit, $langIso)
     {
-        $this->generateFullQuery($langIso, false);
-
-        $this->query->select('(COUNT(*) - ' . (int) $offset . ') as count');
+        $this->generateFullQuery($langIso, true);
 
-        $result = $this->runQuery(true);
+        $result = $this->db->executeS('
+            SELECT COUNT(*) - ' . (int) $offset . ' AS count
+                FROM (' . $this->query->build() . ') as subquery;
+        ');
 
-        return $result[0]['count'];
+        return is_array($result) ? $result[0]['count'] : 0;
     }
 }