Refactoring queue system

Author: papac

CHANGELOG.md

@@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 5.1.2 - 2023-09-17
 
-Fix `db_seed` helper
+Fix `app_db_seed` helper
 
 Ref
 
@@ -60,16 +60,15 @@ Reference #248
 
 ## 5.0.8 - 2023-05-24
 
-Release 5.0.8
-
+Release **5.0.8**
 Fixes test case errors
 
 Reference #243
 From #242
 
 ## 5.0.7 - 2023-05-24
 
-Release 5.0.7
+Release **5.0.7**
 
 - Fixes the database relationship
 - Fixes the HTTP client
@@ -81,7 +80,7 @@ Fixes #240
 
 ## 5.0.6 - 2023-05-22
 
-Release 5.0.6
+Release **5.0.6**
 
 - Fixes get last insert id for pgsql
 - Add data validation custom message parser
@@ -95,7 +94,7 @@ References
 
 ## 5.0.5 - 2023-05-20
 
-Release 5.0.5
+Release **5.0.5**
 
 - Fix migration status table definition
 - Fix enum creation for pgsql
@@ -104,7 +103,7 @@ Reference #232
 
 ## 5.0.4 - 2023-05-19
 
-Release 5.0.4
+Release **5.0.4**
 
 - Fixes HTTP Client
 - Add variable binding to the env loader
@@ -124,7 +123,7 @@ Add many fixes
 
 ## 5.0.2 - 2023-05-16
 
-Release for 5.0.2
+Release **5.0.2**
 
 - Fix action dependency injector
 - Add the base error handler

docker-compose.yml

@@ -127,3 +127,39 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+    rabbitmq:
+        container_name: bowphp_rabbitmq
+        image: rabbitmq:3.11-management
+        restart: unless-stopped
+        ports:
+            - "5672:5672"
+            - "15672:15672"
+        environment:
+            RABBITMQ_DEFAULT_USER: guest
+            RABBITMQ_DEFAULT_PASS: guest
+        networks:
+            - bowphp_network
+        healthcheck:
+            test: ["CMD", "rabbitmq-diagnostics", "ping"]
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    minio:
+        container_name: bowphp_minio
+        image: minio/minio
+        restart: unless-stopped
+        ports:
+            - "9000:9000"
+            - "9001:9001"
+        environment:
+            MINIO_ROOT_USER: minioadmin
+            MINIO_ROOT_PASSWORD: minioadmin
+        command: server /data --console-address ":9001"
+        networks:
+            - bowphp_network
+        healthcheck:
+            test: ["CMD", "mc", "alias", "set", "local", "http://localhost:9000", "minioadmin", "minioadmin"]
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    

src/Console/Command.php

@@ -20,7 +20,7 @@
 use Bow\Console\Command\Generator\GenerateServiceCommand;
 use Bow\Console\Command\Generator\GenerateSessionCommand;
 use Bow\Console\Command\Generator\GenerateAppEventCommand;
-use Bow\Console\Command\Generator\GenerateProducerCommand;
+use Bow\Console\Command\Generator\GenerateWorkerCommand;
 use Bow\Console\Command\Generator\GenerateExceptionCommand;
 use Bow\Console\Command\Generator\GenerateMessagingCommand;
 use Bow\Console\Command\Generator\GenerateMigrationCommand;
@@ -57,7 +57,7 @@ class Command extends AbstractCommand
         "add:validation" => GenerateValidationCommand::class,
         "add:event" => GenerateAppEventCommand::class,
         "add:listener" => GenerateEventListenerCommand::class,
-        "add:producer" => GenerateProducerCommand::class,
+        "add:producer" => GenerateWorkerCommand::class,
         "add:command" => GenerateConsoleCommand::class,
         "add:message" => GenerateMessagingCommand::class,
         "run:console" => ReplCommand::class,

src/Console/Command/Generator/GenerateJobCommand.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bow\Console\Command\Generator;
+
+use Bow\Console\AbstractCommand;
+use Bow\Console\Color;
+use Bow\Console\Generator;
+
+class GenerateJobCommand extends AbstractCommand
+{
+    /**
+     * Add job
+     *
+     * @param  string $job
+     * @return void
+     */
+    public function run(string $job): void
+    {
+        $generator = new Generator(
+            $this->setting->getJobDirectory(),
+            $job
+        );
+
+        if ($generator->fileExists()) {
+            echo Color::red("The job already exists");
+            exit(1);
+        }
+
+        $generator->write('job', [
+            'baseNamespace' => $this->namespaces['job'] ?? 'App\\Jobs'
+        ]);
+
+        echo Color::green("The job has been well created.");
+        exit(0);
+    }
+}

src/Console/Command/Generator/GenerateProducerCommand.php

@@ -5,8 +5,6 @@
 namespace Bow\Console\Command;
 
 use Exception;
-use ErrorException;
-use Bow\Support\Str;
 use Bow\Console\Color;
 use Bow\Database\Database;
 use Bow\Database\QueryBuilder;
@@ -381,6 +379,6 @@ private function getMigrationTable(): QueryBuilder
     {
         $migration_status_table = config('database.migration', 'migrations');
 
-        return db_table($migration_status_table);
+        return app_db_table($migration_status_table);
     }
 }

src/Console/Command/MigrationCommand.php

@@ -60,7 +60,7 @@ class Console
         'service',
         'exception',
         'event',
-        'producer',
+        'job',
         'command',
         'listener',
         'message'
@@ -519,13 +519,13 @@ private function help(?string $command = null): int
    \033[0;33mgenerate:session-table\033[00m        For generate the preset table for session
    \033[0;33mgenerate:cache-table\033[00m          For generate the preset table for cache
    \033[0;33mgenerate:queue-table\033[00m          For generate the preset table for queue
-   \033[0;33mgenerate:notification-table\033[00m   For generate the preset table for notification
+   \033[0;33mgenerate:notification-table\033[00m    For generate the preset table for notification
    \033[0;33mgenerate:key\033[00m                  Create new app key
-   \033[0;33mflush:worker\033[00m                  Flush all queues
+   \033[0;33mflush:worker\033[00m                   Flush all queues
 
  \033[0;32mADD\033[00m Create a user class
    \033[0;33madd:middleware\033[00m      Create new middleware
-   \033[0;33madd:configuration\033[00m   Create new configuration
+   \033[0;33madd:configuration\033[00m    Create new configuration
    \033[0;33madd:service\033[00m         Create new service
    \033[0;33madd:exception\033[00m       Create new exception
    \033[0;33madd:controller\033[00m      Create new controller
@@ -535,7 +535,7 @@ private function help(?string $command = null): int
    \033[0;33madd:migration\033[00m       Create a new migration
    \033[0;33madd:event\033[00m           Create a new event
    \033[0;33madd:listener\033[00m        Create a new event listener
-   \033[0;33madd:producer\033[00m        Create a new producer
+   \033[0;33madd:job\033[00m             Create a new job
    \033[0;33madd:command\033[00m         Create a new bow console command
    \033[0;33madd:message\033[00m         Create a new bow messaging
 
@@ -580,15 +580,15 @@ private function help(?string $command = null): int
 
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:controller name [option]  For create a new controller
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:middleware name           For create a new middleware
-    \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:configuration name        For create a new configuration
+    \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:configuration name         For create a new configuration
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:service name              For create a new service
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:exception name            For create a new exception
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:model name [option]       For create a new model
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:validation name           For create a new validation
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:seeder name [--seed=n]    For create a new seeder
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:migration name            For create a new migration
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:event name                For create a new event listener
-    \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:producer name             For create a new queue producer
+    \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:job name                  For create a new queue job
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:command name              For create a new bow console command
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add:message name              For create a new bow messaging
     \033[0;33m$\033[00m php \033[0;34mbow\033[00m add help                      For display this
@@ -635,9 +635,9 @@ private function help(?string $command = null): int
     run:console [--include=filename.php] [--prompt=prompt_name]
     run:worker [--queue=default] [--connexion=beanstalkd,sqs,redis,database] [--tries=duration] [--sleep=duration] [--timeout=duration]
 
-   \033[0;33m$\033[00m php \033[0;34mbow\033[00m run:console\033[00m          Show psysh php REPL 
+   \033[0;33m$\033[00m php \033[0;34mbow\033[00m run:console\033[00m          Show psysh php REPL for debug you code
    \033[0;33m$\033[00m php \033[0;34mbow\033[00m run:server\033[00m [option]  Start local development server
-   \033[0;33m$\033[00m php \033[0;34mbow\033[00m run:worker\033[00m [option]  Start worker/consumer for handle the producer
+   \033[0;33m$\033[00m php \033[0;34mbow\033[00m run:worker\033[00m [option]  Start workerr for handle the queue jobs
 
 U; // phpcs:enable
                 break;

src/Console/Console.php

@@ -137,12 +137,11 @@ class Setting
     private string $service_directory;
 
     /**
-     * The producer directory
+     * The job directory
      *
      * @var string
      */
-    private string $producer_directory;
-
+    private string $job_directory;
     /**
      * The command directory
      *
@@ -403,24 +402,24 @@ public function setServiceDirectory(string $service_directory): void
     }
 
     /**
-     * Get the producer directory
+     * Get the job directory
      *
      * @return string
      */
-    public function getProducerDirectory(): string
+    public function getJobDirectory(): string
     {
-        return $this->producer_directory;
+        return $this->job_directory;
     }
 
     /**
-     * Set the producer directory
+     * Set the job directory
      *
-     * @param  string $producer_directory
+     * @param  string $job_directory
      * @return void
      */
-    public function setProducerDirectory(string $producer_directory): void
+    public function setJobDirectory(string $job_directory): void
     {
-        $this->producer_directory = $producer_directory;
+        $this->job_directory = $job_directory;
     }
 
     /**

src/Console/Setting.php

@@ -2,9 +2,9 @@
 
 namespace {baseNamespace}{namespace};
 
-use Bow\Queue\ProducerService;
+use Bow\Queue\QueueJob;
 
-class {className} extends ProducerService
+class {className} extends QueueJob
 {
     /**
      * {className} constructor
@@ -17,7 +17,7 @@ class {className} extends ProducerService
     }
 
 	/**
-	 * Handle producer
+	 * Handle job action
 	 * 
 	 * @return void
 	 */

src/Console/stubs/producer.stub src/Console/stubs/job.stubsrc/Console/stubs/producer.stub renamed to src/Console/stubs/job.stub

@@ -57,20 +57,6 @@ public function toArray(): array
         return $arr;
     }
 
-    /**
-     * Allows you to delete all the selected recordings
-     *
-     * @return void
-     */
-    public function dropAll(): void
-    {
-        $this->each(
-            function (Model $model) {
-                $model->delete();
-            }
-        );
-    }
-
     /**
      * @inheritdoc
      */