effective_mailchimp 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9d96445bf95082e5171bc0926653d0b05721fa92851615f982dc59b5c9e530
-  data.tar.gz: e163f4cda78afbbbadc2dbf23a91ee087098d0a49c3fdfeb90d1f81fe4c1c108
+  metadata.gz: f2fad1ea962c5ce92c425a1a7f298f2e3a55893ed243cf5ebfeba361f1453158
+  data.tar.gz: b846cabc690f49d38314448c147e837f16934bc99a5240fca2d6b8bd2c977d73
 SHA512:
-  metadata.gz: 4831da7064dc4f21da2974bd0d832931672d2130b768aa2e33294b2dc3a784f968a3db3328da3b2ae9239eed4f261559f28f17c25ef1f8d8091a641529d82eac
-  data.tar.gz: b8cf3d3377c1c8bf5152d59f677eb3a0bfaf3e081587163edddb6f4cf5573479ba5d30c53076ec2f5a1474adefbcfb9063c58ec9fb444703b044f8afa4dd02f5
+  metadata.gz: e1e34ee35a3061e812dc7dbb8140c9712cd0836eae94b074e4f2a3fb2bd5eb442652786c2096a96cc8d0e8de0e74ea980cc5e01182b384787690091004c35f60
+  data.tar.gz: 22d4b527af3de708c92c6d0b784b6092bc11e2e9d5e0c95cb6b010f415501d6171e2415124b2c0214c163937218035764e53d38725d4d2b61605879bde1c8947

data/app/models/concerns/effective_mailchimp_user.rb

@@ -33,7 +33,7 @@ module EffectiveMailchimpUser
 
     # A new user is created
     after_commit(on: [:create], if: -> { EffectiveMailchimp.api_present? }, unless: -> { EffectiveMailchimp.supressed? || @mailchimp_member_update_enqueued }) do
-      mailchimp_subscribe_to_force_subscribe!
+      mailchimp_subscribe_all!
     end
 
     # The user updated the form
@@ -270,12 +270,31 @@ module EffectiveMailchimpUser
     without_mailchimp_update_async { save! }
   end
 
+  # No longer used. We use mailchimp_subscribe_all! instead
   # Subscribe to force_subscribe lists
-  def mailchimp_subscribe_to_force_subscribe!
-    mailchimp_lists = Effective::MailchimpList.where(force_subscribe: true).to_a
+  # def mailchimp_subscribe_to_force_subscribe!
+  #   mailchimp_lists = Effective::MailchimpList.where(force_subscribe: true).to_a
+  #   return unless mailchimp_lists.present?
+
+  #   mailchimp_subscribe!(mailchimp_lists)
+  # end
+
+  def mailchimp_subscribe_all!
+    mailchimp_lists = Effective::MailchimpList.subscribable.sorted.all.to_a
     return unless mailchimp_lists.present?
 
-    mailchimp_subscribe!(mailchimp_lists)
+    mailchimp_lists.each do |mailchimp_list|
+      member = build_mailchimp_list_member(mailchimp_list: mailchimp_list)
+      member.assign_attributes(subscribed: true)
+
+      mailchimp_list.mailchimp_categories.each do |mailchimp_category|
+        mailchimp_interests = mailchimp_category.mailchimp_interests
+        mailchimp_interests.each { |mailchimp_interest| member.build_interests(mailchimp_interest) }
+      end
+    end
+
+    # This sets up the after_commit to run the mailchimp_update! job
+    save!
   end
 
   def without_mailchimp_update_async(&block)

data/app/models/effective/mailchimp_category.rb

@@ -3,7 +3,7 @@ module Effective
     self.table_name = (EffectiveMailchimp.mailchimp_categories_table_name || :mailchimp_categories).to_s
 
     belongs_to :mailchimp_list
-    has_many :mailchimp_interests
+    has_many :mailchimp_interests, -> { Effective::MailchimpInterest.sorted }, class_name: 'Effective::MailchimpInterest', inverse_of: :mailchimp_category
 
     effective_resource do
       mailchimp_id      :string     # ID of this Mailchimp InterestCategory

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.12.1'.freeze
+  VERSION = '0.12.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2025-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails