Merge remote-tracking branch 'ion/master' into 3.0

# Conflicts:
#	Model/Request/RequestSave.php
#	Model/Response/ResponseLoadDeliveryData.php
#	Model/ResponseLoadDeliveryData.php

Command/StatusesCommand.php

@@ -2,8 +2,7 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Command;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
+use Doctrine\Persistence\ObjectManager;
-use RetailCrm\DeliveryModuleBundle\Exception\AbstractModuleException;
 use RetailCrm\DeliveryModuleBundle\Service\AccountManager;
 use RetailCrm\DeliveryModuleBundle\Service\ModuleManagerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -16,6 +15,8 @@ class StatusesCommand extends Command
 {
     use LockableTrait;
 
+    const QUERY_MAX_RESULTS = 100;
+
     /**
      * @var ModuleManagerInterface
      */
@@ -26,6 +27,11 @@ class StatusesCommand extends Command
      */
     private $accountManager;
 
+    /**
+     * @var ObjectManager
+     */
+    private $entityManager;
+
     /**
      * {@inheritdoc}
      */
@@ -34,13 +40,15 @@ class StatusesCommand extends Command
         $this
             ->setName('statuses:update')
             ->setDescription('Update statuses')
-            ->addArgument('accountId', InputArgument::OPTIONAL, 'Choose account, or make it for all');
+            ->addArgument('accountId', InputArgument::OPTIONAL, 'Choose account, or make it for all')
+        ;
     }
 
-    public function __construct(ModuleManagerInterface $moduleManager, AccountManager $accountManager)
+    public function __construct(ModuleManagerInterface $moduleManager, AccountManager $accountManager, ObjectManager $entityManager)
     {
         $this->moduleManager = $moduleManager;
         $this->accountManager = $accountManager;
+        $this->entityManager = $entityManager;
 
         parent::__construct();
     }
@@ -60,40 +68,57 @@ class StatusesCommand extends Command
             ? (int) $input->getArgument('accountId')
             : null;
 
-        $paginator = [];
+        $accountQueryBuilder = $this->accountManager->getActiveQueryBuilder()
+            ->andWhere('account.id > :lastId')
+            ->setMaxResults(static::QUERY_MAX_RESULTS)
+        ;
+
         if (null !== $accountId) {
-            $paginator = [$this->accountManager - find($accountId)];
+            $accountQueryBuilder
-        } else {
+                ->andWhere('account.id = :accountId')
-            $accountQuery = $this->accountManager->getRepository()
+                ->setParameter('accountId', $accountId)
-                ->createQueryBuilder('account')
+            ;
-                ->where('account.active = true')
-                ->andWhere('account.freeze != true')
-                ->addOrderBy('account.id')
-                ->getQuery()
-               ->setFirstResult(0)
-               ->setMaxResults(100);
-            $paginator = new Paginator($accountQuery);
         }
 
+        $accountQuery = $accountQueryBuilder->getQuery();
+
+        $commandResult = 0;
         $count = 0;
-        foreach ($paginator as $account) {
+        $lastId = 0;
-            try {
+        while (true) {
-                $count += $this->moduleManager
+            $accountQuery->setParameter('lastId', $lastId);
-                    ->setAccount($account)
+
-                    ->updateStatuses()
+            $result = $accountQuery->getResult();
-                ;
+            if (empty($result)) {
-            } catch (AbstractModuleException $e) {
+                break;
-                $output->writeln(
-                    "<error>Failed to update statuses for account {$account->getCrmUrl()}[{$account->getId()}]</error>"
-                );
-                $output->writeln("<error>Error: {$e->getMessage()}</error>");
             }
+
+            foreach ($result as $account) {
+                $lastId = $account->getId();
+
+                try {
+                    $count += $this->moduleManager
+                        ->setAccount($account)
+                        ->updateStatuses()
+                    ;
+                } catch (\Exception $e) {
+                    $output->writeln(
+                        "<error>Failed to update statuses for account {$account->getCrmUrl()}[{$account->getId()}]</error>"
+                    );
+                    $output->writeln("<error>Error: {$e->getMessage()}</error>");
+
+                    $commandResult = 1;
+                }
+            }
+
+            $this->entityManager->clear();
+            gc_collect_cycles();
         }
 
         $output->writeln("<info>{$count} statuses updated.</info>");
 
         $this->release();
 
-        return 0;
+        return $commandResult;
     }
 }

Command/Traits/CommandOutputFormatterTrait.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace RetailCrm\DeliveryModuleBundle\Command\Traits;
+
+trait CommandOutputFormatterTrait
+{
+    public function getMessage(string $level, string $message): string
+    {
+        return sprintf("%s %s %s", date('Y-m-d H:i:s'), strtoupper($level), $message);
+    }
+
+    public function getInfoMessage(string $message): string
+    {
+        return $this->getMessage('INFO', $message);
+    }
+
+    public function getErrorMessage(string $message): string
+    {
+        return $this->getMessage('ERROR', $message);
+    }
+}

Command/UpdateModuleCommand.php

@@ -2,7 +2,7 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Command;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
+use Doctrine\Persistence\ObjectManager;
 use RetailCrm\DeliveryModuleBundle\Service\AccountManager;
 use RetailCrm\DeliveryModuleBundle\Service\ModuleManagerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -15,6 +15,8 @@ class UpdateModuleCommand extends Command
 {
     use LockableTrait;
 
+    const QUERY_MAX_RESULTS = 100;
+
     /**
      * @var ModuleManagerInterface
      */
@@ -25,6 +27,11 @@ class UpdateModuleCommand extends Command
      */
     private $accountManager;
 
+    /**
+     * @var ObjectManager
+     */
+    private $entityManager;
+
     /**
      * {@inheritdoc}
      */
@@ -33,13 +40,15 @@ class UpdateModuleCommand extends Command
         $this
             ->setName('module:update')
             ->setDescription('Update module')
-            ->addArgument('accountId', InputArgument::OPTIONAL, 'Choose account, or make it for all');
+            ->addArgument('accountId', InputArgument::OPTIONAL, 'Choose account, or make it for all')
+        ;
     }
 
-    public function __construct(ModuleManagerInterface $moduleManager, AccountManager $accountManager)
+    public function __construct(ModuleManagerInterface $moduleManager, AccountManager $accountManager, ObjectManager $entityManager)
     {
         $this->moduleManager = $moduleManager;
         $this->accountManager = $accountManager;
+        $this->entityManager = $entityManager;
 
         parent::__construct();
     }
@@ -59,41 +68,59 @@ class UpdateModuleCommand extends Command
             ? $input->getArgument('accountId')
             : null;
 
-        $paginator = [];
+        $accountQueryBuilder = $this->accountManager->getActiveQueryBuilder()
+            ->andWhere('account.id > :lastId')
+            ->setMaxResults(static::QUERY_MAX_RESULTS)
+        ;
+
         if (null !== $accountId) {
-            $paginator = [$this->accountManager->find($accountId)];
+            $accountQueryBuilder
-        } else {
+                ->andWhere('account.id = :accountId')
-            $accountQuery = $this->accountManager->getRepository()
+                ->setParameter('accountId', $accountId)
-                ->createQueryBuilder('account')
+            ;
-                ->where('account.active = true')
-                ->andWhere('account.freeze != true')
-                ->addOrderBy('account.id')
-                ->getQuery()
-                ->setFirstResult(0)
-                ->setMaxResults(100);
-            $paginator = new Paginator($accountQuery);
         }
 
+        $accountQuery = $accountQueryBuilder->getQuery();
+
+        $commandResult = 0;
         $count = 0;
-        foreach ($paginator as $account) {
+
-            try {
+        $lastId = 0;
-                $this->moduleManager
+        while (true) {
-                    ->setAccount($account)
+            $accountQuery->setParameter('lastId', $lastId);
-                    ->updateModuleConfiguration()
+
-                ;
+            $result = $accountQuery->getResult();
-                ++$count;
+            if (empty($result)) {
-            } catch (\Exception $e) {
+                break;
-                $output->writeln(
-                    "<error>Failed to update configuration for account {$account->getCrmUrl()}[{$account->getId()}]</error>"
-                );
-                $output->writeln("<error>Error: {$e->getMessage()}</error>");
             }
+
+            foreach ($result as $account) {
+                $lastId = $account->getId();
+
+                try {
+                    $this->moduleManager
+                        ->setAccount($account)
+                        ->updateModuleConfiguration()
+                    ;
+                    ++$count;
+                } catch (\Exception $e) {
+                    $output->writeln(
+                        "<error>Failed to update configuration for account {$account->getCrmUrl()}[{$account->getId()}]</error>"
+                    );
+                    $output->writeln("<error>Error: {$e->getMessage()}</error>");
+
+                    $commandResult = 1;
+                }
+            }
+
+            $this->entityManager->clear();
+            gc_collect_cycles();
         }
 
         $output->writeln("<info>{$count} modules updated.</info>");
 
         $this->release();
 
-        return 0;
+        return $commandResult;
     }
 }

Model/Customer.php

@@ -79,7 +79,7 @@ class Customer
      *
      * @Serializer\Groups({"get"})
      * @Serializer\SerializedName("contragent")
-     * @Serializer\Type("RetailCrm\DeliveryModuleBundle\Model\Model\Contragent")
+     * @Serializer\Type("RetailCrm\DeliveryModuleBundle\Model\Contragent")
      */
     public $contragent;
 

Model/Request/RequestCalculate.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
-use Intaro\CRMBundle\Entity\Model\DeliveryTime;
+use RetailCrm\DeliveryModuleBundle\Model\DeliveryTime;
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Traits\ExtraDataTrait;
 
 class RequestCalculate
 {
-    use Traits\ExtraDataTrait;
+    use ExtraDataTrait;
 
     /**
      * Адрес отгрузки.
@@ -34,7 +35,7 @@ class RequestCalculate
     /**
      * Набор упаковок.
      *
-     * @var Intaro\CRMDeliveryBundle\Form\Model\Package[]
+     * @var RetailCrm\DeliveryModuleBundle\Model\Package[]
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("packages")

Model/Request/RequestDelete.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Request/RequestPrint.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Request/RequestSave.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
+use RetailCrm\DeliveryModuleBundle\Model\Customer;
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Manager;
 
 class RequestSave
 {

Model/Request/RequestShipmentDelete.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Request/RequestShipmentSave.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Traits\ExtraDataTrait;
 
 class RequestShipmentSave
 {
-    use Traits\ExtraDataTrait;
+    use ExtraDataTrait;
 
     /**
      * Идентификатор отгрузки в службе доставки. Передается если требуется отредактировать уже оформленную отгрузку

Model/Request/RequestStatusUpdateItem.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\StatusInfo;
 
 class RequestStatusUpdateItem
 {

Model/RequestCalculate.php

@@ -11,7 +11,7 @@ class RequestCalculate
     /**
      * Адрес отгрузки.
      *
-     * @var RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress
+     * @var DeliveryAddress
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("shipmentAddress")
@@ -33,7 +33,7 @@ class RequestCalculate
     /**
      * Набор упаковок.
      *
-     * @var RetailCrm\DeliveryModuleBundle\Model\Package[]
+     * @var Package[]
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("packages")

Model/Response/ResponseAutocompleteItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Response/ResponseAutocompleteSuccessful.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Response/ResponseCalculate.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Terminal;
 
 class ResponseCalculate
 {

Model/Response/ResponseCalculateSuccessful.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Response/ResponseLoadDeliveryData.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
+use RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress;
+use RetailCrm\DeliveryModuleBundle\Model\StatusInfo;
 use JMS\Serializer\Annotation as Serializer;
 
 class ResponseLoadDeliveryData

Model/Response/ResponseResult.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 class ResponseResult
 {

Model/Response/ResponseSave.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/Response/ResponseShipmentSave.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;

Model/Response/ResponseSuccessful.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 

Model/ResponseLoadDeliveryData.php

@@ -53,7 +53,7 @@ class ResponseLoadDeliveryData
     /**
      * Время доставки
      *
-     * @var RetailCrm\DeliveryModuleBundle\Model\DeliveryTime
+     * @var DeliveryTime
      *
      * @Serializer\Groups({"response"})
      * @Serializer\SerializedName("deliveryTime")

Model/Settings.php

@@ -3,7 +3,6 @@
 namespace RetailCrm\DeliveryModuleBundle\Model;
 
 use JMS\Serializer\Annotation as Serializer;
-use RetailCrm\DeliveryModuleBundle\Model\Settings\ExtraData;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\PaymentType;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\ShipmentPoint;
 use RetailCrm\DeliveryModuleBundle\Model\Settings\Status;
@@ -77,7 +76,7 @@ class Settings
     public $statuses;
 
     /**
-     * @var array|ExtraData[]
+     * @var array
      *
      * @Serializer\Groups({"set", "get"})
      * @Serializer\SerializedName("deliveryExtraData")
@@ -86,7 +85,7 @@ class Settings
     public $deliveryExtraData;
 
     /**
-     * @var array|ExtraData[]
+     * @var array
      *
      * @Serializer\Groups({"set", "get"})
      * @Serializer\SerializedName("shipmentExtraData")

Model/Store.php

@@ -23,4 +23,13 @@ class Store
      * @Serializer\Type("string")
      */
     public $name;
+
+    /**
+     * @var StoreWorkTime
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("workTime")
+     * @Serializer\Type("RetailCrm\DeliveryModuleBundle\Model\StoreWorkTime")
+     */
+    public $workTime;
 }

Model/StoreWorkTime.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace RetailCrm\DeliveryModuleBundle\Model;
+
+use JMS\Serializer\Annotation as Serializer;
+
+class StoreWorkTime
+{
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("mo")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $monday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("tu")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $tuesday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("we")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $wednesday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("th")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $thursday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("fr")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $friday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("sa")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $saturday;
+
+    /**
+     * @var array<StoreWorkTimeItem>
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("su")
+     * @Serializer\Type("array<RetailCrm\DeliveryModuleBundle\Model\StoreWorkTimeItem>")
+     */
+    public $sunday;
+}

Model/StoreWorkTimeItem.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace RetailCrm\DeliveryModuleBundle\Model;
+
+use JMS\Serializer\Annotation as Serializer;
+
+class StoreWorkTimeItem
+{
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("startTime")
+     * @Serializer\Type("string")
+     */
+    public $startTime;
+
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("endTime")
+     * @Serializer\Type("string")
+     */
+    public $endTime;
+
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("lunchStartTime")
+     * @Serializer\Type("string")
+     */
+    public $lunchStartTime;
+
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("lunchEndTime")
+     * @Serializer\Type("string")
+     */
+    public $lunchEndTime;
+}

Model/Unit.php

@@ -2,6 +2,8 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Model;
 
+use JMS\Serializer\Annotation as Serializer;
+
 class Unit
 {
     /**

Service/AccountManager.php

@@ -52,4 +52,13 @@ class AccountManager
     {
         return $this->entityManager->getRepository($this->class);
     }
+
+    public function getActiveQueryBuilder()
+    {
+        return $this->getRepository()->createQueryBuilder('account')
+            ->where('account.active = true')
+            ->andWhere('account.freeze != true')
+            ->orderBy('account.id')
+        ;
+    }
 }

Service/DeliveryOrderManager.php

@@ -8,8 +8,16 @@ use RetailCrm\DeliveryModuleBundle\Model\Entity\DeliveryOrder;
 
 class DeliveryOrderManager
 {
+    /**
+     * @var string
+     */
     protected $class;
 
+    /**
+     * @var ObjectManager
+     */
+    protected $entityManager;
+
     public function __construct(string $deliveryOrderClass, ObjectManager $entityManager)
     {
         $this->class = $deliveryOrderClass;

Service/ModuleManager.php

@@ -79,7 +79,7 @@ abstract class ModuleManager implements ModuleManagerInterface
     /**
      * @var LoggerInterface
      */
-    private $logger;
+    protected $logger;
 
     public function __construct(
         array $moduleParameters,
@@ -157,8 +157,9 @@ abstract class ModuleManager implements ModuleManagerInterface
             return true;
         } else {
             if ($this->logger) {
-                $errorMsg = $response['error_msg'] ?? '';
+                $errorMsg = $response['errorMsg'] ?? '';
-                $this->logger->warning("Failed to update module configuration[account={$this->getAccount()->getCrmUrl()}]:{$errorMsg}");
+                $errors = json_encode($response['errors'] ?? '');
+                $this->logger->warning("Failed to update module configuration[account={$this->getAccount()->getCrmUrl()}]: {$errorMsg}. Detailed errors: {$errors}");
             }
 
             return false;
@@ -238,7 +239,7 @@ abstract class ModuleManager implements ModuleManagerInterface
     {
         $deliveries = $this->deliveryManager->findBy([
             'account' => $this->account,
-            'externalId' => $request->deliveryIds,
+            'externalId' => $request->deliveryIds[0] ?? null,
         ]);
 
         if (empty($deliveries)) {