pg_rails 7.0.8.pre.alpha.82 → 7.0.8.pre.alpha.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f155f16783603b8b6acd943855ce4d4996d92722235ec8eea4fe9cf82dd6efb0
-  data.tar.gz: 4403492bc1eaeecb807dd9bab487047b89681007100baf5e6758271a8967f163
+  metadata.gz: 9c61900d2d0b3a827718b84a3cab67f4851b2eb3087e7fbc1d313f0acf163bf3
+  data.tar.gz: bfca92cbb58ba292877ccb61b15b08049a0d800fdc13408f82647e9ea7c66ee9
 SHA512:
-  metadata.gz: 97f5a71981109ce5a8dac87ce5db0184e5c21fc906adc0863ca916e2b8868e5dc013ea46a924e42780b49e9d658faf32a8b5c34bcdf272edd549f848a4ad9918
-  data.tar.gz: 69dc1acfe7f80c080c4f0263f1904f9ceaff511da31a24e37ba5f77fa6e76fb4888af45313c7c41ab58b3fe3697cdaf46306c28c426bcac91e0badc84ad4aa69
+  metadata.gz: 2282deaa98881e20bd0b754c6496fc9da679214760ea45fd5f8c2f0b64a0903e1557cffb2f8d4c13b156d46e62b237113bf8f24bdba676436a404eb1e57e37c5
+  data.tar.gz: d9ece2e6b39c53169548c253afdb18fb9707d76bc762b0b86b7cc2656e563a4efea6d303f51814aac22926effd37ef1ec1d6c6a6d00bded153476864586f6b14

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/pg_engine/base_controller.rb

@@ -40,6 +40,9 @@ module PgEngine
           render turbo_stream: (turbo_stream.remove_all('.modal') + render_turbo_stream_flash_messages),
                  status: :internal_server_error
         end
+        format.any do
+          head :internal_server_error
+        end
       end
     end
 

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

@@ -0,0 +1,77 @@
+module Public
+  class WebhooksController < PublicController
+    skip_before_action :verify_authenticity_token
+
+    before_action :verify_signature, only: :mailgun
+
+    rescue_from StandardError do
+      pg_err 'webhook internal server error', request.body.read
+      head :internal_server_error
+    end
+
+    rescue_from ActionDispatch::Http::Parameters::ParseError do
+      pg_warn 'webhook parser error', request.body.read
+      head :bad_request
+    end
+
+    def mailgun
+      if PgEngine::Mailgun::LogSync.digest(params['event-data'])
+        head :ok
+      else
+        # Si no se guardó el log es porque ya existía un log con ese ID
+        # Mando :not_acceptable (406) para que Mailgun no vuelva a intentar
+        # https://documentation.mailgun.com/docs/mailgun/user-manual/tracking-messages
+        pg_warn 'ya existía un log con ese id, raaaaro', params
+        head :not_acceptable
+      end
+    end
+
+    private
+
+    def used_tokens
+      Kredis.unique_list 'mailgun_webhook_used_tokens'
+    end
+
+    def not_used_token(token)
+      if used_tokens.elements.include?(token)
+        pg_warn 'Mailgun Webhook: refusing used token'
+        head :ok
+
+        false
+      else
+        used_tokens << token
+        true
+      end
+    end
+
+    def timestamp_not_too_far(timestamp)
+      if (Time.zone.at(timestamp.to_i) - Time.zone.now).abs > 1.hour
+        pg_warn 'Mailgun Webhook: refusing due to timestamp too far'
+        head :ok
+
+        false
+      else
+        true
+      end
+    end
+
+    def verify_signature
+      timestamp = params['signature']['timestamp']
+      token = params['signature']['token']
+      signature = params['signature']['signature']
+      hexdigest = encode(timestamp + token)
+
+      return unless not_used_token(token)
+      return unless timestamp_not_too_far(timestamp)
+      return unless hexdigest != signature
+
+      pg_warn 'Mailgun Webhook: refusing invalid signature'
+      head :ok
+    end
+
+    def encode(data)
+      webhook_secret_key = Rails.application.credentials.dig(:mailgun, :webhook_secret_key)
+      OpenSSL::HMAC.hexdigest('sha256', webhook_secret_key, data)
+    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/models/email.rb

@@ -45,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
 
@@ -74,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/locales/es.yml

@@ -69,6 +69,7 @@ es:
       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

@@ -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,57 @@ 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:
+        )
       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/check_invalid_records.rb

@@ -0,0 +1,39 @@
+# :nocov:
+module PgEngine
+  module Utils
+    class CheckInvalidRecords
+      def run
+        invalids = []
+        classes.each do |klass|
+          klass.find_each do |record|
+            invalids << record unless record.valid?
+          end
+        end
+        invalids.map do |r|
+          [
+            (r.account.to_s if r.respond_to?(:account)),
+            r.class.to_s,
+            r.id,
+            r.errors.full_messages
+          ]
+        end
+      end
+
+      def classes
+        ActiveRecord::Base.descendants - ignored_classes
+      end
+
+      def ignored_classes
+        [
+          ActiveStorage::Record,
+          PgEngine::BaseRecord,
+          ActiveAdmin::Comment,
+          Audited::Audit,
+          ActiveStorage::Blob,
+          ApplicationRecord
+        ]
+      end
+    end
+  end
+end
+# :nocov: