Начало работы с 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/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
+    {
+        //
+    }
+}

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/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',
     ],
 

resources/css/general.css

@@ -1,43 +0,0 @@
-/* ГАВРИЛОВ. ВЫЯСНИТЬ, ГДЕ ИСПОЛЬЗУЮТСЯ */
-
-#root{
-  padding: 10px;
-}
-
-.form-container{
-
-  &.form-container--small-size{
-    width: 30%;
-  }
-  &.form-container--medium-size{
-    width: 50%;
-  }
-
-  &.form-container--left-pos{
-    margin-left: 10px;
-  }
-  &.form-container--mid-pos{
-    margin: 25px auto;
-  }
-}
-
-.form__field-block{
-  margin: 15px 0;
-}
-
-.btn-block{
-  margin: 15px 0;
-  padding: 15px 0;
-  display: flex;
-    justify-content: flex-start;
-    gap: 10px;
-}
-
-
-/* OVERWRITE */
-.renButton{
-
-  &.renButton--tertiary{
-    background: #dfdfdf;
-  }
-}

resources/css/main_styles.css

@@ -1,27 +0,0 @@
-#page__content-block{
-  padding: 10px;
-}
-
-#page__header-block{
-  position: sticky;
-  top: 0;
-  z-index: 99;
-  box-shadow: 0px 2px 9px 3px #8f8d8d;
-
-  & .header-block__header-container{
-    display: flex;
-      justify-content: space-between;
-    padding: 10px;
-    background: var(--color_graphite_main);
-
-    & .header-container__block{
-      display: flex;
-        gap: 10px;
-        align-items: center;
-
-      & .header-container__block__app-name{
-        color: white;
-      }  
-    }  
-  }
-}

resources/css/variables.css

@@ -1,7 +0,0 @@
-:root{
-  --color_graphite_main: #323e48;
-  --color_emerald_main: #77cb10;
-  --color_emerald_light: #95fa77;
-  --color_ruby_main: #ff0078;
-  --color_purple_main: #7864eb;
-} 

resources/js/main_script.tsx

@@ -1,15 +0,0 @@
-import React from "react";
-import { createRoot } from 'react-dom/client';
-import { UIKitThemeProvider } from '@SharePoint/rencredit_uikit';
-import Header from "./components/header/Header.tsx";
-
-const headerBlock:HTMLElement = document.getElementById('page__header-block')!;
-const headerRoot = createRoot(headerBlock);
-
-console.log('da')
-
-headerRoot.render(
-  <UIKitThemeProvider>
-    <Header />
-  </UIKitThemeProvider>
-);

resources/js/providers/AppProvider.tsx

@@ -1,21 +0,0 @@
-import React, { ReactNode } from "react";
-import { UIKitThemeProvider } from '@SharePoint/rencredit_uikit';
-import { PopupProvider } from "../contexts/PopupContext.tsx";
-import { PreloaderProvider } from "../contexts/PreloaderContext.tsx";
-
-interface AppProviderProps{
-  children: ReactNode;
-}
-
-export function AppProvider({children}: AppProviderProps){
-
-  return (
-    <UIKitThemeProvider>
-      <PopupProvider>
-        <PreloaderProvider>
-          {children}
-        </PreloaderProvider> 
-      </PopupProvider>
-    </UIKitThemeProvider>  
-  )
-}

resources/js/services/getCsrfService.ts

@@ -1,20 +0,0 @@
-/**
- * Сервис для полуения csrt токена для размещения в формах
- * @date 24.07.2025
- * @author dgavrilov
- */
-
-export const getCsrfToken = ():string => {
-  const METATAG:HTMLElement|null = document.querySelector('meta[name="csrf-token"]');
-
-  if (!METATAG) {
-    return '';
-  }
-
-  const CSRFTOKEN:string|null = METATAG.getAttribute('content');
-  if (!CSRFTOKEN) {
-    return '';
-  }
-
-  return CSRFTOKEN;
-}