effective_memberships 0.6.3 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d93c9f826d21228e86c0b10e7f30453ba7201dd00e9eab65f9b332850d4cfd6
-  data.tar.gz: 75520c50d89f83b7f2f0657efcd3f581b058ab2af756640bccb6d5bf4fb66207
+  metadata.gz: d5a9ac211f2370d13d88ee7b8ce0345c4c8363c530dd60dccbe4bc2da046bf98
+  data.tar.gz: 69f0f40f0116c65bea68c949424921b2a87b821e50e664fc73b1312f90c79a79
 SHA512:
-  metadata.gz: e63960291256ab28e1ae9e4a8e1949cabaf24d31ded3bdd2e74c5240ba6539431e24bf6bac5161f933b92243db98dde91cbada1f654ced95bd4725f0583d2677
-  data.tar.gz: 20ac5d9b6a2f1021b2df5391aa6751f48061cd9c672709870eeb303e17205968d57121089b2d851596b4e2780fe2fa903f61cfeb9969aa91ab11202f03e7eb46
+  metadata.gz: 7edb8681ca649e8aa121cf38add83c1e21277a968682e8b183f5f3197a84dd061f5ebac01c0da824c64f59c93f47e17d46ea43d81ee4b31a1cb485235b24f7e7
+  data.tar.gz: 4fe46479e76c85a356861d4b42f2e1b59675c3726e61c9791044b85133679e87f5d2b66e7a719311fe6c15a6d25a89db04f2b4f20232c462c5a028cf2c013f85

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,32 +206,58 @@ 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)

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/views/effective/applicants/equivalences.html.haml

@@ -3,7 +3,10 @@
 
   = card do
     - if resource.min_applicant_equivalences > 0
-      .alert.alert-danger You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
+      %p You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
+
+    - if resource.min_applicant_equivalences == 0
+      %p Equivalent memberships are not required. Click the Remove button to skip adding memberships.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

data/app/views/effective/applicants/experience.html.haml

@@ -8,6 +8,9 @@
     - if resource.min_applicant_experiences_months > 0
       %p You must include #{resource.min_applicant_experiences_months} or more months of experience.
 
+    - if resource.min_applicant_educations == 0 && resource.min_applicant_experiences_months == 0
+      %p Work experience is not required. Click the Remove button to skip adding work experience.
+
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
       = f.error :applicant_experiences

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.3'
+  VERSION = '0.6.6'
 end

metadata

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