effective_mailchimp 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214e9412954d0415e5263797289e58956f53b56828715aaf390e7c9d7db09f61
-  data.tar.gz: 6a029f0bb604421755c58cfa5f988d581cc688f990de102901f2e5938a643980
+  metadata.gz: aeb420fedb9cb1cd9ef0454773d4daf4e1b738e472ad5154226bb3ba299f7010
+  data.tar.gz: 35faa4bdbd56036558bf3ebf5c3bce35a8eb37eb3eab17b123449fc56f60dd16
 SHA512:
-  metadata.gz: 8e6b26604ad0d1c0e094706da41be5280f757073747a2203de09854990562f0a947022f3e05223c1e38bca818c77840d320a589d3bd1968f624a1dfd26b9e911
-  data.tar.gz: 18513f661502df66716ddf9b293ae05fd1b5d14c6e2ff68678172b3b3d4d90b606238dfe98979f38cf85fefa8562e92e8fa0dbc9b85e1ce2dd08ce247ca8100d
+  metadata.gz: 6c888569b99ed7d9474706235698af874c54edca6a3b13a53e449f0a03ca9d2e64099b642b640959ad5100b5964ef06f873739c853f6e11daeb05a33b99ef93f
+  data.tar.gz: f50fc3d24091a2f58a2361b015e4329c21be5846081f9d660b9e6c00c017171952324a3e7f37c56b00f49b012e80ea97a1127f5ae7c26bd51c64d6cf7f6534e8

data/app/models/concerns/effective_mailchimp_user.rb

@@ -29,6 +29,10 @@ module EffectiveMailchimpUser
     has_many :mailchimp_lists, -> { Effective::MailchimpList.sorted }, through: :mailchimp_list_members, class_name: 'Effective::MailchimpList'
     accepts_nested_attributes_for :mailchimp_lists, allow_destroy: true
 
+    scope :deep_effective_mailchimp_user, -> { 
+      includes(mailchimp_list_members: [:mailchimp_list])
+    }
+
     # The user updated the form
     after_commit(if: -> { mailchimp_member_update_required? }) do
       EffectiveMailchimpUpdateJob.perform_later(self)
@@ -184,12 +188,20 @@ module EffectiveMailchimpUser
     assign_attributes(mailchimp_user_form_action: nil)
 
     mailchimp_list_members.each do |member|
-      if member.mailchimp_id.blank? && member.subscribed?
-        list_member = api.list_member_add(member)
-        member.assign_mailchimp_attributes(list_member) if list_member.present?
-      elsif member.mailchimp_id.present?
-        list_member = api.list_member_update(member)
+      begin
+        list_member = if member.mailchimp_id.blank? && member.subscribed?
+          api.list_member_add(member)
+        elsif member.mailchimp_id.present?
+          api.list_member_update(member)
+        end
+
         member.assign_mailchimp_attributes(list_member) if list_member.present?
+      rescue MailchimpMarketing::ApiError => e
+        if e.to_s.downcase.include?("cannot be subscribed")
+          member.assign_mailchimp_cannot_be_subscribed
+        else
+          raise(e)
+        end
       end
     end
 

data/app/models/effective/mailchimp_api.rb

@@ -94,13 +94,7 @@ module Effective
         merge_fields: merge_fields.delete_if { |k, v| v.blank? }
       }
 
-      begin
-        client.lists.add_list_member(member.mailchimp_list.mailchimp_id, payload)
-      rescue MailchimpMarketing::ApiError => e
-        return false if e.status == 400 && e.to_s.downcase.include?("member in compliance state")
-        raise(e)
-      end
-
+      client.lists.add_list_member(member.mailchimp_list.mailchimp_id, payload)
     end
 
     def list_member_update(member)

data/app/models/effective/mailchimp_list_member.rb

@@ -14,7 +14,12 @@ module Effective
       email_address   :string
       full_name       :string
 
-      subscribed      :boolean
+      # We set this on our side to update mailchimp and subscribe the user
+      subscribed              :boolean
+
+      # This one is generated by the MailchimpMarketing::ApiError
+      # They unsubscribed and there's nothing we can do about it.
+      cannot_be_subscribed    :boolean # Member is in Compliance State
 
       last_synced_at  :datetime
 
@@ -45,6 +50,14 @@ module Effective
       )
     end
 
+    def assign_mailchimp_cannot_be_subscribed
+      assign_attributes(
+        subscribed: false,
+        cannot_be_subscribed: true,
+        last_synced_at: Time.zone.now
+      )
+    end
+
     def synced?
       last_synced_at.present?
     end

data/app/views/effective/mailchimp_user/_fields.html.haml

@@ -9,8 +9,11 @@
 
   - if mailchimp_list.force_subscribe?
     %p
-      = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
-      = fmlm.hidden_field :subscribed, value: true
+      - if fmlm.object.cannot_be_subscribed?
+        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required but unsubscribed', checked: false
+      - else
+        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
+        = fmlm.hidden_field :subscribed, value: true
 
   - elsif mailchimp_list.can_subscribe?
     %p

data/db/migrate/101_create_effective_mailchimp.rb

@@ -23,7 +23,8 @@ class CreateEffectiveMailchimp < ActiveRecord::Migration[6.0]
       t.string :email_address
       t.string :full_name
 
-      t.boolean :subscribed
+      t.boolean :subscribed, default: false
+      t.boolean :cannot_be_subscribed, default: false
 
       t.datetime :last_synced_at
 

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Subscribe and unsubscribe to mailchimp lists.