effective_memberships 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276edc8f53de07b32c2a6f5467727cda1ca37a4748dd6fccf37fd8657150e1b8
-  data.tar.gz: '097342ca3d781331f2d660e0e027016b34c67d0f13f24b535b2703c0d30cf212'
+  metadata.gz: b1fcdc5cbf08b23f6aab670babdf698a2aff6b6d9d2067055dc970bb2eb4b8e4
+  data.tar.gz: 0a423a28dc16bd84135e741bcb9f290c7997c034ba0095319bab4cf36913d605
 SHA512:
-  metadata.gz: 87669cf4f1bc83980b9f915916a509d1580cb4ba14545c178bf344f9dfe9f0c9c8c7b45f6e350fc38d1ae4aa9f2ef0c1de93382e8e310fc368623b007b4a1a4e
-  data.tar.gz: 1c71acefad1595cc972e63399a4709c1d934f1f487c439bf593feb8cdb9d2167a7ea703f2d36ad78e010c727e128d7548a0b26847538ea3ba81ab48d69ba3ba4
+  metadata.gz: 296aa3d82c05315ac9247f28052e474440562fb85450fc4735f4875b26d67ccdd612df58727207251f2540f103efa41c519128e1366be02f446400816000f3de
+  data.tar.gz: 71feca7c490aea3f2ba49cae7c3318b79d5da533f1b7a6adedcb0ae38a1b9ea2c6b61daa163a9abfc92e2d3e8aff110dbb705c4e373bcfab488aae1d9533a82c

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

@@ -194,8 +194,14 @@ module EffectiveMembershipsApplicant
     # Set Apply to Join or Reclassification
     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 if reinstatement?
+
+      if owner.membership.present?
+        self.from_category = owner.membership.categories.first
+      end
+
+      if owner.membership.present? && reinstatement?
+        self.from_status = owner.membership.statuses.find { |status| status.reinstatable? }
+      end
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -779,7 +785,7 @@ module EffectiveMembershipsApplicant
     elsif reclassification?
       EffectiveMemberships.Registrar.reclassify!(owner, to: category)
     elsif reinstatement?
-      EffectiveMemberships.Registrar.reinstate!(owner)
+      EffectiveMemberships.Registrar.reinstate!(owner, from: from_status)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -186,17 +186,18 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reinstate!(owner, date: nil, skip_fees: false)
+  def reinstate!(owner, from:, 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?
 
-    from = owner.membership.status
-    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
+    raise('expecting a from') if from.blank?
+    raise('expected a from status or category') unless from.class.respond_to?(:effective_memberships_status?) || from.class.respond_to?(:effective_memberships_category?)
 
     date ||= Time.zone.now
 
     membership = owner.membership
-    membership.membership_status(status: from).mark_for_destruction if from.present?
+    membership.membership_status(status: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_status?)
+    membership.membership_category(category: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_category?)
 
     unless skip_fees
       fee = owner.build_prorated_fee(date: date)
@@ -206,37 +207,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/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/app/views/effective/applicants/_summary.html.haml

@@ -22,7 +22,11 @@
           - else
             None
 
-    - if applicant.from_category.present?
+    - if applicant.from_status.present?
+      %tr
+        %th From Status
+        %td= applicant.from_status
+    - elsif applicant.from_category.present?
       %tr
         %th From Category
         %td= applicant.from_category

data/app/views/effective/applicants/select/_apply_for_reinstatement.html.haml

@@ -1,3 +1,3 @@
 - membership = f.object.owner.membership
 
-%p Apply for reinstatement from #{membership.status || membership.category}.
+%p Apply for reinstatement from #{badges(f.object.from_status || f.object.from_category)}.

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.5'
+  VERSION = '0.6.8'
 end

metadata

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