effective_postmark 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c865f268155269e90bfab82beaca405a2adfed8b20c7156214f5b95574986c3
-  data.tar.gz: 183783ce5068b9b1abfdba98551d1a812a070f414a56f0fe787826a0855dd680
+  metadata.gz: c54904eee89796343bceb312989b4ac5396eaafbd300e60aac6d5f9574421494
+  data.tar.gz: 76956ccf6a60141ab891c5cd8f1959fb240b84de12d102d970425628dc3806b1
 SHA512:
-  metadata.gz: d927becf5cb36887f8a3093975e6b5cf543d9fe34d73fa11900372ec9807d484a5b40ae7e7d7e5ed30fb3e01f702f765b582a038526d8151309e965c674694db
-  data.tar.gz: bf2041254c685af6d7c2dbe5f64c2ba3ecf9ae62a5fbee7dd0fafe319992361a8842fbe2a19b2f2cf746d1691050f1b5feaaca92ec75ac1f036a9617575b7d65
+  metadata.gz: 9b4a3721507412cee63854db7f40b266dc74d3e8624f9f8372dfb3f6f26f76cb2413507c9bf537ba4edb244124520d381e677175fc3b477ade6ad882a103aa2a
+  data.tar.gz: 0bb3550864a845eac196ac9c26cb6755a4c8ba347210a1882bbb28945ffde11e5a2b615ae2b9851ef9406b74a254edd59ece41c5fa40bd8ca96f6b8291114173

data/app/mailers/concerns/effective_postmark_mailer.rb

@@ -9,7 +9,7 @@ module EffectivePostmarkMailer
       end
     end
 
-    rescue_from(::StandardError, with: :effective_postmark_error) unless Rails.env.test? || Rails.env.development?
+    #rescue_from(::StandardError, with: :effective_postmark_error)
     rescue_from(::Postmark::InactiveRecipientError, with: :effective_postmark_inactive_recipient_error)
   end
 
@@ -59,6 +59,11 @@ module EffectivePostmarkMailer
     Rails.logger.info "\e[31m\e[1mEMAIL FAILED\e[0m\e[22m" # bold red
     Rails.logger.info "#{exception.inspect}"
 
+    EffectiveLogger.error(exception.message) if defined?(EffectiveLogger)
+    ExceptionNotifier.notify_exception(exception) if defined?(ExceptionNotifier)
+
+    raise(exception) if Rails.env.test? || Rails.env.development?
+
     true
   end
 

data/app/models/concerns/effective_postmark_user.rb

@@ -38,6 +38,15 @@ module EffectivePostmarkUser
     update_columns(email_delivery_error: 'Inactive Recipient', email_delivery_error_at: Time.zone.now)
   end
 
+  # Assigned by the rake task effective_postmark:assign_email_delivery_errors
+  def postmark_suppression!(reason:, date:)
+    return if email_delivery_error.present? # If we already marked invalid, don't mark again
+
+    date = (Time.zone.parse(date) rescue Time.zone.now) if date.kind_of?(String)
+
+    update_columns(email_delivery_error: reason, email_delivery_error_at: date)
+  end
+
   # Triggered by an admin to reactivate the email address
   def postmark_reactivate!
     # Make an API request to reactivate this user

data/app/models/effective/postmark_api.rb

@@ -9,6 +9,38 @@ module Effective
       @client = ::Postmark::ApiClient.new(api_token)
     end
 
+    # [ "outbound", "broadcast-stream" ]
+    def streams()
+      @streams ||= begin
+        client.get_message_streams
+          .select { |stream| ['Broadcasts', 'Transactional'].include?(stream[:message_stream_type]) }
+          .map { |stream| stream[:id] }
+      end
+    end
+
+    def suppressions()
+      streams()
+        .flat_map { |stream| client.dump_suppressions(stream) }
+        .uniq { |suppression| suppression[:email_address] }
+    end
+
+    # Called by rake effective_postmark:assign_email_delivery_errors
+    def assign_email_delivery_errors!(users)
+      raise('expected an effective_postmark_user klass') unless users.try(:effective_postmark_user?)
+
+      suppressions().each do |suppression|
+        email = suppression[:email_address].to_s.downcase.strip
+        next unless email.present?
+
+        user = users.find_for_database_authentication(email: email)
+        next unless user.present?
+
+        user.postmark_suppression!(reason: suppression[:suppression_reason], date: suppression[:created_at])
+      end
+
+      true
+    end
+
     # EffectivePostmark.api.reactivate(email)
     def reactivate(user)
       raise('expected an effective_postmark_user') unless user.class.try(:effective_postmark_user?)
@@ -18,8 +50,7 @@ module Effective
 
       # There are multiple streams. outbound / broadcast / inbound
       begin
-        client.delete_suppressions(:outbound, emails)
-        client.delete_suppressions(:broadcast, emails)
+        streams().each { |stream| client.delete_suppressions(stream, emails) }
         true
       rescue => e
         false

data/lib/effective_postmark/version.rb

@@ -1,3 +1,3 @@
 module EffectivePostmark
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/effective_postmark.rb

@@ -18,6 +18,10 @@ module EffectivePostmark
     Effective::PostmarkApi.new(api_token: api_token)
   end
 
+  def self.api_present?
+    api_token.present?
+  end
+
   def self.mailer_class
     mailer&.constantize || Effective::PostmarkMailer
   end

data/lib/tasks/effective_postmark_tasks.rake

@@ -1,2 +1,25 @@
 namespace :effective_postmark do
+  desc 'Assign email delivery errors to postmark users from suppressions API'
+  task assign_email_delivery_errors: :environment do
+    table = ActiveRecord::Base.connection.table_exists?(:users)
+    blank_tenant = defined?(Tenant) && Tenant.current.blank?
+
+    if table && !blank_tenant && EffectivePostmark.api_present?
+      puts "Assigning postmark email delivery errors"
+
+      klass = User.all
+      raise("expected an effective_postmark_user User class") unless klass.try(:effective_postmark_user?)
+
+      api = EffectivePostmark.api
+
+      begin
+        api.assign_email_delivery_errors!(klass)
+      rescue StandardError => e
+        ExceptionNotifier.notify_exception(e) if defined?(ExceptionNotifier)
+        puts "Error with effective_postmark:assign_email_delivery_errors"
+      end
+    end
+
+    puts 'All done'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_postmark
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails