effective_memberships 0.4.17 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1394fcdd25d9322f467e1392a9efeec60cc028e424ee85d3baa464d4d185a46a
-  data.tar.gz: 6c4660193bb2e98b113a4ba1e7372b469dcda714f2d78d712b635a497b488d3c
+  metadata.gz: 0c5813efd8fd5455db9964bbb466b8ae8d12f44ee3acce7a945c5ff67550c5e8
+  data.tar.gz: a91d84a98511574b854ae98724d5fbdd37a66aef5a9d87a29956bd6c9cf95062
 SHA512:
-  metadata.gz: 4f4bd2c3f2f544a65d9bbace898fc5538ec115175a635d2895e399597d1687850b8cbf4824bf28517c9b8cd96bee3c96fdd03fcf6224efe39db03650a85881c8
-  data.tar.gz: 9dd8b11979d28592083378f98ab4d69a3c452f156c0698e3eb717273321d4aefe20069accfe00272afc945e0791fffc202fcf3cec526b008922339a5b334f9fb
+  metadata.gz: 83c2dba1cfde3ace28c1037a633e50a4f975f5b8be24877ee2d96e029197c5d43ea8b4e66a2e3a992c9f9298c6c81d84fdaa2045a6e7dc12e3ef97ad154a4a90
+  data.tar.gz: 18b9f5b9377923a1a17703f104ab51710a9c6dacfb6315c322c6a71c3c6204e4b80d64ec13121c4d95b20178e807087bf8ab383288486e6f3abba9b09ca72bf2

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,14 @@ 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'}" },
+      redirect: -> { admin_owners_path(resource) }
+
+    submit :status_remove, 'Remove Status',
+      success: -> { "#{resource.owner} has had their status removed" },
+      redirect: -> { admin_owners_path(resource) }
+
     submit :assign, 'Assign',
       success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/admin/statuses_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class StatusesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.Status.deep.all }
+    datatable -> { Admin::EffectiveStatusesDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_status) ? :effective_status : :status)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -21,9 +21,19 @@ module Admin
         end.join.html_safe
       end
 
+      col :statuses, label: 'Status' do |history|
+        history.statuses.map.with_index do |status, index|
+          status_id = history.status_ids[index]
+          link = link_to(status, effective_memberships.edit_admin_status_path(status_id))
+
+          content_tag(:div, link, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :number
 
       col :category_ids, visible: false
+      col :status_ids, visible: false
 
       col :bad_standing
       col :removed

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -9,7 +9,8 @@ module Admin
       col :owner_type, visible: false
 
       val :owner
-      col :categories
+      col :categories, search: EffectiveMemberships.Category.sorted.map(&:to_s)
+      col :statuses, search: EffectiveMemberships.Status.sorted.map(&:to_s)
 
       col :number
       col :number_as_integer, visible: false

data/app/datatables/admin/effective_statuses_datatable.rb

@@ -0,0 +1,21 @@
+module Admin
+  class EffectiveStatusesDatatable < Effective::Datatable
+    datatable do
+      reorder :position
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :title
+      col :status_type, search: EffectiveMemberships.Status.status_types
+
+      actions_col
+    end
+
+    collection do
+      EffectiveMemberships.Status.deep.all
+    end
+
+  end
+end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -22,7 +22,7 @@ module EffectiveMembershipsApplicant
     end
 
     def categories
-      ['Apply to Join', 'Apply to Reclassify']
+      ['Apply to Join', 'Apply to Reclassify', 'Apply for Reinstatement']
     end
 
     def transcripts_statuses
@@ -51,6 +51,7 @@ module EffectiveMembershipsApplicant
       select: 'Select Application Type',
       demographics: 'Demographics',         # Individual only. Users fields.
       organization: 'Organization',         # Organization only. Organization fields.
+      reinstatement: 'Reinstatement',       # Apply for Reinstatement only
       education: 'Education',
       course_amounts: 'Courses',
       equivalences: 'Equivalent Memberships',
@@ -80,6 +81,9 @@ module EffectiveMembershipsApplicant
     attr_accessor :declare_code_of_ethics
     attr_accessor :declare_truth
 
+    # Reinstatements Step
+    attr_accessor :declare_reinstatement
+
     # Admin Approve Step
     attr_accessor :approved_membership_number
     attr_accessor :approved_membership_date
@@ -92,8 +96,13 @@ module EffectiveMembershipsApplicant
     accepts_nested_attributes_for :organization
 
     belongs_to :category, polymorphic: true, optional: true
+
+    # Required for Apply to Reclassify
     belongs_to :from_category, polymorphic: true, optional: true
 
+    # Required for Apply for Reinstatement
+    belongs_to :from_status, polymorphic: true, optional: true
+
     has_many :applicant_reviews, -> { order(:id) }, as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_reviews, reject_if: :all_blank, allow_destroy: true
 
@@ -169,7 +178,7 @@ module EffectiveMembershipsApplicant
       timestamps
     end
 
-    scope :deep, -> { includes(:user, :organization, :category, :from_category, :orders) }
+    scope :deep, -> { includes(:user, :organization, :category, :from_category, :from_status, :orders) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:approved, :declined]) }
@@ -184,8 +193,9 @@ module EffectiveMembershipsApplicant
 
     # Set Apply to Join or Reclassification
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
-      self.applicant_type = (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
+      self.applicant_type ||= can_apply_applicant_types_collection().first
       self.from_category = owner.membership&.category
+      self.from_status = owner.membership&.status
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -194,12 +204,18 @@ module EffectiveMembershipsApplicant
 
     # All Steps validations
     validates :user, presence: true
+
     validates :from_category, presence: true, if: -> { reclassification? }
+    validates :from_status, presence: true, if: -> { reinstatement? }
 
-    validate(if: -> { reclassification? }) do
+    validate(if: -> { reclassification? && category_id.present? }) do
       errors.add(:category_id, "can't reclassify to existing category") if category_id == from_category_id
     end
 
+    validate(if: -> { reinstatement? && category_id.present? }) do
+      errors.add(:category_id, "must match existing category when reinstatement") unless category_id == from_category_id
+    end
+
     validate(if: -> { category.present? }) do
       self.errors.add(:organization_id, "can't be blank when organization category") if category.organization? && organization.blank?
       self.errors.add(:organization_id, "must be blank when individual category") if category.individual? && organization.present?
@@ -312,6 +328,12 @@ module EffectiveMembershipsApplicant
       validates :declare_truth, acceptance: true
     end
 
+    # Reinstatements step
+    with_options(if: -> { current_step == :reinstatement }) do
+      validates :declare_reinstatement, acceptance: true
+    end
+
+
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -337,16 +359,19 @@ module EffectiveMembershipsApplicant
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
+      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
-        wizard_steps = self.class.all_wizard_steps
+        # All required
         required_steps = self.class.required_wizard_steps
 
-        applicant_steps = Array(category&.applicant_wizard_steps)
+        # Based on current applicant
+        applicant_steps = (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
 
-        # Special logic for stamp step
+        # Sanity check
         applicant_steps.delete(:stamp) unless apply_to_join?
         applicant_steps.delete(:organization) unless category&.organization?
+        applicant_steps.delete(:reinstatement) unless reinstatement?
 
         # change_wizard_steps is defined in effective_resources acts_as_wizard
         applicant_steps = change_wizard_steps(applicant_steps)
@@ -355,40 +380,45 @@ module EffectiveMembershipsApplicant
           raise('expected change_wizard_steps to return an Array of steps with no nils')
         end
 
-        wizard_steps.select do |step|
-          required_steps.include?(step) || category.blank? || applicant_steps.include?(step)
+        self.class.all_wizard_steps.select do |step|
+          required_steps.include?(step) || applicant_steps.include?(step)
         end
       end
     end
 
     def sidebar_steps
-      return self.class.required_wizard_steps unless category.present?
-      required_steps
+      has_completed_step?(:select) ? required_steps : self.class.required_wizard_steps
     end
 
     def can_visit_step?(step)
-      if missing_info?
-        return [:start, :select, :billing, :checkout].exclude?(step)
-      end
-
+      return [:start, :select, :billing, :checkout].exclude?(step) if missing_info?
       can_revisit_completed_steps(step)
     end
 
+    def applicant_fee_type
+      return 'Reinstatement' if reinstatement?
+      'Applicant'
+    end
+
     def applicant_fee_category
       category
     end
 
     def applicant_fee_price
+      return category.applicant_reinstatement_fee if reinstatement?
       category.applicant_fee
     end
 
     # All Fees and Orders
     def submit_fees
       # Find or build submit fee
-      fee = fees.first || fees.build(owner: owner, fee_type: 'Applicant')
+      fee = fees.first || fees.build(owner: owner)
+
+      raise('expected a present applicant fee price') if applicant_fee_price.blank?
 
       unless fee.purchased?
         fee.assign_attributes(
+          fee_type: applicant_fee_type(),
           category: applicant_fee_category(),
           price: applicant_fee_price(),
           tax_exempt: applicant_fee_category().applicant_fee_tax_exempt,
@@ -433,18 +463,9 @@ module EffectiveMembershipsApplicant
 
   # Instance Methods
   def to_s
-    if category.present? && category.present?
-      [
-        owner.to_s,
-        '-',
-        category,
-        'for',
-        category,
-        ("from #{from_category}" if reclassification?)
-      ].compact.join(' ')
-    else
-      'New Applicant'
-    end
+    return 'New Applicant' if applicant_type.blank? || category.blank? || owner.blank?
+
+    "#{owner} - #{applicant_type} to #{category}"
   end
 
   def owner
@@ -467,6 +488,10 @@ module EffectiveMembershipsApplicant
     applicant_type == 'Apply to Reclassify'
   end
 
+  def reinstatement?
+    applicant_type == 'Apply for Reinstatement'
+  end
+
   def individual?
     !(owner.kind_of?(EffectiveMemberships.Organization) && category&.organization?)
   end
@@ -516,6 +541,17 @@ module EffectiveMembershipsApplicant
     end.html_safe
   end
 
+  # Used by the select step
+  def can_apply_applicant_types_collection
+    if owner.blank? || owner.membership.blank? || owner.membership.categories.blank?
+      ['Apply to Join']
+    elsif owner.membership.statuses.present?
+      ['Apply for Reinstatement', 'Apply to Join']
+    else
+      ['Apply to Reclassify']
+    end
+  end
+
   # Used by the select step
   def can_apply_categories_collection
     categories = EffectiveMemberships.Category.sorted.can_apply
@@ -524,7 +560,7 @@ module EffectiveMembershipsApplicant
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = user.memberships.map(&:category_ids).flatten
+    category_ids = user.membership.category_ids
 
     categories.select do |cat|
       cat.can_apply_existing? ||
@@ -584,7 +620,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_references_required?
-    min_applicant_references > 0
+    required_steps.include?(:references) && min_applicant_references > 0
   end
 
   # Endorsements Step
@@ -593,7 +629,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_endorsements_required?
-    min_applicant_endorsements > 0
+    required_steps.include?(:endorsements) && min_applicant_endorsements > 0
   end
 
   # Equivalences Step
@@ -607,7 +643,7 @@ module EffectiveMembershipsApplicant
   end
 
   def transcripts_required?
-    category.applicant_wizard_steps.include?(:transcripts)
+    required_steps.include?(:transcripts)
   end
 
   # Files Step
@@ -631,16 +667,16 @@ module EffectiveMembershipsApplicant
     requirements = {}
     return requirements unless category.present?
 
-    if category.applicant_wizard_steps.include?(:endorsements) || applicant_endorsements_required?
-      requirements['Applicant Endorsements'] = (!applicant_endorsements_required? || applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    if applicant_endorsements_required?
+      requirements['Applicant Endorsements'] = (applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
     end
 
-    if category.applicant_wizard_steps.include?(:references) || applicant_references_required?
-      requirements['Applicant References'] = (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
+    if applicant_references_required?
+      requirements['Applicant References'] = (applicant_references.count(&:completed?) >= min_applicant_references)
     end
 
-    if category.applicant_wizard_steps.include?(:transcripts) || transcripts_required?
-      requirements['Applicant Transcripts'] = (!transcripts_required? || transcripts_received?)
+    if transcripts_required?
+      requirements['Applicant Transcripts'] = transcripts_received?
     end
 
     requirements
@@ -689,9 +725,14 @@ module EffectiveMembershipsApplicant
   # When an application is completed, these must be done to go to reviewed
   # An Admin can override this and just set them to reviewed.
   def reviewed_requirements
-    {
-      'Applicant Reviews' => (!applicant_reviews_required? || applicant_reviews.count(&:completed?) >= min_applicant_reviews)
-    }
+    requirements = {}
+    return requirements unless category.present?
+
+    if applicant_reviews_required?
+      requirements['Applicant Reviews'] = (applicant_reviews.count(&:completed?) >= min_applicant_reviews)
+    end
+
+    requirements
   end
 
   def review!
@@ -723,6 +764,8 @@ module EffectiveMembershipsApplicant
       )
     elsif reclassification?
       EffectiveMemberships.Registrar.reclassify!(owner, to: category)
+    elsif reinstatement?
+      EffectiveMemberships.Registrar.reinstate!(owner)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_category.rb

@@ -42,7 +42,7 @@ module EffectiveMembershipsCategory
       category_type         :string
 
       title                 :string
-      category              :string
+      category              :string                 # Unused but must belong to self.class.categories
       position              :integer
 
       # Applicants
@@ -51,8 +51,9 @@ module EffectiveMembershipsCategory
       can_apply_restricted      :boolean
       can_apply_restricted_ids  :text
 
-      applicant_fee              :integer
-      applicant_wizard_steps     :text
+      applicant_fee                 :integer
+      applicant_reinstatement_fee   :integer
+      applicant_wizard_steps        :text
 
       min_applicant_educations          :integer
       min_applicant_endorsements        :integer
@@ -192,10 +193,16 @@ module EffectiveMembershipsCategory
     applicant_review_wizard_steps - EffectiveMemberships.ApplicantReview.required_wizard_steps
   end
 
+  # Apply to Join or Apply to Reclassify
   def applicant_wizard_steps
     (Array(self[:applicant_wizard_steps]) - [nil, '']).map(&:to_sym)
   end
 
+  # Apply for Reinstatement
+  def applicant_reinstatement_wizard_steps
+    [:reinstatement]
+  end
+
   def fee_payment_wizard_steps
     (Array(self[:fee_payment_wizard_steps]) - [nil, '']).map(&:to_sym)
   end

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -56,8 +56,8 @@ module EffectiveMembershipsFeePayment
     belongs_to :organization, polymorphic: true, optional: true
     accepts_nested_attributes_for :organization
 
-    # Like maybe optionally it makes sense.
     belongs_to :category, polymorphic: true, optional: true
+    belongs_to :with_status, polymorphic: true, optional: true
 
     # Effective Namespace
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
@@ -102,6 +102,7 @@ module EffectiveMembershipsFeePayment
 
     before_validation(if: -> { current_step == :start && user && user.membership }) do
       self.category ||= user.membership.categories.first if user.membership.categories.length == 1
+      self.with_status ||= user.membership.statuses.first if user.membership.statuses.length == 1
     end
 
     # All Steps validations
@@ -120,17 +121,27 @@ module EffectiveMembershipsFeePayment
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
+      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
-        wizard_steps = self.class.all_wizard_steps
+        # All required
         required_steps = self.class.required_wizard_steps
 
-        fee_payment_steps = Array(category&.fee_payment_wizard_steps)
+        # Based on current fee payment
+        fee_payment_steps = Array(category.fee_payment_wizard_steps)
 
+        # Sanity Check
         fee_payment_steps.delete(:organization) unless organization?
 
-        wizard_steps.select do |step|
-          required_steps.include?(step) || category.blank? || fee_payment_steps.include?(step)
+        # change_wizard_steps is defined in effective_resources acts_as_wizard
+        fee_payment_steps = change_wizard_steps(fee_payment_steps)
+
+        unless fee_payment_steps.kind_of?(Array) && fee_payment_steps.all? { |step| step.kind_of?(Symbol) }
+          raise('expected change_wizard_steps to return an Array of steps with no nils')
+        end
+
+        self.class.all_wizard_steps.select do |step|
+          required_steps.include?(step) || fee_payment_steps.include?(step)
         end
       end
     end

data/app/models/concerns/effective_memberships_owner.rb

@@ -53,6 +53,24 @@ module EffectiveMembershipsOwner
       where(id: with_paid_fees_through.select(:owner_id))
     }
 
+    scope :members_with_category, -> (categories) {
+      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+
+      membership_categories = Effective::MembershipCategory.where(category: categories)
+      memberships = Effective::Membership.where(id: membership_categories.select(:membership_id))
+
+      where(id: memberships.where(owner_type: name).select(:owner_id))
+    }
+
+    scope :members_with_status, -> (statuses) {
+      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+
+      membership_statuses = Effective::MembershipStatus.where(status: statuses)
+      memberships = Effective::Membership.where(id: membership_statuses.select(:membership_id))
+
+      where(id: memberships.where(owner_type: name).select(:owner_id))
+    }
+
   end
 
   def assign_member_role
@@ -103,6 +121,10 @@ module EffectiveMembershipsOwner
     EffectiveMemberships.Category.sorted.all
   end
 
+  def registrar_action_statuses(action)
+    EffectiveMemberships.Status.sorted.all
+  end
+
   # Instance Methods
   def build_prorated_fee(date: nil)
     raise('must have an existing membership') unless membership.present?
@@ -271,21 +293,29 @@ module EffectiveMembershipsOwner
 
     # The date of change
     start_on ||= Time.zone.now
-    removed = membership.marked_for_destruction?
 
     # End the other membership histories
     membership_histories.each { |history| history.end_on ||= start_on }
 
     # Snapshot of the current membership at this time
-    membership_histories.build(
+    history = membership_histories.build(
       start_on: start_on,
       end_on: nil,
-      removed: removed,
-      bad_standing: membership.bad_standing?,
-      categories: (membership.categories.map(&:to_s) unless removed),
-      category_ids: (membership.categories.map(&:id) unless removed),
-      number: (membership.number unless removed)
+      removed: membership.marked_for_destruction?,
+      bad_standing: membership.bad_standing?
     )
+
+    unless history.removed?
+      history.assign_attributes(
+        number: membership.number,
+        categories: membership.categories.map(&:to_s),
+        category_ids: membership.categories.map(&:id),
+        statuses: membership.statuses.map(&:to_s),
+        status_ids: membership.statuses.map(&:id)
+      )
+    end
+
+    history
   end
 
   def membership_history_on(date)