effective_messaging 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36f8cc8cf0b957ff2cd66b902bb3e99cf13673d70da3a086bf837e7b424a6dd
-  data.tar.gz: 83a47842b7805daa82768dd1457c516b2bdcebd14adbac0000c09f3f4c3af9c7
+  metadata.gz: 78e95fc092d81efe4f4ff0db0c4d571ec86b7938400dcc7f378963f9e288aeb4
+  data.tar.gz: b206a600a6fc26b75fdba1a26c86754e1ceb66d4be50f0d80b07aa158afec313
 SHA512:
-  metadata.gz: 0465d662b13537968d2b36fb6634c308321853290be44ad4763ee5c350fc633a9c45eca56f8f201fb160dcea44b32662ee0d5019dedf7e4511d3c76d82615612
-  data.tar.gz: de0aee24647a2068e4d8e37f6c72d9e8f90697eb7616d808b174ada792b5e1a12e32bcf7bec2eab52e177187168b86822d752a5554fb6b04f8f0186876ede8dd
+  metadata.gz: 85de886b3e80411543f91188ebaa4de3f750a020f61513e81c82f8ef26e5ea8a792cbabd512ef821e13f34374fd30639a1e97d11f1ec00583d952339e8a336b3
+  data.tar.gz: 37f925c590a863999c61bd24008d96423d73a0aa9e2b10d3a914329e07c84589ece96b3aaba013557886d308895fbe544926c9941b951106018384de0197f17c

data/app/datatables/effective_chats_datatable.rb

@@ -15,7 +15,13 @@ class EffectiveChatsDatatable < Effective::Datatable
   end
 
   collection do
-    Effective::Chat.deep.where(id: current_user.chats)
+    chats = Effective::Chat.deep.where(id: current_user.chats)
+
+    if attributes[:year].present?
+      chats = chats.where('created_at >= ?', Time.zone.local(attributes[:year]))
+    end
+
+    chats
   end
 
 end

data/app/models/effective/notification.rb

@@ -278,16 +278,28 @@ module Effective
 
       report.collection().find_each do |resource|
         next unless notifiable?(resource) || force
+
+        # Send Now functionality. Don't duplicate if it's same day.
+        next if force && already_notified_today?(resource)
+
         print('.')
 
-        # For logging
-        assign_attributes(current_resource: resource)
+        begin
+          # For logging
+          assign_attributes(current_resource: resource)
 
-        # Send the resource email
-        build_notification_log(resource: resource).save!
-        Effective::NotificationsMailer.notify_resource(self, resource).deliver_now
+          # Send the resource email
+          Effective::NotificationsMailer.notify_resource(self, resource).deliver_now
 
-        notified += 1
+          # Log that it was sent
+          build_notification_log(resource: resource).save!
+
+          # Count how many we actually sent
+          notified += 1
+        rescue => e
+          EffectiveLogger.error(e.message, associated: self) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { notification_id: id, resource_id: resource.id, resource_type: resource.class.name }) if defined?(ExceptionNotifier)
+        end
 
         GC.start if (notified % 250) == 0
       end
@@ -299,9 +311,19 @@ module Effective
       notified = 0
 
       if notifiable_scheduled? || force
-        build_notification_log(resource: nil).save!
-        Effective::NotificationsMailer.notify(self).deliver_now
-        notified += 1
+        begin
+          Effective::NotificationsMailer.notify(self).deliver_now
+
+          # Log that it was sent
+          build_notification_log(resource: nil).save!
+
+          # Count how many we actually sent
+          notified += 1
+        rescue => e
+          EffectiveLogger.error(e.message, associated: self) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { notification_id: id }) if defined?(ExceptionNotifier)
+        end
+
       end
 
       notified > 0 ? update!(last_notified_at: Time.zone.now, last_notified_count: notified) : touch
@@ -324,6 +346,17 @@ module Effective
       notifiable?(resource, date: date)
     end
 
+    def already_notified_today?(resource)
+      email = resource_email(resource) || resource_user(resource).try(:email)
+      raise("expected an email for #{report} #{report&.id} and #{resource} #{resource&.id}") unless email.present?
+
+      logs = notification_logs.select { |log| log.email == email }
+      return false if logs.count == 0
+
+      # If we already notified today
+      logs.any? { |log| log.created_at&.beginning_of_day == Time.zone.now.beginning_of_day }
+    end
+
     # Consider the notification logs which track how many and how long ago this notification was sent
     # It's notifiable? when first time or if it's been immediate_days since last notification
     def notifiable_immediate?(resource:, date: nil)

data/app/views/effective/messaging/_dashboard.html.haml

@@ -1,10 +1,9 @@
 %h2= t('effective_messaging.dashboard')
 
-- if current_user.chats.present?
-  %p You are a #{etd(Effective::ChatUser)} of #{pluralize(current_user.chats.length, etd(Effective::Chat))}.
+- datatable = EffectiveResources.best('EffectiveChatsDatatable').new(self, namespace: :effective)
 
-  - datatable = EffectiveResources.best('EffectiveChatsDatatable').new(self, namespace: :effective)
+- if datatable.present?
+  %p You are a #{etd(Effective::ChatUser)} of #{pluralize(datatable.collection.length, etd(Effective::Chat))}.
   = render_datatable(datatable, simple: true)
-
 - else
   %p You haven't received any #{etsd(Effective::ChatMessage)}. When you do, we'll show it here.

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails