effective_memberships 0.6.4 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4247d703d9b732691ae59a81c10d8713603ec2b43fc6f206ae7594c9a4145c
-  data.tar.gz: 36764403e8da32f0666e88689d263e34e5c67161e2f130cdd53ba8569e7f95e1
+  metadata.gz: 994cc88bc7e75f8660b8af1a9930175493759241323675edc72da9ab53640ab5
+  data.tar.gz: e29658115f728da1b3b33f5776fc24e461f6abe5ac9cb8d1362834153598a96e
 SHA512:
-  metadata.gz: 37404019ffba0de0a2284b412e7d9c97c9bdbcf664cb2ccda104f8227c14b941025cc493af431a206443296352f625a685fd1425ba12f2988ad1f673e5cad5b0
-  data.tar.gz: 1bdd05c77546a13276c94f7c5c0688749b5d198f232cac214a051bf18e2cab28fe08cead0395d5c6bae823c93abd373f0ed751edcaa4db634501bbb4aa020294
+  metadata.gz: 9b2a8938998de7838aef913e2e4f2262a0cde28fc04de5fb0d74816a1ff9ddc23db3000985aceca51b4578339553c9be2c39b0ca0df11c6bbecd7a620101e17f
+  data.tar.gz: 95f6268d44cc10e4dabe9c4208f5d42ae669533f31876643aa2b31749414dc5cbf68e8368c062c5997cc61261579e6bec5decfb446020c5497fe74cc02a29640

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,16 +14,16 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       redirect: -> { admin_owners_path(resource) }
 
-    submit :status_change, 'Change Status',
-      success: -> { "#{resource.owner} has been status changed to #{resource.owner.membership.status || 'None'}" },
+    submit :status_assign, 'Assign Status',
+      success: -> { "#{resource.owner} has been assigned #{resource.owner.membership.statuses_sentence}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :status_remove, 'Remove Status',
-      success: -> { "#{resource.owner} has had their status removed" },
+      success: -> { "#{resource.owner} has been removed from #{resource.status}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :assign, 'Assign',
-      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
+      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories_sentence}" },
       redirect: -> { admin_owners_path(resource) }
 
     submit :remove, 'Remove',

data/app/models/concerns/effective_memberships_applicant.rb

@@ -195,7 +195,7 @@ module EffectiveMembershipsApplicant
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
       self.applicant_type ||= can_apply_applicant_types_collection().first
       self.from_category = owner.membership&.category
-      self.from_status = owner.membership&.status
+      self.from_status = owner.membership&.status if reinstatement?
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -559,7 +559,7 @@ module EffectiveMembershipsApplicant
   def can_apply_applicant_types_collection
     if owner.blank? || owner.membership.blank? || owner.membership.categories.blank?
       ['Apply to Join']
-    elsif owner.membership.statuses.present?
+    elsif owner.membership.statuses.any?(&:reinstatable?)
       ['Apply for Reinstatement', 'Apply to Join']
     else
       ['Apply to Reclassify']

data/app/models/concerns/effective_memberships_registrar.rb

@@ -151,7 +151,7 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reclassify!(owner, to:, date: nil, skip_fees: false)
+  def reclassify!(owner, to:, status: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
@@ -159,6 +159,7 @@ module EffectiveMembershipsRegistrar
 
     raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
     raise('expecting a from memberships category') unless from.class.respond_to?(:effective_memberships_category?)
+    raise('expecting a memberships status') unless status.nil? || status.class.respond_to?(:effective_memberships_status?)
     raise('expected to and from to be different') if from == to
 
     date ||= Time.zone.now
@@ -171,6 +172,9 @@ module EffectiveMembershipsRegistrar
     membership.build_membership_category(category: to)
     membership.membership_category(category: from).mark_for_destruction
 
+    # Assign Status
+    membership.build_membership_status(status: status) if status.present?
+
     unless skip_fees
       fee = owner.build_prorated_fee(date: date)
       raise('already has purchased prorated fee') if fee.purchased?
@@ -202,37 +206,63 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  # This clears the status entirely from user
-  def status_remove!(owner, date: nil)
-    status_change!(owner, to: nil, date: date)
+  def status_clear!(owner, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+    raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
+
+    status_assign!(owner, date: date, status: [])
   end
 
-  # To can be nil to clear the status entirely
-  def status_change!(owner, to:, date: nil)
+  def status_add!(owner, status:, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    from = owner.membership.status
+    status_assign!(owner, date: date, status: owner.membership.statuses + Array(status))
+  end
 
-    raise('expecting a to memberships status') if to.present? && !to.class.respond_to?(:effective_memberships_status?)
-    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
-    raise('expected to and from to be different') if from == to
+  def status_remove!(owner, status:, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+    raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    date ||= Time.zone.now
+    status_assign!(owner, date: date, status: owner.membership.statuses - Array(status))
+  end
+
+  def status_assign!(owner, status:, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
     membership = owner.membership
+    raise('owner must have an existing membership. use register! instead') if membership.blank?
 
-    # Assign Status
-    membership.build_membership_status(status: to) if to.present?
-    membership.membership_status(status: from).mark_for_destruction if from.present?
+    statuses = Array(status)
+    raise('expected a memberships status') unless statuses.blank? || statuses.all? { |status| status.class.respond_to?(:effective_memberships_status?) }
 
-    # Save
-    save!(owner, date: date)
+    # Add
+    statuses.each do |status|
+      next if membership.membership_status(status: status).present?
+      membership.build_membership_status(status: status)
+    end
+
+    # Remove
+    membership.statuses.each do |existing|
+      next if statuses.include?(existing)
+      membership.membership_status(status: existing).mark_for_destruction
+    end
+
+    changed = membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
+
+    if changed
+      date ||= Time.zone.now
+
+      membership.registration_on = date # Always new registration_on
+      save!(owner, date: date)
+    end
+
+    true
   end
 
   def remove!(owner, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expected a member') unless owner.membership.present?
+    raise('expected a member with a membership') unless owner.membership.present?
 
     # Date
     date ||= Time.zone.now

data/app/models/concerns/effective_memberships_status.rb

@@ -68,4 +68,9 @@ module EffectiveMembershipsStatus
     status_type == 'Organization'
   end
 
+  # Used for Apply to Join Reinstatement
+  def reinstatable?
+    true
+  end
+
 end

data/app/models/effective/membership.rb

@@ -113,6 +113,10 @@ module Effective
       categories.first.id
     end
 
+    def categories_sentence
+      categories.map(&:to_s).to_sentence.presence || 'None'
+    end
+
     def membership_category(category:)
       raise('expected a category') unless category.class.respond_to?(:effective_memberships_category?)
       membership_categories.find { |mc| mc.category_id == category.id && mc.category_type == category.class.name }
@@ -134,6 +138,10 @@ module Effective
       membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
     end
 
+    def statuses_sentence
+      statuses.map(&:to_s).to_sentence.presence || 'None'
+    end
+
     # We might want to use singular memberships.
     def status
       raise('expected singular usage but there are more than one membership status') if statuses.length > 1

data/app/models/effective/registrar_action.rb

@@ -21,8 +21,8 @@ module Effective
     attr_accessor :skip_fees
 
     # Status Change
+    attr_accessor :status_ids
     attr_accessor :status_id
-    attr_accessor :status_remove_action
 
     # Assign
     attr_accessor :category_ids
@@ -46,8 +46,11 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
-    # Status Change
-    validates :status_id, presence: true, if: -> { current_action == :status_change }
+    # Status Assign
+    validates :status_ids, presence: true, if: -> { current_action == :status_assign }
+
+    # Status Remove
+    validates :status_id, presence: true, if: -> { current_action == :status_remove }
 
     # Assign
     validates :category_ids, presence: true, if: -> { current_action == :assign }
@@ -66,14 +69,14 @@ module Effective
       EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
     end
 
-    def status_change!
-      update!(current_action: :status_change)
-      EffectiveMemberships.Registrar.status_change!(owner, to: status)
+    def status_assign!
+      update!(current_action: :status_assign)
+      EffectiveMemberships.Registrar.status_assign!(owner, status: statuses)
     end
 
     def status_remove!
       update!(current_action: :status_remove)
-      EffectiveMemberships.Registrar.status_remove!(owner)
+      EffectiveMemberships.Registrar.status_remove!(owner, status: status)
     end
 
     def assign!
@@ -101,6 +104,10 @@ module Effective
       EffectiveMemberships.Registrar.remove!(owner)
     end
 
+    def assign_attributes(atts)
+      super(atts.reject { |k, _| k.to_s.start_with?('status_remove_action_') })
+    end
+
     def update!(atts)
       assign_attributes(atts); save!
     end
@@ -121,8 +128,6 @@ module Effective
       @owner_id || (@owner.id if @owner)
     end
 
-    private
-
     def category
       EffectiveMemberships.Category.find(@category_id) if @category_id.present?
     end

data/app/views/admin/registrar_actions/_form_status_change.html.haml

@@ -3,6 +3,7 @@
     %h5.card-title Status Change
 
     = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+
       = f.hidden_field :owner_id
       = f.hidden_field :owner_type
 
@@ -13,29 +14,33 @@
         Change or remove a member's existing status.
 
       = f.static_field :current_action, label: 'Current Status' do
-        = (membership.status || 'None').to_s
+        = badges(membership.statuses) || 'None'
 
       = f.check_box :current_action, label: 'Yes, change member status'
 
       = f.show_if :current_action, true do
         %p The member will keep their existing membership number: #{membership.number}.
 
-        - statuses = f.object.owner.registrar_action_statuses(:status_change) - membership.statuses
-        = f.select :status_id, statuses, label: 'Change status to', required: true
+        - statuses = f.object.owner.registrar_action_statuses(:status_change)
+        - f.object.status_ids = membership.status_ids
+
+        = f.select :status_ids, statuses, label: 'Change status to', required: true, multiple: true
 
         %p No fees will be created
 
-        = f.submit 'Change Status', border: false, center: true, 'data-confirm': "Really change #{f.object.owner}?"
+        = f.submit 'Assign Status', border: false, center: true, 'data-confirm': "Really assign #{f.object.owner} status?"
+
+      - # Remove Actions
+      - membership.statuses.each do |status|
+        = f.check_box "status_remove_action_#{status.id}", label: "Yes, remove #{status} status"
 
-      - # Remove Action
-      - if membership.status.present?
-        = f.check_box :status_remove_action, label: "Yes, remove #{membership.status} status"
+        = f.show_if("status_remove_action_#{status.id}", true, validate: false) do
+          = f.hidden_field :status_id, value: status.id
 
-        = f.show_if :status_remove_action, true do
           %p The member will keep their existing membership number: #{membership.number}
 
-          %p This action will remove the #{membership.status} status
+          %p This action will remove the #{badge(status)} status
 
           %p No fees will be created
 
-          = f.submit 'Remove Status', border: false, center: true, 'data-confirm': "Really remove status #{f.object.owner}?"
+          = f.submit "Remove Status", border: false, center: true, 'data-confirm': "Remove #{status} from #{f.object.owner}?"

data/db/seeds.rb

@@ -10,6 +10,8 @@ if Rails.env.test?
 end
 
 Effective::Status.where(title: 'Resigned').first_or_create!
+Effective::Status.where(title: 'Deceased').first_or_create!
+Effective::Status.where(title: 'On Leave').first_or_create!
 
 member = Effective::Category.create!(
   title: "Full Member",

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.4'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails