Начало работы с redis, попытки сделать SOLIDно

app/Console/Commands/BaseScheduleCommand.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Базовый класс для описания команд по расписанию
+ * Создан, в частности, чтобы предоставить универсальный функционал для всех команд, запускаемых по расписанию
+ */
+abstract class BaseScheduleCommand extends Command
+{
+    /**
+     * Метод выполнения команды
+     *
+     * @param callable $execFunc функция с логикой выполнения команды
+     * @return void
+     */
+    protected function executeCommand(callable $execFunc): void
+    {
+        try {
+            $execFunc();
+            
+        } catch (\Throwable $th) {
+            $this->logExecErr($th);
+        }
+    }
+
+
+    /**
+     * Метод логирования ошибки выполнения скриптов по расписанию
+     *
+     * @param \Throwable $th
+     * @return void
+     */
+    private function logExecErr(\Throwable $th): void
+    {
+        $context = [
+            //Скрипт откуда запустилась задача
+            'command' => static::class,
+            //Скрипт, в котором произошла ошибка
+            'file' => $th->getFile(),
+            'line' => $th->getLine(),
+        ];
+        \Log::channel('schedule_err')->error($th->getMessage(), $context);
+    }
+}

app/Faceds/RedisNotifications.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use App\Services\RedisNotificationService;
+
+class RedisNotifications extends Facade
+{
+  protected static function getFacadeAccessor()
+  {
+    return \App\Services\RedisNotificationService::class;
+  }
+}
+

app/Job/BaseJob.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Job;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Базовый класс для выполнения джобы
+ */
+class BaseJob implements ShouldQueue
+{
+
+  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+  /**
+   * Метод обработки ошибки при выполнении джобы
+   *
+   * @param \Throwable $th
+   * @return void
+   */
+  public function failed(\Throwable $th): void
+  {
+    $context = [
+      //Скрипт откуда запустилась задача
+      'command' => static::class,
+      //Скрипт, в котором произошла ошибка
+      'file' => $th->getFile(),
+      'line' => $th->getLine(),
+  ];
+    \Log::channel('job_err')->error($th->getMessage(), $context);
+  }
+
+}
+

app/Providers/AppServiceProvider.php

@@ -3,9 +3,6 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Spatie\Activitylog\Facades\CauserResolver;
-use Illuminate\Support\Facades\View;
-use App\Services\ModuleService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -14,8 +11,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        //Регистрируем передачу во все blade шаблоны функционал сервиса по определению имени модуля из текущего роута
+        //
-        View::share('moduleName', app(ModuleService::class));
     }
 
     /**
@@ -23,8 +19,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        // Глобально отключаем определение causer для корректной работы пакета activity_log. По умолчанию пакет ожидает получить экземпляр модели Models\User для прописывания в таблицу activity_log значения causer_type и causer_id. Эти значения нельзя руками прописать при логировании. Никакие танцы с бубнами не помогали кроме строки ниже. Данные по инициатору изменения решил записывать в поле properties
+        //
-        //UPD: Решил отказаться, так как все равно для корректной работы аутентификации пришел к фиксации записи в модели users, для отображения истории бизнес-сущностей удобнее будет получать пользователя, совершившего действие, из отдельного поля в модели, а не парсить json из поля properties
-        // CauserResolver::resolveUsing(fn () => null);
     }
 }

app/Providers/RedisNotificationProvider.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Providers;
+
+use App\Services\RedisNotificationService;
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Провайдер для работы с сервисом Redis для хранения нотификаций для отображения на фронте 
+ */
+class RedisNotificationProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        $this->app->bind(RedisNotificationService::class, function($app){
+            return new RedisNotificationService;
+        });
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        //
+    }
+}

app/Services/ModuleService.php

@@ -1,40 +0,0 @@
-<?php
-
-/**Сервис для определения модуля 
-  @author dgavrilov
-*/
-
-namespace App\Services;
-
-class ModuleService{
-  /**
-   * Получаем имя модуля из роута (так как в нем обязательно указывается префикс)
-   *
-   * @return string | null
-   */
-  public function getModuleName(): string | null
-  {
-    $route = request()->route();
-    $routePrefix = null;
-    if ($route && $route->getPrefix()) {
-      $routePrefix = explode('/', $route->getPrefix())[1];
-    }
-
-    return $routePrefix;
-  }
-
-  
-  /**
-   * Основываясь на имени модуля из роута получаем имя роута на русском (свойство name_ru), которое обязательное прописывается в конфиге модуля
-   *
-   * @return string | null
-   */
-  public function getRuModuleName(): string | null
-  {
-    if ($module = $this->getModuleName()) {
-       return config("$module.name_ru", null);
-    } else {
-      return null;
-    }
-  }
-}

config/cache.php

@@ -74,8 +74,8 @@ return [
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
+            'connection' => 'cache',
-            'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
+            'lock_connection' => 'default',
         ],
 
         'dynamodb' => [

config/database.php

@@ -138,7 +138,7 @@ return [
     |
     | Redis is an open source, fast, and advanced key-value store that also
     | provides a richer body of commands than a typical key-value system
-    | such as Memcached. You may define your connection settings here.
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
 
@@ -148,8 +148,9 @@ return [
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-database-'),
+            //'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
-            'persistent' => env('REDIS_PERSISTENT', false),
+            //Нижний прочерк нужен, чтобы отделить платформу_модуль от сущность:id:значение. Если после нижнего прочерка ничего нет, значение было установлено из "корня" платформы
+            'prefix' => env('REDIS_PREFIX', 'uknown|'),
         ],
 
         'default' => [
@@ -159,10 +160,6 @@ return [
             'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_DB', '0'),
-            'max_retries' => env('REDIS_MAX_RETRIES', 3),
-            'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
-            'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
-            'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
         ],
 
         'cache' => [
@@ -171,13 +168,26 @@ return [
             'username' => env('REDIS_USERNAME'),
             'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
-            'database' => env('REDIS_CACHE_DB', '1'),
+            'database' => '1',
-            'max_retries' => env('REDIS_MAX_RETRIES', 3),
-            'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
-            'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
-            'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
         ],
 
+        'queue' => [
+            'url' => env('REDIS_URL'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => '2',
+        ],
+
+        'notifications' => [
+            'url' => env('REDIS_URL'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => '3',
+        ],
     ],
 
 ];

config/modules.php

@@ -1,232 +0,0 @@
-<?php
-
-use Nwidart\Modules\Activators\FileActivator;
-use Nwidart\Modules\Providers\ConsoleServiceProvider;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Module Namespace
-    |--------------------------------------------------------------------------
-    |
-    | Default module namespace.
-    |
-    */
-
-    'namespace' => 'Modules',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Module Stubs
-    |--------------------------------------------------------------------------
-    |
-    | Default module stubs.
-    |
-    */
-
-    'stubs' => [
-        'enabled' => false,
-        'path' => base_path('vendor/nwidart/laravel-modules/src/Commands/stubs'),
-        'files' => [
-            'routes/web' => 'routes/web.php',
-            'routes/api' => 'routes/api.php',
-            'views/index' => 'resources/views/index.blade.php',
-            'views/master' => 'resources/views/layouts/master.blade.php',
-            'scaffold/config' => 'config/config.php',
-            'composer' => 'composer.json',
-            'assets/js/app' => 'resources/assets/js/app.js',
-            'assets/sass/app' => 'resources/assets/sass/app.scss',
-            'vite' => 'vite.config.js',
-            'package' => 'package.json',
-        ],
-        'replacements' => [
-            'routes/web' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'CONTROLLER_NAMESPACE'],
-            'routes/api' => ['LOWER_NAME', 'STUDLY_NAME'],
-            'vite' => ['LOWER_NAME'],
-            'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'PROVIDER_NAMESPACE'],
-            'views/index' => ['LOWER_NAME'],
-            'views/master' => ['LOWER_NAME', 'STUDLY_NAME'],
-            'scaffold/config' => ['STUDLY_NAME'],
-            'composer' => [
-                'LOWER_NAME',
-                'STUDLY_NAME',
-                'VENDOR',
-                'AUTHOR_NAME',
-                'AUTHOR_EMAIL',
-                'MODULE_NAMESPACE',
-                'PROVIDER_NAMESPACE',
-            ],
-        ],
-        'gitkeep' => true,
-    ],
-    'paths' => [
-        /*
-        |--------------------------------------------------------------------------
-        | Modules path
-        |--------------------------------------------------------------------------
-        |
-        | This path is used to save the generated module.
-        | This path will also be added automatically to the list of scanned folders.
-        |
-        */
-
-        'modules' => base_path('Modules'),
-        /*
-        |--------------------------------------------------------------------------
-        | Modules assets path
-        |--------------------------------------------------------------------------
-        |
-        | Here you may update the modules' assets path.
-        |
-        */
-
-        'assets' => public_path('modules'),
-        /*
-        |--------------------------------------------------------------------------
-        | The migrations' path
-        |--------------------------------------------------------------------------
-        |
-        | Where you run the 'module:publish-migration' command, where do you publish the
-        | the migration files?
-        |
-        */
-
-        'migration' => base_path('database/migrations'),
-        /*
-        |--------------------------------------------------------------------------
-        | Generator path
-        |--------------------------------------------------------------------------
-        | Customise the paths where the folders will be generated.
-        | Setting the generate key to false will not generate that folder
-        */
-        'generator' => [
-            'config' => ['path' => 'config', 'generate' => true],
-            'command' => ['path' => 'App/Console', 'generate' => false],
-            'channels' => ['path' => 'App/Broadcasting', 'generate' => false],
-            'migration' => ['path' => 'Database/migrations', 'generate' => false],
-            'seeder' => ['path' => 'Database/Seeders', 'generate' => true],
-            'factory' => ['path' => 'Database/Factories', 'generate' => false],
-            'model' => ['path' => 'App/Models', 'generate' => false],
-            'observer' => ['path' => 'App/Observers', 'generate' => false],
-            'routes' => ['path' => 'routes', 'generate' => true],
-            'controller' => ['path' => 'App/Http/Controllers', 'generate' => true],
-            'filter' => ['path' => 'App/Http/Middleware', 'generate' => false],
-            'request' => ['path' => 'App/Http/Requests', 'generate' => false],
-            'provider' => ['path' => 'App/Providers', 'generate' => true],
-            'assets' => ['path' => 'resources/assets', 'generate' => false],
-            'lang' => ['path' => 'lang', 'generate' => false],
-            'views' => ['path' => 'resources/views', 'generate' => true],
-            'test' => ['path' => 'tests/Unit', 'generate' => false],
-            'test-feature' => ['path' => 'tests/Feature', 'generate' => false],
-            'repository' => ['path' => 'App/Repositories', 'generate' => false],
-            'event' => ['path' => 'App/Events', 'generate' => false],
-            'listener' => ['path' => 'App/Listeners', 'generate' => false],
-            'policies' => ['path' => 'App/Policies', 'generate' => false],
-            'rules' => ['path' => 'App/Rules', 'generate' => false],
-            'jobs' => ['path' => 'App/Jobs', 'generate' => false],
-            'emails' => ['path' => 'App/Emails', 'generate' => false],
-            'notifications' => ['path' => 'App/Notifications', 'generate' => false],
-            'resource' => ['path' => 'App/resources', 'generate' => false],
-            'component-view' => ['path' => 'resources/views/components', 'generate' => false],
-            'component-class' => ['path' => 'App/View/Components', 'generate' => false],
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Package commands
-    |--------------------------------------------------------------------------
-    |
-    | Here you can define which commands will be visible and used in your
-    | application. You can add your own commands to merge section.
-    |
-    */
-    'commands' => ConsoleServiceProvider::defaultCommands()
-        ->merge([
-            // New commands go here
-        ])->toArray(),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Scan Path
-    |--------------------------------------------------------------------------
-    |
-    | Here you define which folder will be scanned. By default will scan vendor
-    | directory. This is useful if you host the package in packagist website.
-    |
-    */
-
-    'scan' => [
-        'enabled' => false,
-        'paths' => [
-            base_path('vendor/*/*'),
-        ],
-    ],
-    /*
-    |--------------------------------------------------------------------------
-    | Composer File Template
-    |--------------------------------------------------------------------------
-    |
-    | Here is the config for the composer.json file, generated by this package
-    |
-    */
-
-    'composer' => [
-        'vendor' => 'nwidart',
-        'author' => [
-            'name' => 'Nicolas Widart',
-            'email' => 'n.widart@gmail.com',
-        ],
-        'composer-output' => false,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Caching
-    |--------------------------------------------------------------------------
-    |
-    | Here is the config for setting up the caching feature.
-    |
-    */
-    'cache' => [
-        'enabled' => false,
-        'driver' => 'file',
-        'key' => 'laravel-modules',
-        'lifetime' => 60,
-    ],
-    /*
-    |--------------------------------------------------------------------------
-    | Choose what laravel-modules will register as custom namespaces.
-    | Setting one to false will require you to register that part
-    | in your own Service Provider class.
-    |--------------------------------------------------------------------------
-    */
-    'register' => [
-        'translations' => true,
-        /**
-         * load files on boot or register method
-         */
-        'files' => 'register',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Activators
-    |--------------------------------------------------------------------------
-    |
-    | You can define new types of activators here, file, database, etc. The only
-    | required parameter is 'class'.
-    | The file activator will store the activation status in storage/installed_modules
-    */
-    'activators' => [
-        'file' => [
-            'class' => FileActivator::class,
-            'statuses-file' => base_path('modules_statuses.json'),
-            'cache-key' => 'activator.installed',
-            'cache-lifetime' => 604800,
-        ],
-    ],
-
-    'activator' => 'file',
-];

config/queue.php

@@ -7,25 +7,24 @@ return [
     | Default Queue Connection Name
     |--------------------------------------------------------------------------
     |
-    | Laravel's queue supports a variety of backends via a single, unified
+    | Laravel's queue API supports an assortment of back-ends via a single
-    | API, giving you convenient access to each backend using identical
+    | API, giving you convenient access to each back-end using the same
-    | syntax for each. The default queue connection is defined below.
+    | syntax for every one. Here you may define a default connection.
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'database'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
     | Queue Connections
     |--------------------------------------------------------------------------
     |
-    | Here you may configure the connection options for every queue backend
+    | Here you may configure the connection information for each server that
-    | used by your application. An example configuration is provided for
+    | is used by your application. A default configuration has been added
-    | each backend supported by Laravel. You're also free to add more.
+    | for each back-end shipped with Laravel. You are free to add more.
     |
-    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis",
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
-    |          "deferred", "background", "failover", "null"
     |
     */
 
@@ -37,18 +36,17 @@ return [
 
         'database' => [
             'driver' => 'database',
-            'connection' => env('DB_QUEUE_CONNECTION'),
+            'table' => 'jobs',
-            'table' => env('DB_QUEUE_TABLE', 'jobs'),
+            'queue' => 'default',
-            'queue' => env('DB_QUEUE', 'default'),
+            'retry_after' => 90,
-            'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
             'after_commit' => false,
         ],
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
+            'host' => 'localhost',
-            'queue' => env('BEANSTALKD_QUEUE', 'default'),
+            'queue' => 'default',
-            'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
+            'retry_after' => 90,
             'block_for' => 0,
             'after_commit' => false,
         ],
@@ -64,31 +62,17 @@ return [
             'after_commit' => false,
         ],
 
+        #Гаврилов
+        //ЗАЧЕМ ЭТОТ КОНФИГ? В .ENV НЕТ ПАРАМЕТРА REDIS_QUEUE
         'redis' => [
             'driver' => 'redis',
-            'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
+            'connection' => 'default',
             'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
+            'retry_after' => 90,
             'block_for' => null,
             'after_commit' => false,
         ],
 
-        'deferred' => [
-            'driver' => 'deferred',
-        ],
-
-        'background' => [
-            'driver' => 'background',
-        ],
-
-        'failover' => [
-            'driver' => 'failover',
-            'connections' => [
-                'database',
-                'deferred',
-            ],
-        ],
-
     ],
 
     /*
@@ -103,7 +87,7 @@ return [
     */
 
     'batching' => [
-        'database' => env('DB_CONNECTION', 'sqlite'),
+        'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'job_batches',
     ],
 
@@ -113,16 +97,14 @@ return [
     |--------------------------------------------------------------------------
     |
     | These options configure the behavior of failed queue job logging so you
-    | can control how and where failed jobs are stored. Laravel ships with
+    | can control which database and table are used to store the jobs that
-    | support for storing failed jobs in a simple file or in a database.
+    | have failed. You may change them to any database / table you wish.
-    |
-    | Supported drivers: "database-uuids", "dynamodb", "file", "null"
     |
     */
 
     'failed' => [
         'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
-        'database' => env('DB_CONNECTION', 'sqlite'),
+        'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
 

modules_statuses.json

@@ -1,4 +0,0 @@
-{
-    "Taxi": true,
-    "Test": true
-}