effective_messaging 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5586319e69df10977387b8dde4f21c28b6c091ba2d013c0aa92356c5d64612
-  data.tar.gz: 30780a50e3482bf8f66492f9b965f3dba832c2ccfd237753517214536484bc6c
+  metadata.gz: 8d1af8fb6d222cf7dc1f2ad5c9baaf139607cef5f724879fd3bc037107d56b4d
+  data.tar.gz: f6315751785d8760aee7adb5593826f6b4ed80639ec1d0f54d1ee95f85462828
 SHA512:
-  metadata.gz: 984b176a01cb8fb1e6935975f20fba184e0c4af16783faef38c6372dc76b85a9735b0b8d87723564026a22add1426c1a78b2c0d14c25f906d4b76470119a612e
-  data.tar.gz: 159df93437962685676e463ad350f91326de8d87efd440027b1da1e8f1b6061552a8d1bf307cdc8ba9fedc9faaf87574754421a2d3794a63410f7caf5518a27d
+  metadata.gz: 657cc27116ca125f8102c2bc4ee1331d9359e673e7b9dc4647509541c217f4ad79c2a11e4dd4014ec0aff7f0b8fab9be45de9a104a8738f2a87d3d16d73dcf64
+  data.tar.gz: 5c0de10cdbbf454298c7033f39ed5ca08cfffb51c1f54cd6ee65f5d23872b08fd93267e1f5281eecbc6205493d99e48d04b9c3f47109c4cf178c6d1d6e75723d

data/app/datatables/admin/effective_notification_logs_datatable.rb

@@ -9,7 +9,7 @@ module Admin
       col :notification
       col :report, visible: !attributes[:inline]
       col :resource, search: :string
-      col :user, search: :string
+      col :user, label: 'Source', search: :string
       col :email
       col :skipped
 

data/app/models/effective/notification.rb

@@ -134,7 +134,7 @@ module Effective
     validates :report, presence: true
 
     validate(if: -> { report.present? }) do
-      errors.add(:report, 'must include an email or user column') unless report.email_report_column || report.user_report_column
+      errors.add(:report, 'must include an email, user, organization or owner column') unless report.email_report_column || report.emailable_report_column
     end
 
     validate(if: -> { report.present? && subject.present? }) do
@@ -347,7 +347,7 @@ module Effective
     end
 
     def already_notified_today?(resource)
-      email = resource_email(resource) || resource_user(resource).try(:email)
+      email = resource_emails_to_s(resource)
       raise("expected an email for #{report} #{report&.id} and #{resource} #{resource&.id}") unless email.present?
 
       logs = notification_logs.select { |log| log.email == email }
@@ -362,7 +362,7 @@ module Effective
     def notifiable_immediate?(resource:, date: nil)
       raise('expected an immediate? notification') unless immediate?
 
-      email = resource_email(resource) || resource_user(resource).try(:email)
+      email = resource_emails_to_s(resource)
       raise("expected an email for #{report} #{report&.id} and #{resource} #{resource&.id}") unless email.present?
 
       logs = notification_logs.select { |log| log.email == email }
@@ -394,12 +394,7 @@ module Effective
     def render_email(resource = nil)
       raise('expected an acts_as_reportable resource') if resource.present? && !resource.class.try(:acts_as_reportable?)
 
-      to = if audience == 'emails'
-        audience_emails.presence
-      elsif audience == 'report'
-        resource_email(resource) || resource_user(resource).try(:email)
-      end
-
+      to = (audience == 'emails' ? audience_emails.presence : resource_emails_to_s(resource))
       raise('expected a to email address') unless to.present?
 
       assigns = assigns_for(resource)
@@ -437,12 +432,12 @@ module Effective
     end
 
     def build_notification_log(resource: nil, skipped: false)
-      user = resource_user(resource)
+      emailable = resource_emailable(resource)
 
-      email = resource_email(resource) || user.try(:email)
+      email = resource_emails_to_s(resource)
       email ||= audience_emails_to_s if scheduled_email?
 
-      notification_logs.build(email: email, report: report, resource: resource, user: user, skipped: skipped)
+      notification_logs.build(email: email, report: report, resource: resource, user: emailable, skipped: skipped)
     end
 
     private
@@ -456,18 +451,31 @@ module Effective
     end
 
     def audience_emails_to_s
-      audience_emails.presence&.join(',')
+      audience_emails.presence&.join(', ')
+    end
+
+    # All emails for this emailable resource
+    def resource_emails_to_s(resource)
+      emails = Array(resource_email(resource)).map(&:presence).compact
+
+      if emails.blank? && (emailable = resource_emailable(resource)).present?
+        emails = Array(emailable.try(:reportable_emails) || emailable.try(:email)).map(&:presence).compact
+      end
+
+      emails.presence&.join(', ')
     end
 
-    def resource_user(resource)
+    # A user, owner, or organization column
+    def resource_emailable(resource)
       return unless resource.present?
 
-      column = report&.user_report_column
+      column = report&.emailable_report_column
       return unless column.present?
 
       resource.public_send(column.name) || (resource if resource.respond_to?(:email))
     end
 
+    # An email column
     def resource_email(resource)
       return unless resource.present?
 

data/app/models/effective/notification_log.rb

@@ -20,7 +20,7 @@ module Effective
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:notification, :report, :resource, :user) }
 
-    validates :email, presence: true, email: true
+    validates :email, presence: true
 
     def to_s
       model_name.human

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails