pg_rails 7.0.8.pre.alpha.81 → 7.0.8.pre.alpha.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5e3d8a7a2e5ca208148f212006a872999b6869a27927044fc4363d14643bd4
-  data.tar.gz: 6011e300a9353d344253e7404929d207688e7b5337578931d538522c2c19b77f
+  metadata.gz: f13f3f371227ad2016ab3996077254555a2d258d2132b6c61e1dbb616cdabf48
+  data.tar.gz: 11206668b12f2acfc9f7878ab7049b27476f7984013a5a107a269ab8273aa8bd
 SHA512:
-  metadata.gz: 8694882667b710bc7e4bbde02cb1bbbcf6a6a4e0202760a4fd09a866bc7ce4925e901f5f577a45d61a4f1f7b7eb67e012cdb6920730bb385e55052596bceae63
-  data.tar.gz: b93fd84594a60f5473bcd180af88485a646e8c62e2bb210b75f68c4c59905aad3cf689ad9078a90798c9a6e13b047f47b677f73b2c8c12a113ed30b97a11cec2
+  metadata.gz: b274dd6247c0d49ced832c8ad44c7bfb4c2916876b87921399c88468ee4297c0008ca2fd9a1a806db8477a7d9fada576b8b02faa19c48fe69298bb8a33bd32fe
+  data.tar.gz: 6a4dbbff767631ed6f1ee0cf9b1eea4a8e8ef7f61c015b900b3f6d4656481f9b74aecd77704bd65931884665230194bbec53d3710c64c27c8b32cde6d77309fb

data/pg_engine/app/admin/email_logs.rb

@@ -0,0 +1,37 @@
+ActiveAdmin.register EmailLog do
+  permit_params :email_id, :log_id, :event, :log_level, :severity, :timestamp, :message_id
+
+  index do
+    selectable_column
+    id_column
+    column :email
+    column :log_id
+    column :event
+    column :log_level
+    column :severity
+    column :timestamp
+    column :message_id
+    actions
+  end
+
+  filter :email
+  filter :log_id
+  filter :event
+  filter :log_level
+  filter :severity
+  filter :timestamp
+  filter :message_id
+
+  form do |f|
+    f.inputs do
+      f.input :email
+      f.input :log_id
+      f.input :event
+      f.input :log_level
+      f.input :severity
+      f.input :timestamp
+      f.input :message_id
+    end
+    f.actions
+  end
+end

data/pg_engine/app/controllers/admin/email_logs_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class EmailLogsController < AdminController
+    include PgEngine::Resource
+
+    before_action { @clase_modelo = EmailLog }
+
+    before_action(only: :index) { authorize EmailLog }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb EmailLog.nombre_plural, :admin_email_logs_path
+
+    before_action do
+      @actions = [
+        ["Mailgun sync: #{ENV.fetch('MAILGUN_DOMAIN', nil)}", mailgun_sync_admin_email_logs_path, {
+          'data-turbo-method': :post, class: 'me-2 btn btn-primary btn-sm'
+        }]
+      ]
+    end
+
+    def mailgun_sync
+      @new_items = PgEngine::Mailgun::LogSync.download
+      flash[:success] = "#{@new_items.length} nuevos items"
+
+      redirect_to admin_email_logs_path
+    end
+
+    private
+
+    def atributos_permitidos
+      %i[email_id log_id event log_level severity timestamp message_id]
+    end
+
+    def atributos_para_buscar
+      %i[email log_id event log_level severity timestamp message_id]
+    end
+
+    def atributos_para_listar
+      %i[email log_id event log_level severity timestamp message_id]
+    end
+
+    def atributos_para_mostrar
+      %i[email log_id event log_level severity timestamp message_id]
+    end
+  end
+end

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -92,7 +92,6 @@ module PgEngine
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
-                # rubocop:disable Rails/SkipsModelValidations
                 turbo_stream.update_all('.modal.show .pg-associable-form', <<~HTML
                   <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
                 HTML

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -91,7 +91,7 @@ module PgEngine
 
     protected
 
-    def not_authorized
+    def not_authorized(_arg_required_for_active_admin)
       respond_to do |format|
         format.json do
           render json: { error: 'Acceso no autorizado' },

data/pg_engine/app/controllers/public/webhooks_controller.rb

@@ -0,0 +1,10 @@
+module Public
+  class WebhooksController < PublicController
+    def mailgun
+      # FIXME: verify signature
+      # params['signature']['timestamp']
+      PgEngine::Mailgun::LogSync.digest(params['event-data'])
+      head :ok
+    end
+  end
+end

data/pg_engine/app/decorators/email_log_decorator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class EmailLogDecorator < PgEngine::BaseRecordDecorator
+  delegate_all
+
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
+  #
+  #   def created_at
+  #     helpers.content_tag :span, class: 'time' do
+  #       object.created_at.strftime("%a %m/%d/%y")
+  #     end
+  #   end
+end

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -6,7 +6,6 @@ module PgEngine
 
     def render_turbo_stream_title
       title = [breadcrumbs.last&.name, I18n.t('app_name')].compact.join(' - ')
-      # rubocop:disable Rails/SkipsModelValidations
       turbo_stream.update_all 'title', title
       # rubocop:enable Rails/SkipsModelValidations
     end

data/pg_engine/app/mailers/pg_engine/base_mailer.rb

@@ -21,9 +21,7 @@ module PgEngine
 
     rescue_from StandardError do |err|
       pg_err err
-      if @email_object.present?
-        @email_object.update_columns(status: :failed, status_detail: err.to_s) # rubocop:disable Rails/SkipsModelValidations
-      end
+      @email_object.update_columns(status: :failed, status_detail: err.to_s) if @email_object.present?
     end
 
     protected

data/pg_engine/app/models/email.rb

@@ -36,6 +36,8 @@ class Email < ApplicationRecord
   include Hashid::Rails
   audited
 
+  attr_accessor :require_body_input
+
   has_one_attached :encoded_eml
 
   belongs_to :associated, polymorphic: true, optional: true
@@ -43,10 +45,10 @@ class Email < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
-  kredis_unique_list :logs
+  has_many :email_logs, dependent: :destroy
 
   # TODO: y el fallido temporario?
-  enumerize :status, in: { pending: 0, failed: 1, sent: 2, accepted: 3, delivered: 4, rejected: 5 }
+  enumerize :status, in: { pending: 0, failed: 1, sent: 2, accepted: 3, delivered: 4, rejected: 5 }, scope: true
 
   validates :from_address, :to, :status, presence: true
 
@@ -61,6 +63,9 @@ class Email < ApplicationRecord
   validates :from_name, length: { within: 0..80 }
   validates :to, length: { within: 3..200 }
 
+  validates :body_input, length: { minimum: 10 }, if: -> { require_body_input }
+  validates :body_input, presence: true, if: -> { require_body_input }
+
   validates :from_name, :subject, :to,
             format: { with: /\A[^\n<>&]*\z/, message: 'contiene caracteres inválidos' }
 
@@ -69,4 +74,18 @@ class Email < ApplicationRecord
   end
 
   # validates_format_of :subject, with: /\A[[[:alpha:]]\(\)\w\s.,;!¡?¿-]+\z/
+
+  def update_status!
+    statuses = email_logs.map(&:status_for_email).compact
+
+    # Aprovechando que los values de status están dispuestos de manera "cronologica"
+    new_status = statuses.map { |st| Email.status.find_value(st).value }.max
+    return unless new_status
+
+    self.status = new_status
+    return unless changed?
+
+    self.audit_comment = 'Actualizando status desde logs'
+    save!
+  end
 end

data/pg_engine/app/models/email_log.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: email_logs
+#
+#  id         :bigint           not null, primary key
+#  event      :string
+#  log_level  :string
+#  severity   :string
+#  timestamp  :bigint
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  email_id   :bigint           indexed
+#  log_id     :string
+#  message_id :string
+#
+# Foreign Keys
+#
+#  fk_rails_...  (email_id => emails.id)
+#
+# generado con pg_rails
+
+class EmailLog < ApplicationRecord
+  audited
+
+  belongs_to :email, optional: true
+
+  after_create_commit do
+    email.update_status! if email.present?
+  end
+
+  def status_for_email
+    case event
+    when 'accepted'
+      'accepted'
+    when 'delivered'
+      'delivered'
+    when 'failed'
+      if severity == 'permanent'
+        'rejected'
+      elsif severity == 'temporary'
+        'accepted'
+      else
+        # :nocov:
+        pg_warn 'No se pudo detectar el status de email', self
+        nil
+        # :nocov:
+      end
+    when 'opened'
+      # No cambia el status
+    else
+      # :nocov:
+      pg_warn 'No se pudo detectar el status de email', self
+      nil
+      # :nocov:
+    end
+  end
+end

data/pg_engine/app/policies/email_log_policy.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class EmailLogPolicy < ApplicationPolicy
+  class Scope < ApplicationPolicy::Scope
+    # def resolve
+    #   if policy.acceso_total?
+    #     scope.all
+    #   else
+    #     scope.none
+    #   end
+    # end
+  end
+
+  # def puede_editar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def puede_crear?
+  #   acceso_total? || user.asesor?
+  # end
+
+  # def puede_borrar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def acceso_total?
+  #   user.developer?
+  # end
+end

data/pg_engine/app/views/admin/email_logs/_email_log.html.slim

@@ -0,0 +1 @@
+h1 el partiaaal

data/pg_engine/app/views/admin/email_logs/_form.html.slim

@@ -0,0 +1,16 @@
+/ # locals: (object: nil, asociable: false)
+
+div style="max-width: 22em" data-controller="pg_form"
+  = pg_form_for(@email_log || object, asociable:) do |f|
+    = f.mensajes_de_error
+
+    = hidden_field_tag :asociable, true if asociable
+    = f.pg_associable :email
+    = f.input :log_id
+    = f.input :event
+    = f.input :log_level
+    = f.input :severity
+    = f.input :timestamp
+    = f.input :message_id
+    .mt-2
+    = f.button :submit

data/pg_engine/app/views/admin/email_logs/show.html.slim

@@ -0,0 +1,18 @@
+- content_for :title do
+  = @email_log.to_s
+- content_for :actions do
+  = @email_log.destroy_link_redirect
+  .ms-1
+  = @email_log.edit_link
+
+table.table.table-borderless.table-sm.w-auto.mb-0.m-3
+  - atributos_para_mostrar.each do |att|
+    tr
+      th = @clase_modelo.human_attribute_name(att)
+      td = @email_log.send(att)
+  tr
+    th = t('attributes.created_at')
+    td = @email_log.created_at
+  tr
+    th = t('attributes.updated_at')
+    td = @email_log.updated_at

data/pg_engine/app/views/admin/emails/show.html.slim

@@ -23,7 +23,23 @@ table.table.table-borderless.table-sm.w-auto.mb-0.m-3
     th = t('attributes.updated_at')
     td = @email.updated_at
 
-h4 Logs
-- @email.logs.to_a.each do |log|
-  - json = JSON.parse(log)
-  p = json['event']
+.m-4
+  h4 Logs
+  table.table
+    tr
+      th log_id
+      th event
+      th log_level
+      th severity
+      th timestamp
+      th created_at
+      th updated_at
+    - @email.email_logs.order(timestamp: :desc).each do |log|
+      tr
+        td = log.log_id
+        td = log.event
+        td = log.log_level
+        td = log.severity
+        td = log.timestamp
+        td = log.created_at
+        td = log.updated_at

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -1,5 +1,7 @@
 - content_for(:title, @clase_modelo.nombre_plural)
 - content_for :actions do
+  - @actions&.each do |link_args|
+    = link_to(*link_args)
   - if @filtros.present?
     button.btn.btn-sm.btn-outline-primary[
       type="button" data-bs-toggle="collapse"

data/pg_engine/config/initializers/active_admin.rb

@@ -105,7 +105,7 @@ ActiveAdmin.setup do |config|
   # because, by default, user gets redirected to Dashboard. If user
   # doesn't have access to Dashboard, he'll end up in a redirect loop.
   # Method provided here should be defined in application_controller.rb.
-  # config.on_unauthorized_access = :access_denied
+  config.on_unauthorized_access = :not_authorized
 
   # == Current User
   #

data/pg_engine/config/locales/es.yml

@@ -65,9 +65,11 @@ es:
       timeout: ''
       unauthenticated: ''
     registrations:
+      signed_up_but_unconfirmed: Te enviamos un correo electrónico con instrucciones para confirmar tu cuenta.
       new:
         sign_up: Crear una cuenta
     passwords:
+      send_instructions: Vas a recibir un correo con instrucciones sobre cómo resetear tu contraseña en unos pocos minutos.
       new:
         send_me_reset_password_instructions: Enviar instrucciones para restablecer contraseña
         forgot_your_password: ¿Olvidaste tu contraseña?

data/pg_engine/config/routes.rb

@@ -3,6 +3,7 @@ include PgEngine::RouteHelpers
 Rails.application.routes.draw do
   namespace :public, path: '' do
     pg_resource(:mensaje_contactos, only: [:new, :create], path: 'contacto')
+    post 'webhook/mailgun', to: 'webhooks#mailgun'
   end
   devise_for :users, controllers: {
     confirmations: 'users/confirmations',
@@ -10,6 +11,11 @@ Rails.application.routes.draw do
   }, failure_app: PgEngine::DeviseFailureApp
   namespace :admin, path: 'a' do
     pg_resource(:emails)
+    pg_resource(:email_logs) do
+      collection do
+        post :mailgun_sync
+      end
+    end
     pg_resource(:users)
     pg_resource(:accounts)
     pg_resource(:user_accounts)
@@ -102,6 +108,17 @@ end
 #                                              PATCH  /a/emails/:id(.:format)                                                                           admin/emails#update
 #                                              PUT    /a/emails/:id(.:format)                                                                           admin/emails#update
 #                                              DELETE /a/emails/:id(.:format)                                                                           admin/emails#destroy
+#                 abrir_modal_admin_email_logs GET    /a/email_logs/abrir_modal(.:format)                                                               admin/email_logs#abrir_modal
+#                      buscar_admin_email_logs POST   /a/email_logs/buscar(.:format)                                                                    admin/email_logs#buscar
+#                mailgun_sync_admin_email_logs POST   /a/email_logs/mailgun_sync(.:format)                                                              admin/email_logs#mailgun_sync
+#                             admin_email_logs GET    /a/email_logs(.:format)                                                                           admin/email_logs#index
+#                                              POST   /a/email_logs(.:format)                                                                           admin/email_logs#create
+#                          new_admin_email_log GET    /a/email_logs/new(.:format)                                                                       admin/email_logs#new
+#                         edit_admin_email_log GET    /a/email_logs/:id/edit(.:format)                                                                  admin/email_logs#edit
+#                              admin_email_log GET    /a/email_logs/:id(.:format)                                                                       admin/email_logs#show
+#                                              PATCH  /a/email_logs/:id(.:format)                                                                       admin/email_logs#update
+#                                              PUT    /a/email_logs/:id(.:format)                                                                       admin/email_logs#update
+#                                              DELETE /a/email_logs/:id(.:format)                                                                       admin/email_logs#destroy
 #                      abrir_modal_admin_users GET    /a/users/abrir_modal(.:format)                                                                    admin/users#abrir_modal
 #                           buscar_admin_users POST   /a/users/buscar(.:format)                                                                         admin/users#buscar
 #                                  admin_users GET    /a/users(.:format)                                                                                admin/users#index
@@ -165,6 +182,15 @@ end
 #                  active_admin_audited_audits GET    /active_admin/audited_audits(.:format)                                                            active_admin/audited_audits#index
 #                   active_admin_audited_audit GET    /active_admin/audited_audits/:id(.:format)                                                        active_admin/audited_audits#show
 #                       active_admin_dashboard GET    /active_admin/dashboard(.:format)                                                                 active_admin/dashboard#index
+#         batch_action_active_admin_email_logs POST   /active_admin/email_logs/batch_action(.:format)                                                   active_admin/email_logs#batch_action
+#                      active_admin_email_logs GET    /active_admin/email_logs(.:format)                                                                active_admin/email_logs#index
+#                                              POST   /active_admin/email_logs(.:format)                                                                active_admin/email_logs#create
+#                   new_active_admin_email_log GET    /active_admin/email_logs/new(.:format)                                                            active_admin/email_logs#new
+#                  edit_active_admin_email_log GET    /active_admin/email_logs/:id/edit(.:format)                                                       active_admin/email_logs#edit
+#                       active_admin_email_log GET    /active_admin/email_logs/:id(.:format)                                                            active_admin/email_logs#show
+#                                              PATCH  /active_admin/email_logs/:id(.:format)                                                            active_admin/email_logs#update
+#                                              PUT    /active_admin/email_logs/:id(.:format)                                                            active_admin/email_logs#update
+#                                              DELETE /active_admin/email_logs/:id(.:format)                                                            active_admin/email_logs#destroy
 #             batch_action_active_admin_emails POST   /active_admin/emails/batch_action(.:format)                                                       active_admin/emails#batch_action
 #                          active_admin_emails GET    /active_admin/emails(.:format)                                                                    active_admin/emails#index
 #                           active_admin_email GET    /active_admin/emails/:id(.:format)                                                                active_admin/emails#show

data/pg_engine/db/migrate/20240523183651_create_email_logs.rb

@@ -0,0 +1,19 @@
+# generado con pg_rails
+
+class CreateEmailLogs < ActiveRecord::Migration[7.1]
+  def change
+    create_table :email_logs do |t|
+      t.references :email, foreign_key: true
+      t.string :log_id
+      t.string :event
+      t.string :log_level
+      t.string :severity
+      t.bigint :timestamp
+      t.string :message_id
+
+
+      t.timestamps
+    end
+
+  end
+end

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -8,7 +8,7 @@ module PgEngine
       status = get_status(message)
       if message['email_object'].present?
         email_object = message['email_object'].unparsed_value
-        email_object.update_columns(message_id:, mailer:, status:) # rubocop:disable Rails/SkipsModelValidations
+        email_object.update_columns(message_id:, mailer:, status:)
       else
         to = [message.to].flatten.join(', ')
         from = [message.from].flatten.join(', ')
@@ -20,8 +20,10 @@ module PgEngine
       pg_err e
     end
 
-    def self.get_status(message)
-      message.perform_deliveries ? :sent : :blocked
+    def self.get_status(_message)
+      # TODO: falta implementar el interceptor y habría que dar algún detalle de por uqé se bloqueó
+      # message.perform_deliveries ? :sent : :failed
+      :sent
     end
   end
 end

data/pg_engine/lib/pg_engine/mailgun/log_sync.rb

@@ -8,8 +8,6 @@ module PgEngine
   module Mailgun
     class LogSync
       def self.download # rubocop:disable Metrics/AbcSize
-        domain = ENV.fetch('MAILGUN_DOMAIN')
-
         key = Rails.application.credentials.dig(:mailgun, :api_key)
         mg_client = ::Mailgun::Client.new(key)
         items = []
@@ -17,54 +15,59 @@ module PgEngine
         start_time = DateTime.now - 3.days
         range = 1.day
         current = end_time - range
+
         loop do
           get = "#{domain}/events?begin=#{current.to_i}&end=#{(current + range).to_i}&limit=300"
           result = mg_client.get(get)
           result.to_h!
-          items.push(result.body['items'])
-          # puts "Current: #{current}. Items count: #{result.body['items'].length}"
+          items.push(*result.body['items'])
           current -= range
 
           break if current < start_time
         end
 
-        FileUtils.mkdir_p(dir)
+        write_log(items)
 
-        File.write("#{dir}/#{domain}-#{Time.zone.now.strftime('%Y-%m-%d_%H.%M.%S')}.json", items.flatten.to_json)
+        items.map do |item|
+          digest(item)
+        end.compact
       end
 
-      def self.dir
-        @dir ||= if Rails.env.test?
-                   File.expand_path 'tmp/mailgun_logs', Rails.root
-                 else
-                   File.expand_path 'log/mailgun_logs', Rails.root
-                 end
+      def self.digest(item)
+        message_id = item['message']['headers']['message-id']
+
+        return if EmailLog.exists?(log_id: item['id'])
+
+        EmailLog.create!(
+          email: Email.where(message_id:).first,
+          log_id: item['id'],
+          event: item['event'],
+          log_level: item['log-level'],
+          severity: item['severity'],
+          timestamp: item['timestamp'],
+          message_id:
+        )
+      rescue StandardError => e
+        pg_err e, item
       end
 
-      def self.sync_redis
-        json = []
-        Dir["#{dir}/*.json"].each do |file|
-          json.push(*JSON.parse(File.read(file)))
-        end
+      def self.write_log(items)
+        FileUtils.mkdir_p(log_dir)
+        File.write("#{log_dir}/#{domain}_#{Time.zone.now.strftime('%Y-%m-%d_%H.%M.%S')}.json", items.to_json)
+      end
 
-        json.each do |i|
-          # [
-          #   Time.at(i["timestamp"]).strftime('%y-%m-%d %H:%M %z'),
-          #   i["message"]["headers"]["message-id"],
-          #   # i["message"]["headers"]["message-id"][3..15],
-          #   i["event"],
-          #   i["recipient"],
-          #   i["message"]["headers"]["from"],
-          #   i["message"]["headers"]["subject"],
-          # ]
-          message_id = i['message']['headers']['message-id']
-          email = Email.where(message_id:).first
-          if email
-            email.logs << i.to_json
-          else
-            pg_warn "No existe el mail con message_id = #{message_id}", :warn
-          end
-        end
+      def self.domain
+        ENV.fetch('MAILGUN_DOMAIN')
+      end
+
+      def self.log_dir
+        @log_dir ||= if Rails.env.test?
+                       File.expand_path 'tmp/mailgun_logs', Rails.root
+                     else
+                       # :nocov:
+                       File.expand_path 'log/mailgun_logs', Rails.root
+                       # :nocov:
+                     end
       end
     end
   end

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -5,7 +5,14 @@ require 'rainbow'
 # TODO: poder pasar blocks
 
 def pg_err(*args)
-  raise args.first if ENV.fetch('RAISE_ERRORS', false) && args.first.is_a?(Exception)
+  if ENV.fetch('RAISE_ERRORS', false)
+    # :nocov:
+    raise args.first if args.first.is_a?(Exception)
+
+    raise StandardError, args
+
+    # :nocov:
+  end
 
   byebug if ENV.fetch('BYEBUG_ERRORS', false) # rubocop:disable Lint/Debugger
 

data/pg_engine/spec/controllers/admin/email_logs_controller_spec.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
+
+RSpec.describe Admin::EmailLogsController do
+  render_views
+  # This should return the minimal set of attributes required to create a valid
+  # EmailLog. As you add validations to EmailLog, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) do
+    attributes_for(:email_log)
+  end
+
+  let(:logged_user) { create :user, :developer }
+
+  before do
+    sign_in logged_user if logged_user.present?
+  end
+
+  describe '#mailgun_sync' do
+    subject do
+      post :mailgun_sync
+    end
+
+    before do
+      allow(PgEngine::Mailgun::LogSync).to receive(:download).and_return([])
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:redirect)
+    end
+  end
+
+  describe 'routing' do
+    it 'routes GET index correctly' do
+      route = { get: '/a/email_logs' }
+      expect(route).to route_to(controller: 'admin/email_logs', action: 'index')
+    end
+  end
+
+  describe 'GET #index' do
+    subject do
+      get :index, params: {}
+    end
+
+    before { create :email_log }
+
+    it 'returns a success response' do
+      subject
+      expect(response).to be_successful
+    end
+
+    context 'when user is not logged in' do
+      let(:logged_user) { nil }
+
+      it 'redirects to login path' do
+        subject
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+
+    context 'when se pide el excel' do
+      subject do
+        get :index, params: {}, format: 'xlsx'
+      end
+
+      it 'returns a success response' do
+        subject
+        expect(response).to be_successful
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    it 'returns a success response' do
+      email_log = create(:email_log)
+      get :show, params: { id: email_log.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #new' do
+    it 'returns a success response' do
+      get :new, params: {}
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #edit' do
+    it 'returns a success response' do
+      email_log = create(:email_log)
+      get :edit, params: { id: email_log.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'POST #create' do
+    context 'with valid params' do
+      it 'creates a new EmailLog' do
+        expect do
+          post :create, params: { email_log: valid_attributes }
+        end.to change(EmailLog, :count).by(1)
+      end
+
+      it 'redirects to the created email_log' do
+        post :create, params: { email_log: valid_attributes }
+        expect(response).to redirect_to([:admin, EmailLog.last])
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    context 'with valid params' do
+      let(:new_attributes) do
+        attributes_for(:email_log)
+      end
+
+      it 'redirects to the email_log' do
+        email_log = create(:email_log)
+        put :update, params: { id: email_log.to_param, email_log: valid_attributes }
+        expect(response).to redirect_to([:admin, email_log])
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    subject do
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      delete :destroy, params: { id: email_log.to_param, redirect_to: redirect_url }
+    end
+
+    let!(:email_log) { create :email_log }
+    let(:redirect_url) { nil }
+
+    it 'destroys the requested email_log' do
+      expect { subject }.to change(EmailLog, :count).by(-1)
+    end
+
+    it 'quita el elemento de la lista' do
+      subject
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { admin_email_logs_url }
+
+      it 'redirects to the email_logs list' do
+        subject
+        expect(response).to redirect_to(admin_email_logs_url)
+      end
+    end
+  end
+end

data/pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb

@@ -68,8 +68,8 @@ describe PgEngine::Resource do
       let(:param) { :categoria_de_cosa }
 
       before do
-        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a') # rubocop:disable Rails/SkipsModelValidations
-        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z') # rubocop:disable Rails/SkipsModelValidations
+        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a')
+        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z')
       end
 
       context 'si es asc' do

data/pg_engine/spec/controllers/public/webhooks_controller_spec.rb

@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+describe Public::WebhooksController do
+  describe '#mailgun' do
+    subject do
+      post :mailgun, body:, as: :json
+    end
+
+    let(:body) do
+      <<~JSON
+        {
+          "signature": {
+            "timestamp": "1529006854",
+            "token": "a8ce0edb2dd8301dee6c2405235584e45aa91d1e9f979f3de0",
+            "signature": "d2271d12299f6592d9d44cd9d250f0704e4674c30d79d07c47a66f95ce71cf55"
+          },
+          "event-data": {
+            "timestamp": 1715014542.2477064,
+            "ip": "66.102.8.333",
+            "event": "delivered",
+            "id": "log_2",
+            "severity":"temporary",
+            "log-level": "info",
+            "message": {
+                "headers": { "message-id": "msgid@fakeapp2024.mail" }
+            },
+            "recipient": "natprobel@fakemail.com"
+          }
+        }
+      JSON
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+
+    it do
+      expect { subject }.to change(EmailLog, :count).by(1)
+    end
+  end
+end

data/pg_engine/spec/factories/email_logs.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+FactoryBot.define do
+  factory :email_log do
+    email
+    log_id { Faker::Lorem.sentence }
+    event { %w[accepted delivered failed opened].sample }
+    log_level { %w[info warn error].sample }
+    severity { %w[permanent temporary].sample }
+    timestamp { '' }
+    message_id { Faker::Lorem.sentence }
+
+    trait :email_existente do
+      email { nil }
+      email_id { Email.pluck(:id).sample }
+    end
+  end
+end

data/pg_engine/spec/features/signup_spec.rb

@@ -23,7 +23,7 @@ describe 'Al Registrarse', :js do
         fill_in 'user_password', with: 'admin123'
         fill_in 'user_password_confirmation', with: 'admin123'
         instance_exec('input[type=submit]', &find_scroll).click
-        expect(page).to have_text('Se ha enviado un mensaje con un enlace')
+        expect(page).to have_text('Te enviamos un correo electrónico con instrucciones')
       end
     end
 

data/pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb

@@ -1,25 +1,99 @@
 require 'rails_helper'
 require 'fileutils'
 
-describe PgEngine::Mailgun::LogSync do
+describe PgEngine::Mailgun::LogSync, vcr: { cassette_name: 'mailgun/log_sync_download',
+                                            match_requests_on: %i[method host] } do
   let(:instancia) { described_class }
 
-  describe '#download',
-           vcr: { cassette_name: 'mailgun/log_sync_download',
-                  match_requests_on: %i[method host] } do
+  describe '#download' do
     subject do
       instancia.download
-      instancia.sync_redis
     end
 
     after do
-      Dir["#{instancia.dir}/*.json"].each { |file| File.delete(file) }
+      FileUtils.rm_r(instancia.log_dir)
     end
 
     let!(:email) { create :email, message_id: '66393f1bc7d4_47a5108ec1628f@notebook.mail' }
 
     it do
-      expect { subject }.to change { email.logs.to_a.length }.from(0).to(3)
+      expect { subject }.to change { email.email_logs.count }.from(0).to(3)
+                                                             .and(change(EmailLog, :count).to(8))
+    end
+  end
+
+  describe '#digest' do
+    subject do
+      instancia.digest(JSON.parse(log_data))
+    end
+
+    let(:log_data) do
+      <<~JSON
+        {
+            "timestamp": 1715014542.2477064,
+            "ip": "66.102.8.333",
+            "event": "delivered",
+            "id": "log_2",
+            "severity":"temporary",
+            "log-level": "info",
+            "message": {
+                "headers": { "message-id": "msgid@fakeapp2024.mail" }
+            },
+            "recipient": "natprobel@fakemail.com"
+        }
+      JSON
+    end
+
+    let(:expected_attributes) do
+      {
+        log_id: 'log_2',
+        event: 'delivered',
+        log_level: 'info',
+        severity: 'temporary',
+        timestamp: 1_715_014_542,
+        message_id: 'msgid@fakeapp2024.mail'
+      }
+    end
+
+    it do
+      expect { subject }.to change(EmailLog, :count).by(1)
+    end
+
+    it do
+      expect(subject).to have_attributes(expected_attributes)
+    end
+
+    context 'ya existe el log' do
+      subject do
+        instancia.digest(JSON.parse(log_data))
+        instancia.digest(JSON.parse(log_data))
+      end
+
+      it 'solo lo crea una vez' do
+        expect { subject }.to change(EmailLog, :count).by(1)
+      end
+    end
+
+    context 'cuando se asocia a un email' do
+      let!(:email) { create :email, message_id: 'msgid@fakeapp2024.mail' }
+
+      it do
+        expect(subject.email).to eq email
+      end
+
+      it 'changes email status' do
+        expect { subject }.to change { email.reload.status }.to 'delivered'
+      end
+    end
+
+    context 'cuando hay errores' do
+      subject do
+        instancia.digest({})
+      end
+
+      it do
+        expect { subject }.not_to change(EmailLog, :count)
+      end
     end
   end
 end

data/pg_engine/spec/models/email_log_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+RSpec.describe EmailLog do
+  let(:email_log) { create(:email_log) }
+
+  it 'se persiste' do
+    expect(email_log).to be_persisted
+  end
+
+  describe 'status_for_email' do
+    subject do
+      email_log.status_for_email
+    end
+
+    let(:email_log) { create(:email_log, event:, severity:) }
+    let(:severity) { nil }
+
+    context 'cuando es accepted' do
+      let(:event) { 'accepted' }
+
+      it { is_expected.to eq 'accepted' }
+    end
+
+    context 'cuando es delivered' do
+      let(:event) { 'delivered' }
+
+      it { is_expected.to eq 'delivered' }
+    end
+
+    context 'cuando hay un fallo temporario' do
+      let(:event) { 'failed' }
+      let(:severity) { 'temporary' }
+
+      it { is_expected.to eq 'accepted' }
+    end
+
+    context 'cuando hay un fallo permanente' do
+      let(:event) { 'failed' }
+      let(:severity) { 'permanent' }
+
+      it { is_expected.to eq 'rejected' }
+    end
+  end
+end

data/pg_engine/spec/models/email_spec.rb

@@ -10,4 +10,39 @@ RSpec.describe Email do
   it 'se persiste' do
     expect(email).to be_persisted
   end
+
+  describe 'update_status!' do
+    context 'cuando hay accepted y delivered' do
+      subject do
+        create :email_log, email: email.reload, event: 'accepted'
+        create :email_log, email: email.reload, event: 'delivered'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'delivered'
+      end
+    end
+
+    context 'cuando hay accepted y fallo temporario' do
+      subject do
+        create :email_log, email: email.reload, event: 'failed', severity: 'temporary'
+        create :email_log, email: email.reload, event: 'accepted'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'accepted'
+      end
+    end
+
+    context 'cuando hay accepted y fallo permanente' do
+      subject do
+        create :email_log, email: email.reload, event: 'accepted'
+        create :email_log, email: email.reload, event: 'failed', severity: 'permanent'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'rejected'
+      end
+    end
+  end
 end

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.81'
+  VERSION = '7.0.8-alpha.83'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.81
+  version: 7.0.8.pre.alpha.83
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -944,6 +944,7 @@ files:
 - pg_engine/app/admin/accounts.rb
 - pg_engine/app/admin/audits.rb
 - pg_engine/app/admin/dashboard.rb
+- pg_engine/app/admin/email_logs.rb
 - pg_engine/app/admin/emails.rb
 - pg_engine/app/admin/mensaje_contactos.rb
 - pg_engine/app/admin/user_accounts.rb
@@ -955,6 +956,7 @@ files:
 - pg_engine/app/assets/stylesheets/active_admin.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
 - pg_engine/app/controllers/admin/accounts_controller.rb
+- pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
@@ -963,10 +965,12 @@ files:
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
 - pg_engine/app/controllers/public/mensaje_contactos_controller.rb
+- pg_engine/app/controllers/public/webhooks_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
 - pg_engine/app/decorators/account_decorator.rb
 - pg_engine/app/decorators/email_decorator.rb
+- pg_engine/app/decorators/email_log_decorator.rb
 - pg_engine/app/decorators/mensaje_contacto_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_record_decorator.rb
@@ -989,11 +993,13 @@ files:
 - pg_engine/app/models/account.rb
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
+- pg_engine/app/models/email_log.rb
 - pg_engine/app/models/mensaje_contacto.rb
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
 - pg_engine/app/models/user_account.rb
 - pg_engine/app/policies/account_policy.rb
+- pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
 - pg_engine/app/policies/mensaje_contacto_policy.rb
 - pg_engine/app/policies/pg_engine/application_policy.rb
@@ -1005,6 +1011,9 @@ files:
 - pg_engine/app/views/admin/accounts/edit.html.slim
 - pg_engine/app/views/admin/accounts/new.html.slim
 - pg_engine/app/views/admin/accounts/show.html.slim
+- pg_engine/app/views/admin/email_logs/_email_log.html.slim
+- pg_engine/app/views/admin/email_logs/_form.html.slim
+- pg_engine/app/views/admin/email_logs/show.html.slim
 - pg_engine/app/views/admin/emails/_form.html.slim
 - pg_engine/app/views/admin/emails/show.html.slim
 - pg_engine/app/views/admin/user_accounts/_form.html.slim
@@ -1047,6 +1056,7 @@ files:
 - pg_engine/db/migrate/20240428152916_create_mensaje_contactos.rb
 - pg_engine/db/migrate/20240506194106_create_emails.rb
 - pg_engine/db/migrate/20240517174821_pg_trgm.rb
+- pg_engine/db/migrate/20240523183651_create_email_logs.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -1060,6 +1070,7 @@ files:
 - pg_engine/lib/pg_engine/utils/pg_logger.rb
 - pg_engine/lib/tasks/auto_anotar_modelos.rake
 - pg_engine/spec/controllers/admin/accounts_controller_spec.rb
+- pg_engine/spec/controllers/admin/email_logs_controller_spec.rb
 - pg_engine/spec/controllers/admin/emails_controller_spec.rb
 - pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb
 - pg_engine/spec/controllers/admin/users_controller_spec.rb
@@ -1067,9 +1078,11 @@ files:
 - pg_engine/spec/controllers/devise/sessions_controller_spec.rb
 - pg_engine/spec/controllers/pg_engine/base_controller_spec.rb
 - pg_engine/spec/controllers/public/mensaje_contactos_controller_spec.rb
+- pg_engine/spec/controllers/public/webhooks_controller_spec.rb
 - pg_engine/spec/controllers/users/confirmations_controller_spec.rb
 - pg_engine/spec/controllers/users/registrations_controller_spec.rb
 - pg_engine/spec/factories/accounts.rb
+- pg_engine/spec/factories/email_logs.rb
 - pg_engine/spec/factories/emails.rb
 - pg_engine/spec/factories/mensaje_contactos.rb
 - pg_engine/spec/factories/user_accounts.rb
@@ -1086,6 +1099,7 @@ files:
 - pg_engine/spec/lib/pg_form_builder_spec.rb
 - pg_engine/spec/mailers/previews/devise_preview.rb
 - pg_engine/spec/models/account_spec.rb
+- pg_engine/spec/models/email_log_spec.rb
 - pg_engine/spec/models/email_spec.rb
 - pg_engine/spec/models/mensaje_contacto_spec.rb
 - pg_engine/spec/models/pg_engine/base_record_spec.rb