Merge pull request #32 from D3lph1/dev

Code refactoring.

Author: D3lph1

app/Composers/ShopLayoutComposer.php

@@ -2,14 +2,13 @@
 
 namespace App\Composers;
 
+use App\Contracts\ComposerContract;
 use App\DataTransferObjects\MonitoringPlayers;
 use App\Models\Server;
 use App\Repositories\NewsRepository;
 use App\Services\Monitoring\MonitoringInterface;
-use Illuminate\View\View;
 use Illuminate\Http\Request;
-use App\Services\QueryManager;
-use App\Contracts\ComposerContract;
+use Illuminate\View\View;
 
 /**
  * Class ShopLayoutComposer
@@ -41,11 +40,6 @@ class ShopLayoutComposer implements ComposerContract
      */
     private $servers;
 
-    /**
-     * @var QueryManager
-     */
-    private $qm;
-
     /**
      * @var NewsRepository
      */
@@ -58,16 +52,14 @@ class ShopLayoutComposer implements ComposerContract
 
     /**
      * @param Request             $request
-     * @param QueryManager        $qm
      * @param NewsRepository      $newsRepository
      * @param MonitoringInterface $monitoring
      */
-    public function __construct(Request $request, QueryManager $qm, NewsRepository $newsRepository, MonitoringInterface $monitoring)
+    public function __construct(Request $request, NewsRepository $newsRepository, MonitoringInterface $monitoring)
     {
         $this->request = $request;
         $this->currentServer = $request->get('currentServer');
         $this->servers = $request->get('servers');
-        $this->qm = $qm;
         $this->newsRepository = $newsRepository;
         $this->monitoring = $monitoring;
     }

app/Console/Commands/Payment/Complete.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Payment;
 
-use App\Services\QueryManager;
+use App\Repositories\PaymentRepository;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -30,18 +30,18 @@ class Complete extends Command
     protected $description = 'Complete payment and give products or money to user';
 
     /**
-     * @var QueryManager
+     * @var PaymentRepository
      */
-    protected $qm;
+    protected $paymentRepository;
 
     /**
      * Create a new command instance.
      *
-     * @param QueryManager $qm
+     * @param PaymentRepository $paymentRepository
      */
-    public function __construct(QueryManager $qm)
+    public function __construct(PaymentRepository $paymentRepository)
     {
-        $this->qm = $qm;
+        $this->paymentRepository = $paymentRepository;
         parent::__construct();
     }
 
@@ -54,7 +54,7 @@ public function handle()
     {
         $id = (int)$this->argument('id');
         $distributor = \App::make('distributor');
-        $payment = $this->qm->payment($id);
+        $payment = $this->paymentRepository->find($id);
 
         if (!$payment) {
             $this->error('Payment not found');
@@ -70,7 +70,7 @@ public function handle()
 
         if (!$payment->products) {
             refill_user_balance((int)$payment->cost, $payment->user_id);
-            $this->qm->completePayment($payment->id, 'Завершен администратором');
+            $this->paymentRepository->complete($payment->id, 'Завершен администратором');
             $this->info('Payment successfully completed and user balance updated');
 
             return 0;

app/Console/Commands/Server/Rcon.php

@@ -8,6 +8,7 @@
 use D3lph1\MinecraftRconManager\Connector;
 use D3lph1\MinecraftRconManager\Exceptions\ConnectSocketException;
 use Illuminate\Console\Command;
+use Illuminate\Http\Request;
 
 /**
  * Class Rcon
@@ -60,8 +61,10 @@ public function __construct(ServerRepository $serverRepository, Connector $rconC
      *
      * @return mixed
      */
-    public function handle()
+    public function handle(Request $request)
     {
+        $this->info($request->method());
+
         $servers = $this->serverRepository->all();
         $names = $servers->map(function ($item) {
             return $item->name;

app/Http/Controllers/Admin/Items/EditController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Items;
 
 use App\Http\Requests\Admin\SaveEditedItemRequest;
+use App\Repositories\ItemRepository;
 use App\Services\AdminItems;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -34,13 +35,16 @@ public function __construct(AdminItems $adminItems)
     /**
      * Render the edit item page.
      *
-     * @param Request $request
+     * @param Request        $request
+     * @param ItemRepository $itemRepository
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request)
+    public function render(Request $request, ItemRepository $itemRepository)
     {
-        $item = $this->qm->item($request->route('item'), [
+        $itemId = (int)$request->route('item');
+
+        $item = $itemRepository->find($itemId, [
             'id',
             'name',
             'type',

app/Http/Controllers/Admin/Items/ListController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Items;
 
+use App\Repositories\ItemRepository;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Admin\ListParent;
 
@@ -17,17 +18,18 @@ class ListController extends ListParent
     /**
      * Render page with items list.
      *
-     * @param Request $request
+     * @param Request        $request
+     * @param ItemRepository $itemRepository
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request)
+    public function render(Request $request, ItemRepository $itemRepository)
     {
         $orderBy = $this->checkOrderBy($request->get('orderBy'));
         $orderType = $this->checkOrderType($request->get('orderType'));
         $filter = $request->get('filter');
 
-        $items = $this->qm->items([
+        $items = $itemRepository->forAdmin([
             'id',
             'name',
             'type',

app/Http/Controllers/Admin/Products/AddController.php

@@ -5,6 +5,7 @@
 use App\Exceptions\ItemNotFoundException;
 use App\Http\Requests\Admin\SaveAddedProductRequest;
 use App\Repositories\ItemRepository;
+use App\Repositories\ServerRepository;
 use App\Services\AdminProducts;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -42,15 +43,15 @@ public function __construct(AdminProducts $adminProducts)
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request, ItemRepository $itemRepository)
+    public function render(Request $request, ItemRepository $itemRepository, ServerRepository $serverRepository)
     {
         $items = $itemRepository->all([
             'id',
             'name',
             'type'
         ]);
 
-        $categories = $this->qm->allCategoriesWithServers([
+        $categories = $serverRepository->allWithCategories([
             'categories.name as category',
             'categories.id as category_id',
             'servers.name as server',

app/Http/Controllers/Admin/Products/EditController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Admin\Products;
 
 use App\Repositories\ItemRepository;
+use App\Repositories\ProductRepository;
+use App\Repositories\ServerRepository;
 use App\Services\AdminProducts;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -34,14 +36,16 @@ public function __construct(AdminProducts $adminProducts)
     /**
      * Render the edit given product page.
      *
-     * @param Request        $request
-     * @param ItemRepository $itemRepository
+     * @param Request           $request
+     * @param ItemRepository    $itemRepository
+     * @param ProductRepository $productRepository
+     * @param ServerRepository  $serverRepository
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request, ItemRepository $itemRepository)
+    public function render(Request $request, ItemRepository $itemRepository, ProductRepository $productRepository, ServerRepository $serverRepository)
     {
-        $product = $this->qm->productForAdmin($request->route('product'), [
+        $product = $productRepository->forEditProducts($request->route('product'), [
             'products.id',
             'products.price',
             'products.stack',
@@ -62,7 +66,7 @@ public function render(Request $request, ItemRepository $itemRepository)
             'type'
         ]);
 
-        $categories = $this->qm->allCategoriesWithServers([
+        $categories = $serverRepository->allWithCategories([
             'categories.name as category',
             'categories.id as category_id',
             'servers.name as server',

app/Http/Controllers/Admin/Products/ListController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Products;
 
+use App\Repositories\ProductRepository;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Admin\ListParent;
 
@@ -17,17 +18,18 @@ class ListController extends ListParent
     /**
      * Render the page with products list.
      *
-     * @param Request $request
+     * @param Request           $request
+     * @param ProductRepository $productRepository
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request)
+    public function render(Request $request, ProductRepository $productRepository)
     {
         $orderBy = $this->checkOrderBy($request->get('orderBy'));
         $orderType = $this->checkOrderType($request->get('orderType'));
         $filter = $request->get('filter');
 
-        $products = $this->qm->productsForAdmin([
+        $products = $productRepository->forAdmin([
             'products.id',
             'products.price',
             'products.item_id',

app/Http/Controllers/Admin/Servers/EditController.php

@@ -5,6 +5,7 @@
 use App\Exceptions\Server\AttemptToDeleteTheLastCategoryException;
 use App\Exceptions\Server\AttemptToDeleteTheLastServerException;
 use App\Http\Requests\Admin\SaveEditedServerRequest;
+use App\Repositories\ServerRepository;
 use Illuminate\Http\Request;
 
 /**
@@ -17,13 +18,14 @@
 class EditController extends BaseController
 {
     /**
-     * Render edit server page
+     * Render edit server page.
      *
-     * @param Request $request
+     * @param Request          $request
+     * @param ServerRepository $serverRepository
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render(Request $request)
+    public function render(Request $request, ServerRepository $serverRepository)
     {
         $server = null;
         foreach ($request->get('servers') as $s) {
@@ -37,7 +39,7 @@ public function render(Request $request)
             \App::abort(404);
         }
 
-        $categories = $this->qm->serverCategories($server->first()->id, [
+        $categories = $serverRepository->categories($server->first()->id, [
             'id',
             'name'
         ]);

app/Http/Controllers/Admin/Statistic/PaymentsController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Statistic;
 
 use App\Repositories\PaymentRepository;
+use App\Repositories\ProductRepository;
 use App\Repositories\UserRepository;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -58,20 +59,22 @@ public function render(Request $request, PaymentRepository $pr, UserRepository $
     /**
      * Get detail information about concrete payment.
      *
-     * @param Request $request
+     * @param Request           $request
+     * @param PaymentRepository $paymentRepository
+     * @param ProductRepository $productRepository
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function info(Request $request)
+    public function info(Request $request, PaymentRepository $paymentRepository, ProductRepository $productRepository)
     {
-        $payment = $this->qm->payment((int)$request->route('payment'), ['products']);
+        $payment = $paymentRepository->find((int)$request->route('payment'), ['products']);
 
         if (!$payment) {
             return json_response('payment not found');
         }
         $unserialized = unserialize($payment->products);
         $ids = array_keys($unserialized);
-        $products = $this->qm->product($ids, [
+        $products = $productRepository->getWithItems($ids, [
             'products.id',
             'items.name',
             'items.image'