Skip to content

Common refactoring in bundle #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IvanLutokhin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Common refactoring in bundle #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions Command/StatusesCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace RetailCrm\DeliveryModuleBundle\Command;

use Doctrine\ORM\Tools\Pagination\Paginator;
use RetailCrm\DeliveryModuleBundle\Command\Traits\AccountAwareTrait;
use RetailCrm\DeliveryModuleBundle\Exception\AbstractModuleException;
use RetailCrm\DeliveryModuleBundle\Service\AccountManager;
use RetailCrm\DeliveryModuleBundle\Service\ModuleManagerInterface;
Expand All @@ -15,6 +15,7 @@
class StatusesCommand extends Command
{
use LockableTrait;
use AccountAwareTrait;

/**
* @var ModuleManagerInterface
Expand Down Expand Up @@ -60,23 +61,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
? (int) $input->getArgument('accountId')
: null;

$paginator = [];
if (null !== $accountId) {
$paginator = [$this->accountManager - find($accountId)];
} else {
$accountQuery = $this->accountManager->getRepository()
->createQueryBuilder('account')
->where('account.active = true')
->andWhere('account.freeze != true')
->addOrderBy('account.id')
->getQuery()
->setFirstResult(0)
->setMaxResults(100);
$paginator = new Paginator($accountQuery);
}
$accounts = $this->getAccounts($accountId);

$count = 0;
foreach ($paginator as $account) {
foreach ($accounts as $account) {
try {
$count += $this->moduleManager
->setAccount($account)
Expand Down
25 changes: 25 additions & 0 deletions Command/Traits/AccountAwareTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace RetailCrm\DeliveryModuleBundle\Command\Traits;

use Doctrine\ORM\Tools\Pagination\Paginator;

trait AccountAwareTrait
{
protected function getAccounts(int $accountId = null): \ArrayIterator
{
if (null === $accountId) {
return new \ArrayIterator([$this->accountManager->find($accountId)]);
}

$accountQuery = $this->accountManager->getRepository()->createQueryBuilder('account')
->where('account.active = true')
->andWhere('account.freeze != true')
->addOrderBy('account.id')
->getQuery()
->setFirstResult(0)
->setMaxResults(100)
;
return (new Paginator($accountQuery))->getIterator();
}
}
24 changes: 6 additions & 18 deletions Command/UpdateModuleCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace RetailCrm\DeliveryModuleBundle\Command;

use Doctrine\ORM\Tools\Pagination\Paginator;
use RetailCrm\DeliveryModuleBundle\Command\Traits\AccountAwareTrait;
use RetailCrm\DeliveryModuleBundle\Service\AccountManager;
use RetailCrm\DeliveryModuleBundle\Service\ModuleManagerInterface;
use Symfony\Component\Console\Command\Command;
Expand All @@ -14,6 +14,7 @@
class UpdateModuleCommand extends Command
{
use LockableTrait;
use AccountAwareTrait;

/**
* @var ModuleManagerInterface
Expand Down Expand Up @@ -55,27 +56,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
return 0;
}

$accountId = $input->getArgument('accountId')
? $input->getArgument('accountId')
$accountId = $input->hasArgument('accountId')
? (int) $input->getArgument('accountId')
: null;

$paginator = [];
if (null !== $accountId) {
$paginator = [$this->accountManager->find($accountId)];
} else {
$accountQuery = $this->accountManager->getRepository()
->createQueryBuilder('account')
->where('account.active = true')
->andWhere('account.freeze != true')
->addOrderBy('account.id')
->getQuery()
->setFirstResult(0)
->setMaxResults(100);
$paginator = new Paginator($accountQuery);
}
$accounts = $this->getAccounts($accountId);

$count = 0;
foreach ($paginator as $account) {
foreach ($accounts as $account) {
try {
$this->moduleManager
->setAccount($account)
Expand Down
Loading