📢 - Merge develop to main

.env.example

@@ -82,13 +82,27 @@ MAPA_URL=
 
 JWT_SECRET=
 
-#### RABBITMW ####
-RABBITMQ_DEFAULT_HOST=
-RABBITMQ_DEFAULT_PORT=
-RABBITMQ_DEFAULT_USER=
-RABBITMQ_DEFAULT_PASS=
-RABBITMQ_EXCHANGE_PLUGINS=
-RABBITMQ_QUEUE_OPINIONS_PUBLISHED=
-RABBITMQ_QUEUE_PC=
-RABBITMQ_QUEUE_PC_ROUTE_KEY_PROP=
-RABBITMQ_QUEUE_PC_ROUTE_KEY_ADM=
+#### RABBITMQ ####
+RABBITMQ_DEFAULT_HOST=ip_ou_host
+RABBITMQ_DEFAULT_PORT=5672
+RABBITMQ_DEFAULT_USER=user
+RABBITMQ_DEFAULT_PASS=pass
+RABBITMQ_ENABLED=true
+RABBITMQ_EXCHANGE_DEFAULT=RABBITMQ_EXCHANGE_DEFAULT
+RABBITMQ_QUEUE_PUBLISHED_RECOURSES=RABBITMQ_QUEUE_PUBLISHED_RECOURSES
+QUEUE_OPINION_MANAGEMENT=QUEUE_OPINION_MANAGEMENT
+QUEUE_PUBLISHED_RECOURSES=QUEUE_PUBLISHED_RECOURSES
+QUEUE_IMPORT_REGISTRATION=QUEUE_IMPORT_REGISTRATION
+MODULE_IMPORT_REGISTRATION_DRAFT=MODULE_IMPORT_REGISTRATION_DRAFT
+QUEUE_ACCOUNTABILITY=QUEUE_ACCOUNTABILITY
+MODULE_ACCOUNTABILITY_ADM=MODULE_ACCOUNTABILITY_ADM
+MODULE_ACCOUNTABILITY_PROPONENT=MODULE_ACCOUNTABILITY_PROPONENT
+PLUGIN_PUBLISHED_RECOURSES=PLUGIN_PUBLISHED_RECOURSES
+
+## EMAIL
+FORWARD_MAILPIT_DASHBOARD_PORT=8026
+## SENTRY
+SENTRY_LARAVEL_DSN=https://link_do_sentry
+SENTRY_SEND_DEFAULT_PII=true
+SENTRY_TRACES_SAMPLE_RATE=1.0
+

.env.testing

@@ -20,11 +20,11 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=pgsql
-DB_HOST=db-email
-DB_PORT=5432
-DB_DATABASE=api_email_test
-DB_USERNAME=api_email
-DB_PASSWORD=pass
+DB_HOST=ip_ou_servico
+DB_PORT=5433
+DB_DATABASE=api_email
+DB_USERNAME=postgres
+DB_PASSWORD=12345678
 
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
@@ -82,17 +82,35 @@ NGINX_PHP_UPSTREAM_CONTAINER=php-fpm
 NGINX_PHP_UPSTREAM_PORT=9000
 NGINX_SSL_PATH=./docker/nginx/ssl/
 ### PARA AS FILAS
-MAPA_URL=http://172.19.18.213:8088/
+MAPA_URL=MAPA_URL
 
 #### RABBITMW ####
-RABBITMQ_DEFAULT_HOST=rabbitmq
+RABBITMQ_DEFAULT_HOST=ip_ou_servico
 RABBITMQ_DEFAULT_PORT=5672
-RABBITMQ_DEFAULT_USER=mqadmin
-RABBITMQ_DEFAULT_PASS=Admin123XX_
-RABBITMQ_EXCHANGE_PLUGINS=pluginsTest
-RABBITMQ_QUEUE_OPINIONS_PUBLISHED=opinionsPublishedTest
-RABBITMQ_QUEUE_PC=msgs
-RABBITMQ_QUEUE_PC_ROUTE_KEY_PROP=proponente
-RABBITMQ_QUEUE_PC_ROUTE_KEY_ADM=resposta
-
-JWT_SECRET=5l8Zu5i5HLFLtd1p4S8r5uk29hblJLLlr6P8jYsVj04n0354No5BtCqSudwk7sSM
+RABBITMQ_DEFAULT_USER=user
+RABBITMQ_DEFAULT_PASS=pass
+RABBITMQ_ENABLED=true
+RABBITMQ_EXCHANGE_DEFAULT=exchange_notification
+QUEUE_OPINION_MANAGEMENT=queue_opinion_management
+QUEUE_PUBLISHED_RECOURSES=queue_published_recourses
+QUEUE_IMPORT_REGISTRATION=queue_import_registration
+MODULE_IMPORT_REGISTRATION_DRAFT=module_import_registration_draft
+QUEUE_ACCOUNTABILITY=queue_accountability
+MODULE_ACCOUNTABILITY_ADM=module_accountability_adm
+MODULE_ACCOUNTABILITY_PROPONENT=module_accountability_proponent
+PLUGIN_PUBLISHED_RECOURSES=plugin_published_recourses
+
+JWT_SECRET=JWT_SECRET
+
+#### SENTRY ####
+SENTRY_LARAVEL_DSN=https://dc2a046285a0767ee27902ea99506adc@o4508121592102912.ingest.us.sentry.io/4508160344915968
+SENTRY_SEND_DEFAULT_PII=true
+SENTRY_TRACES_SAMPLE_RATE=1.0
+
+### auditing
+AUDITING_ENABLED=false
+AUDITING_USER_MODEL=App\Models\User
+AUDITING_USER_MORPH_PREFIX=user
+AUDITING_AUDIT_MODEL=App\Models\Audit
+AUDITING_THRESHOLD=0
+AUDITING_CONSOLE=true

Dockerfile

@@ -1,29 +1,43 @@
-FROM php:fpm-alpine3.20
+FROM php:8.4-fpm
 
+ENV TZ=America/Fortaleza
+
+# Copia o código da aplicação para o contêiner
 COPY . /var/www/html
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
-RUN apk add --no-cache \
-    bash \
-    curl \
+# Instala o Composer
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+RUN apt-get update && apt-get install -y \
     git \
     nano \
+    curl \
+    supervisor \
     libpng-dev \
-    libpq \
+    libjpeg-dev \
+    libfreetype6-dev \
+    libonig-dev \
     libzip-dev \
-    zlib-dev \
-    linux-headers \
-    postgresql-dev \
-    # Extensões do PHP
-    && docker-php-ext-install \
-    gd \
+    unzip \
     zip \
-    pdo_pgsql \
-    sockets \
-    # Composer Install
-    && composer install \
-    && chown -R www-data:www-data /var/www/html \
-    # Limpeza dos pacotes
-    && docker-php-source delete
+    libxml2-dev \
+    libpq-dev \
+    libicu-dev \
+    ca-certificates \
+    xz-utils \
+    gnupg \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install gd \
+    && docker-php-ext-install pdo pdo_mysql mbstring exif pcntl bcmath opcache intl zip sockets \
+    && /usr/bin/composer install \
+    && rm -rf /var/lib/apt/lists/* \
+    && chown -R www-data:www-data /var/www/html
+
+COPY ./docker/production/supervisor/conf.d/* /etc/supervisor/conf.d/
+COPY ./docker/production/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 
 EXPOSE 9000

app/Console/Commands/ConsumePublishedOpinions.php

@@ -16,11 +16,7 @@ class ConsumePublishedOpinions extends Command
 
     protected $description = 'Consome fila com usuários que deverão ser notificados que os pareceres foram publicados';
 
-    public function __construct(
-        private readonly AmqpService $amqpService,
-    ) {
-        parent::__construct();
-    }
+
 
     /**
      * @throws \Exception

app/Console/Commands/ConsumePublishedRecourseEmails.php

@@ -5,6 +5,7 @@
 use App\Mail\PublishedRecourse;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Message\AMQPMessage;
@@ -32,17 +33,44 @@ class ConsumePublishedRecourseEmails extends Command
      */
     public function handle(): void
     {
-        $queue = config('app.rabbitmq.queues.published_recourses_queue');
+        $queue = config('rabbitmq.queues.queue_published_recourses');
         $connection = new AMQPStreamConnection(
-            config('app.rabbitmq.host'),
-            config('app.rabbitmq.port'),
-            config('app.rabbitmq.user'),
-            config('app.rabbitmq.pass'),
+            config('rabbitmq.host'),
+            config('rabbitmq.port'),
+            config('rabbitmq.user'),
+            config('rabbitmq.pass'),
+            '/',
         );
         $channel = $connection->channel();
-        $channel->queue_declare($queue, false, true, false, false);
 
-        $this->info('🎯 Aguardando e-mails para envio...');
+        $channel->exchange_declare(
+            config('rabbitmq.exchange_default'),
+            'direct',
+            false,
+            true,
+            false
+        );
+
+        $channel->queue_declare(
+            $queue,
+            false,   // passive: false (cria se não existir)
+            true,    // durable: true (igual à fila existente)
+            false,   // exclusive: false (não deve ser exclusiva)
+            false,   // auto_delete: false (não deletar automaticamente)
+            false,   // nowait: false (espera confirmação)
+            null,    // arguments: null (igual aos argumentos existentes)
+            null     // ticket: null
+        );
+        // Vinculando
+        $channel->queue_bind(
+            $queue,
+            config('rabbitmq.exchange_default'),
+            config('rabbitmq.routing.plugin_published_recourses')
+        );
+
+
+        $this->info('🔄 Consumer iniciado. Aguardando mensagens...');
+        Log::info('🔄 Consumer iniciado. Aguardando mensagens...');
 
         $channel->basic_consume(queue: $queue, callback: $this->processMessage(...));
 
@@ -58,11 +86,10 @@ private function sendEmail($data): bool
     {
         try {
             Mail::to($data['email'])->send(new PublishedRecourse($data));
-
             return true;
         } catch (Exception $e) {
-            logger($e->getMessage());
-
+            \Sentry\captureMessage($e, \Sentry\Severity::info());
+            Log::error('Erro ao processar a mensagem');
             return false;
         }
     }
@@ -74,10 +101,11 @@ protected function processMessage(AMQPMessage $msg): void
         if ($this->sendEmail($data)) {
             $msg->ack(); // Confirma o processamento
             $this->info("📧 E-mail enviado para: {$data['email']}");
-
+            Log::info("📧 E-mail enviado para: {$data['email']}");
             return;
         }
 
         $this->error("❌ Falha ao enviar e-mail para: {$data['email']}");
+        Log::error("❌ Falha ao enviar e-mail para: {$data['email']}");
     }
 }

app/Console/Commands/ConsumerCommand.php

@@ -32,14 +32,16 @@ class ConsumerCommand extends Command
      */
     public function handle(): int
     {
-        $queue = config('app.rabbitmq.queues.accountability');
+        $queue = config('rabbitmq.queues.queue_accountability');
+
         $connection = new AMQPStreamConnection(
-            config('app.rabbitmq.host'),
-            config('app.rabbitmq.port'),
-            config('app.rabbitmq.user'),
-            config('app.rabbitmq.pass'),
+            config('rabbitmq.host'),
+            config('rabbitmq.port'),
+            config('rabbitmq.user'),
+            config('rabbitmq.pass'),
             '/',
         );
+
         $channel = $connection->channel();
         $channel->queue_declare($queue, false, true, false, false);
 
@@ -60,15 +62,15 @@ protected function processMessage(AMQPMessage $msg): void
     {
         $data = json_decode($msg->body);
 
-        if ($msg->getRoutingKey() == config('app.rabbitmq.route_key_prop')) {
+        if ($msg->getRoutingKey() == config('rabbitmq.routing.module_accountability_proponent')) {
             Mail::to($data->email)->send(new EmailRegistrationOpp(
                 $data->name,
                 $data->number,
                 $data->days
             ));
         }
 
-        if ($msg->getRoutingKey() == config('app.rabbitmq.route_key_adm')) {
+        if ($msg->getRoutingKey() == config('rabbitmq.routing.module_accountability_adm')) {
             Mail::to($data->comission)->cc($data->owner)->send(new AnswerNotification(
                 $data->registration
             ));

app/Console/Commands/ImportRegistrationCommand.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Services\RabbitMQService;
+use Illuminate\Support\Facades\Log;
+use PhpAmqpLib\Message\AMQPMessage;
+use Illuminate\Support\Facades\Mail;
+USE App\Mail\ImporteRegistrationMail;
+
+class ImportRegistrationCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'rabbitmq:import-registration-command';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Comando para consumir a fila des imports de inscrição';
+
+    protected $queueService;
+
+    public function __construct(RabbitMQService $queueService)
+    {
+        parent::__construct();
+        $this->queueService = $queueService;
+    }
+    /**
+     * Execultando o comando no console
+     */
+    public function handle()
+    {
+        $queue = config('rabbitmq.queues.queue_import_registration');
+        $exchange = config('rabbitmq.exchange_default');
+        $routingKey = config('rabbitmq.routing.module_import_registration_draft');
+        $this->queueService->consume($queue, $exchange, $routingKey, function (AMQPMessage $msg) {
+            $this->processMessage($msg);
+        });
+    }
+
+    protected function processMessage(AMQPMessage $msg)
+    {
+        Log::info('Mensagem recebida: ' . $msg->getBody());
+
+        try {
+            $registrations = json_decode($msg->getBody(), true);
+            if (!is_array($registrations)) {
+                Log::error('Formato de mensagem inválido');
+                return;
+            }
+
+            foreach ($registrations as $registration) {
+                Mail::to($registration['agent_email'])->send(new ImporteRegistrationMail($registration));
+                Log::info('Email enviado para ' . $registration['agent_email']);
+
+            }
+            // Confirmar a mensagem após processamento
+            $msg->ack();
+        } catch (\Exception $e) {
+            \Sentry\captureMessage($e, \Sentry\Severity::info());
+            Log::error('Erro ao processar a mensagem');
+        }
+    }
+}