effective_memberships 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 813c2bf0f2491dd88f28e0deb9b66353c5fce7e08bbd60facdcadc4df29f3c63
-  data.tar.gz: e856e0600b5e5943565509c20ad06e7a1da807546169b1058b9d5e7b784e3fb2
+  metadata.gz: 90078c67d46aca1f293b49ffacac17288bb24592a4007079e6843847845a4e48
+  data.tar.gz: 0063d4f68e0c2ff073c06eb62812006d13f050b50eecbc10163aa80f0a862a04
 SHA512:
-  metadata.gz: 0a54c8464c3547b7040f987e06abaca0100c31d5ccd8e976c68fc432dce308ec555b3050cf618f58ac3d54e8fefa743cee91eb8134c400be05cc13a628d08603
-  data.tar.gz: 6e8363b016b80e3dfd3e9930586cb8bd57f957dcf0d11d0687b5f049445fb2c0964615a027f12fdb60982f7ab63318d4740b7d61a8ba6c692307a1b65baf9405
+  metadata.gz: 01b87e4c9a1aa5664e5bb0fb14ca95a3fac57ea8f2ca0542e379e7e11a1d0450c7aef6fcd4b8d29ab3312e6db33e4a3729b60301b54870e0d7abe20f144df93b
+  data.tar.gz: e71ea11d0e5d126f4e37474726a234440f6e2105131a57fd1a6427c9c2ab897884f3502df0f2150a89318748b494d156a1e11d3fd81334aab8d9c19d9c2ef533

data/app/datatables/admin/effective_fees_datatable.rb

@@ -42,6 +42,9 @@ module Admin
 
       col :checkout_type, search: Effective::Fee::CHECKOUT_TYPES, visible: false
 
+      col :late_on, visible: false
+      col :not_in_good_standing_on, visible: false
+
       unless attributes[:total] == false
         aggregate :total
       end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -607,7 +607,7 @@ module EffectiveMembershipsApplicant
   def can_apply_applicant_types_collection
     if owner.blank?
       ['Apply to Join']
-    elsif owner.membership_removed?
+    elsif owner.membership_removed? && owner.reinstatement_membership_history.present?
       ['Apply for Reinstatement', 'Apply to Join']
     elsif owner.membership.blank? || owner.membership.categories.blank?
       ['Apply to Join']

data/app/models/concerns/effective_memberships_owner.rb

@@ -144,11 +144,11 @@ module EffectiveMembershipsOwner
   end
 
   def reinstatement_membership_category
-    reinstatement_membership_history.membership_categories.first if membership_removed?
+    reinstatement_membership_history&.membership_categories&.first
   end
 
   def reinstatement_membership_statuses
-    reinstatement_membership_history.membership_statuses if membership_removed?
+    reinstatement_membership_history&.membership_statuses
   end
 
   def registrar_action_categories(action)
@@ -333,6 +333,25 @@ module EffectiveMembershipsOwner
     save!
   end
 
+  # Delete the last membership history
+  def rollback_membership_history!
+    raise('expected membership to be present') unless membership.present?
+
+    (history, last) = membership_histories.last(2)
+    raise('expected 2 or more membership histories') unless history.present? && last.present?
+
+    last.mark_for_destruction
+    history.assign_attributes(end_on: nil)
+
+    membership.assign_attributes(
+      number: history.number,
+      categories: history.membership_categories,
+      statuses: history.membership_statuses
+    )
+
+    save!
+  end
+
   def build_membership_history(start_on: nil, notes: nil)
     raise('expected membership to be present') unless membership.present?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -76,27 +76,8 @@ module EffectiveMembershipsRegistrar
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
-    # Delete any removed statuses
-    membership.membership_statuses.each do |membership_status|
-      next if statuses.include?(membership_status.status)
-      membership_status.mark_for_destruction
-    end
-
-    # Build any additional statuses
-    statuses.each do |status|
-      membership.build_membership_status(status: status)
-    end
-
-    # Delete any removed categories
-    membership.membership_categories.each do |membership_category|
-      next if categories.include?(membership_category.category)
-      membership_category.mark_for_destruction
-    end
-
-    # Build any additional categories
-    categories.each do |category|
-      membership.build_membership_category(category: category)
-    end
+    # Builds the membership_categories and membership_statuses. Marks for destruction ones that don't exist.
+    membership.assign_attributes(statuses: statuses, categories: categories)
 
     changed = membership.membership_categories.any? { |mc| mc.new_record? || mc.marked_for_destruction? }
     changed ||= membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }

data/app/models/effective/membership.rb

@@ -156,6 +156,21 @@ module Effective
       membership_categories.reject(&:marked_for_destruction?).map(&:category_id)
     end
 
+    def categories=(categories)
+      categories = Array(categories)
+      raise('expecting a membership category') if categories.any? { |cat| !cat.class.respond_to?(:effective_memberships_category?) }
+
+      # Delete any removed categories
+      membership_categories.each do |membership_category|
+        membership_category.mark_for_destruction unless categories.include?(membership_category.category)
+      end
+
+      # Build any additional categories
+      categories.each { |category| build_membership_category(category: category) }
+
+      nil
+    end
+
     # We might want to use singular memberships.
     def category
       raise('expected singular usage but there are more than one membership category') if categories.length > 1
@@ -192,6 +207,21 @@ module Effective
       membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
     end
 
+    def statuses=(statuses)
+      statuses = Array(statuses)
+      raise('expecting a membership category') if statuses.any? { |status| !status.class.respond_to?(:effective_memberships_status?) }
+
+      # Delete any removed statuses
+      membership_statuses.each do |membership_status|
+        membership_status.mark_for_destruction unless statuses.include?(membership_status.status)
+      end
+
+      # Build any additional statuses
+      statuses.each { |status| build_membership_status(status: status) }
+
+      nil
+    end
+
     def statuses_sentence
       statuses.map(&:to_s).to_sentence.presence || 'None'
     end

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

@@ -35,6 +35,8 @@
 
 - if current_user.membership_removed?
   %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
+
+- if current_user.reinstatement_membership_history.present?
   %p You may Apply for Reinstatement to #{current_user.reinstatement_membership_category} by clicking the Apply to Join button below and then complete the wizard.
 
 - if membership_organizations.present?

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.14'
+  VERSION = '0.9.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails