pg_rails 7.0.8.pre.alpha.108 → 7.0.8.pre.alpha.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5174c715d280ab0c7e5581bd88d2e6cf7ee11507fc739f6369d959fc6d858acd
-  data.tar.gz: 87f88575ab82c80780fd12a5a65a7dc8c308d5aa828451cdd010121bf9ea8e00
+  metadata.gz: 0ea0a25a34ed115022c43283c50cd8678d9ebde034abbfcd65f149fa486d2004
+  data.tar.gz: 6ad0a841b8d2b3c73513c8890a7f2642598c78341ef1b79567a9e049b5cd8882
 SHA512:
-  metadata.gz: badbc2f74fe7d8b706e9cb2c38284dd92a99f43732fb8162449094ac3b9627d03a91245351e2eb7a1286acf50a82991584ae04ce777326eba975c43e3626d187
-  data.tar.gz: a2b4ad07bfe5398f89c76490caaa092253f0956d2d7762d6800d99d0bc483cdff7e22a528f3159f6277ab9fdad3b3922e181b29909c66e1a48dd1c922898c7be
+  metadata.gz: 7b24cbce39c6cce5ec0ed5d21dc45c61de0cb6986c40bcc04c5495ae2a5fa7cb12934a3609eec80d0008b860ed69a67c6f45df3969771907da4381258a26ac6f
+  data.tar.gz: e59deaa85466ff3e49dae7effe311fe77025b9bbdfc97c9667ce97f3ff48efdd20e6428d4e830993e895f0633b0144d6c6a73505a072f92f297972a2cd898b15

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

@@ -4,13 +4,32 @@ module Admin
 
     add_breadcrumb 'Eventos'
 
+    before_action do
+      @notifier_types = %w[
+        EmailUserNotifier
+        SimpleUserNotifier
+      ]
+    end
+
     def index
       @events = Noticed::Event.order(id: :desc)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def new
-      @event = Evento.new(type: SimpleUserNotifier.to_s)
+      @event = Evento.new(type: 'SimpleUserNotifier')
+      return if params[:event_id].blank?
+
+      reference = Noticed::Event.find(params[:event_id])
+      @event.type = reference.type
+      @event.message = reference.params[:message]
+      @event.message_text = reference.params[:message_text]
+      @event.tooltip = reference.params[:tooltip]
+      @event.subject = reference.params[:subject]
+      @event.record_type = reference.record_type
+      @event.record_id = reference.record_id
     end
+    # rubocop:enable Metrics/AbcSize
 
     # rubocop:disable Metrics/MethodLength
     def create # rubocop:disable Metrics/AbcSize
@@ -21,16 +40,22 @@ module Admin
         return
       end
       json_params_for_event = {
+        record: @event.record,
         message: @event.message,
-        tooltip: @event.tooltip
+        message_text: @event.message_text,
+        tooltip: @event.tooltip,
+        subject: @event.subject
       }
       notifier_class = @event.type.constantize
       notifier = notifier_class.with(json_params_for_event)
 
-      if @event.target == 'todos'
+      case @event.target
+      when 'todos'
         notifier.deliver(User.all)
-      elsif @event.target == 'devs'
+      when 'devs'
         notifier.deliver(User.where(developer: true))
+      when 'user_ids'
+        notifier.deliver(User.where(email: @event.user_ids.split(',')))
       else
         # :nocov:
         'shouldnt happen'
@@ -50,7 +75,8 @@ module Admin
 
     def event_params
       params.require(:evento).permit(
-        :type, :message, :tooltip, :record_type, :record_id, :target
+        :type, :message, :tooltip, :record_type, :record_id, :target, :subject,
+        :user_ids, :message_text
       )
     end
   end

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

@@ -92,6 +92,7 @@ module PgEngine
 
       if Current.user.present?
         @notifications = Current.user.notifications.order(id: :desc)
+                                .where(type: 'SimpleUserNotifier::Notification')
         unseen = @notifications.unseen.any?
         tooltip = @notifications.unseen.map(&:tooltip).first
         @notifications_bell = NotificationsBellComponent.new(

data/pg_engine/app/mailers/pg_engine/user_mailer.rb

@@ -0,0 +1,12 @@
+module PgEngine
+  class UserMailer < ApplicationMailer
+    # default delivery_method: :smtp
+
+    def notification
+      recipient = params[:notification].recipient
+      @html = params[:message].html_safe
+      @text = params[:message_text]
+      mail(to: recipient.email, subject: params[:subject])
+    end
+  end
+end

data/pg_engine/app/models/evento.rb

@@ -3,9 +3,25 @@ class Evento
   include ActionText::Attribute
   extend Enumerize
 
-  attr_accessor :tooltip, :target, :message, :type, :record_type, :record_id
+  attr_accessor :tooltip, :target, :message, :message_text, :type,
+                :record_type, :record_id,
+                :subject, :user_ids
 
   validates :target, :type, :message, presence: true
 
-  enumerize :target, in: { todos: 0, devs: 1 }
+  enumerize :target, in: { todos: 0, devs: 1, user_ids: 2 }
+
+  validates :message_text, :subject, presence: true, if: lambda {
+    type == 'EmailUserNotifier'
+  }
+
+  validates :user_ids, presence: true, if: lambda {
+    target == 'user_ids'
+  }
+
+  def record
+    return if record_id.blank?
+
+    record_type.constantize.find(record_id)
+  end
 end

data/pg_engine/app/notifiers/email_user_notifier.rb

@@ -0,0 +1,8 @@
+class EmailUserNotifier < ApplicationNotifier
+  deliver_by :email do |config|
+    config.mailer = 'PgEngine::UserMailer'
+    config.method = 'notification'
+  end
+
+  required_param :message, :subject
+end

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -1,13 +1,16 @@
 = pg_form_for @event, url: admin_eventos_path do |f|
   = f.mensajes_de_error
 
-  = f.input :type, as: :select, collection: ApplicationNotifier.descendants.map(&:to_s)
+  = f.input :type, as: :select, collection: @notifier_types
   - if params[:plain_text]
     = f.input :message, as: :text
   - else
     = f.rich_text_area :message
+  = f.input :message_text, as: :text
   = f.input :tooltip
+  = f.input :subject
   = f.input :record_type
   = f.input :record_id
   = f.input :target
+  = f.input :user_ids, label: 'User emails'
   = f.submit

data/pg_engine/app/views/pg_engine/user_mailer/notification.html.slim

@@ -0,0 +1 @@
+= @html

data/pg_engine/app/views/pg_engine/user_mailer/notification.text.slim

@@ -0,0 +1 @@
+= @text

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

@@ -17,7 +17,7 @@ describe PgEngine::Resource do
       instancia.set_clase_modelo
     end
 
-    fit do
+    it do
       expect { subject }.to raise_error(PgEngine::PageNotFoundError)
     end
   end

data/pg_engine/spec/requests/admin/eventos_spec.rb

@@ -9,6 +9,12 @@ describe 'Eventos' do
     SimpleUserNotifier.with(message: 'New post').deliver(User.all, enqueue_job: false)
   end
 
+  around do |example|
+    perform_enqueued_jobs do
+      example.run
+    end
+  end
+
   it 'renders the event index' do
     get '/a/eventos'
 
@@ -21,13 +27,25 @@ describe 'Eventos' do
       expect(response.body).to include 'Tooltip'
       post '/a/eventos', params: {
         evento: {
-          type: 'SimpleUserNotifier',
+          type:,
           message: 'hola',
+          message_text:,
+          subject: asunto,
+          user_ids:,
+          record_type: 'User',
+          record_id:,
           target:
         }
       }
+      get "/a/eventos/new?event_id=#{Noticed::Event.last.id}"
     end
 
+    let(:record_id) { nil }
+    let(:asunto) { nil }
+    let(:user_ids) { nil }
+    let(:message_text) { nil }
+    let(:type) { 'SimpleUserNotifier' }
+
     context 'cuando se manda a los devs' do
       let(:target) { 'devs' }
 
@@ -44,7 +62,36 @@ describe 'Eventos' do
       end
     end
 
+    context 'cuando se manda a usuarios específicos por mail' do
+      let(:target) { 'user_ids' }
+      let(:asunto) { 'subjecttt' }
+      let(:user_ids) { 'user@host.com,otro@test.com' }
+      let(:message_text) { 'texto' }
+      let(:message) { '<h1>html</h1>' }
+      let(:type) { 'EmailUserNotifier' }
+      let(:record_id) { user.id }
+
+      before do
+        create :user, email: 'user@host.com'
+        create :user, email: 'otro@test.com'
+      end
+
+      it do
+        expect { subject }.to change(Noticed::Notification, :count).by(2)
+      end
+    end
+
     context 'cuando hay error' do
+      subject do
+        post '/a/eventos', params: {
+          evento: {
+            type:,
+            message: 'hola',
+            target:
+          }
+        }
+      end
+
       let(:target) { 'bla' }
 
       it do

data/pg_layout/app/views/layouts/pg_layout/mailer.text.erb

@@ -0,0 +1,7 @@
+<%= yield %>
+
+<% if @footer_href.present? %>
+----------------------
+<%= @footer_image_alt %>
+<%= @footer_href %>
+<% end %>

data/pg_rails/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.108
+  version: 7.0.8.pre.alpha.109
 platform: ruby
 authors:
 - Martín Rosso
@@ -1033,6 +1033,7 @@ files:
 - pg_engine/app/lib/pg_form_builder.rb
 - pg_engine/app/mailers/pg_engine/admin_mailer.rb
 - pg_engine/app/mailers/pg_engine/base_mailer.rb
+- pg_engine/app/mailers/pg_engine/user_mailer.rb
 - pg_engine/app/models/account.rb
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
@@ -1043,6 +1044,7 @@ files:
 - pg_engine/app/models/user.rb
 - pg_engine/app/models/user_account.rb
 - pg_engine/app/notifiers/application_notifier.rb
+- pg_engine/app/notifiers/email_user_notifier.rb
 - pg_engine/app/notifiers/simple_user_notifier.rb
 - pg_engine/app/overrides/activestorage_direct_uploads.rb
 - pg_engine/app/policies/account_policy.rb
@@ -1083,6 +1085,8 @@ files:
 - pg_engine/app/views/pg_engine/base/edit.html.slim
 - pg_engine/app/views/pg_engine/base/index.html.slim
 - pg_engine/app/views/pg_engine/base/new.html.slim
+- pg_engine/app/views/pg_engine/user_mailer/notification.html.slim
+- pg_engine/app/views/pg_engine/user_mailer/notification.text.slim
 - pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim
 - pg_engine/app/views/public/mensaje_contactos/new.html.slim
 - pg_engine/config/initializers/action_mailer.rb
@@ -1233,7 +1237,7 @@ files:
 - pg_layout/app/views/layouts/pg_layout/containerized.html.slim
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.html.slim
-- pg_layout/app/views/layouts/pg_layout/mailer.text.slim
+- pg_layout/app/views/layouts/pg_layout/mailer.text.erb
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb

data/pg_layout/app/views/layouts/pg_layout/mailer.text.slim

@@ -1,4 +0,0 @@
-= yield
-
-| PgRails
-| https://example.com.ar