effective_memberships 0.7.7 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504773afcda5b7dcae14e65e794047b836bf36cee856712def292310318b69e5
-  data.tar.gz: 197949c35571956f3062f41de8096c9affea15bf086288f3173f403d2b13b772
+  metadata.gz: 0a2ae153f152ca4d2295c8847e7848d10dde99d015c77367606cc1d00feb8743
+  data.tar.gz: f41d582a3c5da8491cfb82ac7129aaa796c3f4fc14ee49e5eff6e2770d725200
 SHA512:
-  metadata.gz: 40a854be5c36060fc00699df969ec482037b62688f6be2976b5c362fe1d6e3fd1a597de32f6074d4e66f2495e875d4ea21c121a72ad8c88cae636ca1e3d07f7e
-  data.tar.gz: 6596da1652d19c7a436917cd05390ddbb9d233c0109fd1efd91c046e165791faf22dbe4fddf1d8ce0b56c1c0e1d931cca6c37eb934b44d47acc269f9d30646e5
+  metadata.gz: 218f5706b65bfc70fa9cd458678fb24cfa106751f91c98a636e304dc66494879789e95bcccfebf79eb993dd7797b56b72cf640de69013ded6b117e2ca6fb0f64
+  data.tar.gz: 2fcba0dab68d21ce5653e9d9e227895e227d887c3fbc80c2533be72cd190b1ad6a8a02b7b7041692957cd4edca505d24533fcb8653c82c3ace37623122d4498a

data/app/controllers/admin/registrar_actions_controller.rb

@@ -30,14 +30,6 @@ module Admin
       success: -> { "#{resource.owner} has been removed" },
       redirect: -> { admin_owners_path(resource) }
 
-    submit :bad_standing, 'Set In Bad Standing',
-      success: -> { "#{resource.owner} is now In Bad Standing" },
-      redirect: -> { admin_owners_path(resource) }
-
-    submit :good_standing, 'Remove In Bad Standing',
-      success: -> { "#{resource.owner} is now In Good Standing" },
-      redirect: -> { admin_owners_path(resource) }
-
     submit :fees_paid, 'Mark Fees Paid',
       success: -> { "#{resource.owner} has now paid their fees through #{resource.owner.membership.fees_paid_through_period&.strftime('%F')}" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/effective/membership_directory_controller.rb

@@ -0,0 +1,36 @@
+module Effective
+  class MembershipDirectoryController < ApplicationController
+    include Effective::CrudController
+
+    def index
+      @page_title = 'Directory'
+      EffectiveResources.authorize!(self, :index, Effective::Membership)
+
+      # Sometimes we just display a Datatable for the membership directory
+      @datatable = EffectiveResources.best('EffectiveMembershipsDirectoryDatatable').new
+
+      # But more often we do a full membership directory search screen
+      @membership_directory = build_membership_directory
+      @membership_directory.search!
+
+      @memberships = @membership_directory.results(page: params[:page])
+    end
+
+    def build_membership_directory
+      directory = EffectiveMemberships.MembershipDirectory.new(search_params)
+      directory.current_user = current_user
+      directory
+    end
+
+    def search_params
+      return {} unless params[:q].present?
+
+      if params[:q].respond_to?(:to_h)      # From the search form
+        params.require(:q).permit!
+      else
+        { term: params.permit(:q).fetch(:q) }   # From the url /directory?q=asdf
+      end
+    end
+
+  end
+end

data/app/datatables/admin/effective_categories_datatable.rb

@@ -36,7 +36,7 @@ module Admin
 
       col :create_renewal_fees, visible: false
       col :create_late_fees, visible: false
-      col :create_bad_standing, visible: false
+      col :create_not_in_good_standing, visible: false
 
       col :category_type, search: EffectiveMemberships.Category.category_types, visible: false
 

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -35,9 +35,10 @@ module Admin
       col :category_ids, visible: false
       col :status_ids, visible: false
 
-      col :bad_standing
       col :removed
 
+      col :notes
+
       actions_col unless attributes[:actions] == false
     end
 

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -21,10 +21,6 @@ module Admin
       col :fees_paid_period, visible: false, label: 'Fees Paid'
       col :fees_paid_through_period, label: 'Fees Paid Through'
 
-      col :bad_standing
-      col :bad_standing_admin, visible: false
-      col :bad_standing_reason, visible: false
-
       col :email do |membership|
         email = membership.owner.try(:email)
         mail_to(email) if email.present?

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -11,7 +11,7 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Membership.deep.good_standing.includes(:owner)
+    scope = Effective::Membership.directory.all
 
     archived_klasses.each do |klass|
       scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)
@@ -21,11 +21,7 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   end
 
   def archived_klasses
-    @archived_klasses ||= begin
-      klasses = Effective::Membership.distinct(:owner_type).pluck(:owner_type)
-      klasses = klasses.select { |klass| klass.safe_constantize.try(:acts_as_archived?) }
-      klasses.map { |klass| klass.constantize }
-    end
+    @archived_klasses ||= Effective::Membership.owner_klasses.select { |klass| klass.try(:acts_as_archived?) }
   end
 
 end

data/app/models/concerns/effective_memberships_category.rb

@@ -91,7 +91,7 @@ module EffectiveMembershipsCategory
       create_late_fees      :boolean
       late_fee              :integer
 
-      create_bad_standing  :boolean
+      create_not_in_good_standing   :boolean
 
       # Pricing
       qb_item_name          :string

data/app/models/concerns/effective_memberships_directory.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+# This is a search model for the MembershipDirectories screen
+#
+# EffectiveMembershipsDirectory
+# Mark your directory search model with include EffectiveMembershipsDirectory
+
+module EffectiveMembershipsDirectory
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def effective_memberships_directory?; true; end
+  end
+
+  included do
+    include ActiveModel::Model
+
+    attr_accessor :current_user
+    attr_accessor :term
+    attr_accessor :category
+
+    attr_accessor :first_name
+    attr_accessor :last_name
+
+    validates :term, length: { minimum: 3, allow_blank: true }
+    validates :first_name, length: { minimum: 2, allow_blank: true }
+    validates :last_name, length: { minimum: 2, allow_blank: true }
+  end
+
+  # Base collection to search. Can be configured per tenant.
+  def collection
+    Effective::Membership.directory
+  end
+
+  # Search Users and Organizations for only these fields. Passed into search_any. Return nil for all.
+  # Should this include email?
+  def search_any_columns
+    [:title, :name, :first_name, :middle_name, :last_name]
+  end
+
+  def per_page
+    24
+  end
+
+  def present?
+    term.present? || first_name.present? || last_name.present? || category.present?
+  end
+
+  # Search and assigns the collection
+  # Assigns the entire collection() if there are no search terms
+  # Otherwise validate the search terms
+  def search!
+    @memberships = build_collection()
+    @memberships = @memberships.none if present? && !valid?
+    @memberships
+  end
+
+  # The unpaginated results of the search
+  def memberships
+    @memberships || collection
+  end
+
+  # The paginated results
+  def results(page: nil)
+    page = (page || 1).to_i
+    offset = [(page - 1), 0].max * per_page
+
+    memberships().limit(per_page).offset(offset)
+  end
+
+  protected
+
+  def build_collection
+    memberships = collection()
+    raise('expected an ActiveRecord collection') unless memberships.kind_of?(ActiveRecord::Relation)
+
+    # Filter by term
+    if term.present?
+      memberships = search_owners(memberships, term, search_any_columns)
+    end
+
+    # Filter by first name
+    if first_name.present?
+      memberships = search_owners(memberships, first_name, :first_name)
+    end
+
+    # Filter by last name
+    if last_name.present?
+      memberships = search_owners(memberships, last_name, :last_name)
+    end
+
+    # Filter by category
+    if category.present?
+      cat = EffectiveMemberships.Category.where(id: category)
+      memberships = memberships.with_category(cat) if cat.present?
+    end
+
+    memberships
+  end
+
+  def search_owners(collection, term, columns = nil)
+    results = collection.none()
+
+    owner_klasses.each do |klass|
+      search = Effective::Resource.new(klass).search_any(term, columns: columns)
+      searched = collection.where(owner_type: klass.name, owner_id: search.select('id'))
+
+      results = results.or(searched)
+    end
+
+    collection.merge(results)
+  end
+
+  def owner_klasses
+    @owner_klasses ||= Effective::Membership.owner_klasses
+  end
+
+end

data/app/models/concerns/effective_memberships_owner.rb

@@ -7,12 +7,9 @@
 module EffectiveMembershipsOwner
   extend ActiveSupport::Concern
 
-  mattr_accessor :descendants
-
   module Base
     def effective_memberships_owner
       include ::EffectiveMembershipsOwner
-      (EffectiveMembershipsOwner.descendants ||= []) << self
     end
   end
 
@@ -43,14 +40,14 @@ module EffectiveMembershipsOwner
       without_role(:member).where(id: removed.select(:owner_id))
     }
 
-    scope :membership_good_standing, -> {
-      bad_standing = Effective::Membership.where(bad_standing: false).where(owner_type: name)
-      where(id: bad_standing.select(:owner_id))
+    scope :membership_not_in_good_standing, -> {
+      not_in_good_standing = Effective::Membership.not_in_good_standing.where(owner_type: name)
+      where(id: not_in_good_standing.select(:owner_id))
     }
 
-    scope :membership_bad_standing, -> {
-      bad_standing = Effective::Membership.where(bad_standing: true).where(owner_type: name)
-      where(id: bad_standing.select(:owner_id))
+    scope :membership_in_good_standing, -> {
+      in_good_standing = Effective::Membership.in_good_standing.where(owner_type: name)
+      where(id: in_good_standing.select(:owner_id))
     }
 
     scope :membership_renewed_this_period, -> {
@@ -59,33 +56,21 @@ module EffectiveMembershipsOwner
     }
 
     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))
+      with_category = Effective::Membership.with_category(categories).where(owner_type: name)
+      where(id: with_category.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))
+      with_status = Effective::Membership.with_status(statuses).where(owner_type: name)
+      where(id: with_status.select(:owner_id))
     }
 
     scope :membership_joined_before, -> (date) {
-      raise('expected a date') unless date.respond_to?(:strftime)
-
       joined_before = Effective::Membership.joined_before(date).where(owner_type: name)
       where(id: joined_before.select(:owner_id))
     }
 
     scope :membership_joined_after, -> (date) {
-      raise('expected a date') unless date.respond_to?(:strftime)
-
       joined_after = Effective::Membership.joined_after(date).where(owner_type: name)
       where(id: joined_after.select(:owner_id))
     }
@@ -114,8 +99,8 @@ module EffectiveMembershipsOwner
     orders.select { |order| order.parent_type.to_s.include?('FeePayment') && !order.purchased? }
   end
 
-  def bad_standing_fees
-    fees.select { |fee| fee.bad_standing? }
+  def not_in_good_standing_fees
+    fees.select { |fee| fee.not_in_good_standing? }
   end
 
   def max_fees_paid_period
@@ -141,7 +126,7 @@ module EffectiveMembershipsOwner
   end
 
   def registrar_action_statuses(action)
-    EffectiveMemberships.Status.sorted.all
+    EffectiveMemberships.Status.sorted.all.where.not(id: EffectiveMemberships.Registrar.not_in_good_standing_status)
   end
 
   # Instance Methods
@@ -192,7 +177,7 @@ module EffectiveMembershipsOwner
     fee
   end
 
-  # Only thing optional is category, late_on and bad_standing_on
+  # Only thing optional is category, late_on and not_in_good_standing_on
   def build_title_fee(title:, fee_type:, period:, price: nil, tax_exempt: nil, qb_item_name: nil, category: nil)
     fee = fees.find do |fee|
       fee.fee_type == fee_type && fee.period == period && fee.title == title &&
@@ -223,7 +208,7 @@ module EffectiveMembershipsOwner
     fees.find { |fee| fee.membership_period_fee? && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name && (except.blank? || fee.fee_type != except) }
   end
 
-  def build_renewal_fee(category:, period:, late_on: nil, bad_standing_on: nil)
+  def build_renewal_fee(category:, period:, late_on: nil, not_in_good_standing_on: nil)
     raise('must have an existing membership') unless membership.present?
 
     # Sanity check.
@@ -239,7 +224,7 @@ module EffectiveMembershipsOwner
     fee ||= fees.build()
 
     late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
-    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period) if category.create_bad_standing?
+    not_in_good_standing_on ||= EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) if category.create_not_in_good_standing?
 
     fee.assign_attributes(
       fee_type: 'Renewal',
@@ -249,7 +234,7 @@ module EffectiveMembershipsOwner
       tax_exempt: category.tax_exempt,
       qb_item_name: category.qb_item_name,
       late_on: late_on,
-      bad_standing_on: bad_standing_on,
+      not_in_good_standing_on: not_in_good_standing_on,
     )
 
     fee
@@ -289,25 +274,24 @@ module EffectiveMembershipsOwner
     membership.fees_paid_period = max_fees_paid_period()
     membership.fees_paid_through_period = max_fees_paid_through_period()
 
-    # Assign in bad standing
-    if membership.bad_standing_admin?
-      # Nothing to do
-    elsif bad_standing_fees.present? && membership.categories.any?(&:create_bad_standing?)
-      membership.bad_standing = true
-      membership.bad_standing_reason = 'Unpaid Fees'
-    else
-      membership.bad_standing = false
-      membership.bad_standing_reason = nil
+    # Add or remove Not In Good Standing status
+    in_good_standing = membership.in_good_standing?
+    not_in_good_standing = membership.not_in_good_standing?
+
+    if in_good_standing && not_in_good_standing_fees.present?
+      EffectiveMemberships.Registrar.not_in_good_standing!(self)
+    elsif not_in_good_standing && not_in_good_standing_fees.blank?
+      EffectiveMemberships.Registrar.in_good_standing!(self)
     end
 
-    if membership.bad_standing_changed? || membership_histories.blank?
+    if membership_histories.blank?
       build_membership_history()
     end
 
     save!
   end
 
-  def build_membership_history(start_on: nil)
+  def build_membership_history(start_on: nil, notes: nil)
     raise('expected membership to be present') unless membership.present?
 
     # The date of change
@@ -321,7 +305,7 @@ module EffectiveMembershipsOwner
       start_on: start_on,
       end_on: nil,
       removed: membership.marked_for_destruction?,
-      bad_standing: membership.bad_standing?
+      notes: notes
     )
 
     unless history.removed?

data/app/models/concerns/effective_memberships_registrar.rb

@@ -28,11 +28,20 @@ module EffectiveMembershipsRegistrar
     raise('to be implemented by app registrar')
   end
 
-  def bad_standing_date(period:)
+  def not_in_good_standing_date(period:)
     Date.new(period.year, 3, 1) # Membership in bad standing after March 1st
     raise('to be implemented by app registrar')
   end
 
+  # scope
+  def not_in_good_standing_status
+    EffectiveMemberships.Status.where(title: 'Not In Good Standing')
+  end
+
+  def not_in_good_standing_status!
+    EffectiveMemberships.Status.where(title: 'Not In Good Standing').first!
+  end
+
   # Should two could be overridden if we do non 1-year periods
   def advance_period(period:, number:)
     period.advance(years: number).beginning_of_year
@@ -90,7 +99,6 @@ module EffectiveMembershipsRegistrar
     end
 
     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? }
 
     if changed
       membership.registration_on = date # Always new registration_on
@@ -214,21 +222,21 @@ module EffectiveMembershipsRegistrar
     status_assign!(owner, date: date, status: [])
   end
 
-  def status_add!(owner, status:, date: nil)
+  def status_add!(owner, status:, date: nil, notes: 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: owner.membership.statuses + Array(status))
+    status_assign!(owner, date: date, notes: notes, status: owner.membership.statuses + Array(status))
   end
 
-  def status_remove!(owner, status:, date: nil)
+  def status_remove!(owner, status:, date: nil, notes: 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: owner.membership.statuses - Array(status))
+    status_assign!(owner, date: date, notes: notes, status: owner.membership.statuses - Array(status))
   end
 
-  def status_assign!(owner, status:, date: nil)
+  def status_assign!(owner, status:, date: nil, notes: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
     membership = owner.membership
@@ -252,10 +260,7 @@ module EffectiveMembershipsRegistrar
     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)
+      save!(owner, date: date, notes: notes)
     end
 
     true
@@ -281,36 +286,20 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def bad_standing!(owner, reason:, date: nil)
+  def not_in_good_standing!(owner, date: nil, notes: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?
-    raise('expected owner to be in good standing') if owner.membership.bad_standing?
-
-    # Date
-    date ||= Time.zone.now
-    membership = owner.membership
+    raise('expected owner to be in good standing') unless owner.membership.in_good_standing?
 
-    membership.bad_standing = true
-    membership.bad_standing_admin = true
-    membership.bad_standing_reason = reason
-
-    save!(owner, date: date)
+    status_add!(owner, status: not_in_good_standing_status!, date: date, notes: notes)
   end
 
-  def good_standing!(owner, date: nil)
+  def in_good_standing!(owner, date: nil, notes: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?
-    raise('expected owner to be in bad standing') unless owner.membership.bad_standing?
-
-    # Date
-    date ||= Time.zone.now
-    membership = owner.membership
-
-    membership.bad_standing = false
-    membership.bad_standing_admin = false
-    membership.bad_standing_reason = nil
+    raise('expected owner to be not in good standing') unless owner.membership.not_in_good_standing?
 
-    save!(owner, date: date)
+    status_remove!(owner, status: not_in_good_standing_status!, date: date, notes: notes)
   end
 
   def fees_paid!(owner, date: nil, order_attributes: nil)
@@ -400,8 +389,8 @@ module EffectiveMembershipsRegistrar
     memberships.find_each { |membership| create_late_fees!(membership, period: period) }
     GC.start
 
-    # Update Membership Status - Assign In Bad Standing
-    memberships.find_each { |membership| create_bad_standing!(membership, period: period) }
+    # Update Membership Status - Assign Not In Good Standing
+    memberships.find_each { |membership| create_not_in_good_standing!(membership, period: period) }
     GC.start
 
     true
@@ -433,12 +422,8 @@ module EffectiveMembershipsRegistrar
     end
   end
 
-  def create_bad_standing!(membership, period:)
-    return unless membership.categories.any?(&:create_bad_standing?)
-    update_membership_status!(membership, period: period)
-  end
-
-  def update_membership_status!(membership, period: nil)
+  def create_not_in_good_standing!(membership, period:)
+    return unless membership.categories.any?(&:create_not_in_good_standing?)
     membership.owner.update_membership_status!
   end
 
@@ -482,8 +467,8 @@ module EffectiveMembershipsRegistrar
     true
   end
 
-  def save!(owner, date: Time.zone.now)
-    owner.build_membership_history(start_on: date)
+  def save!(owner, date: Time.zone.now, notes: nil)
+    owner.build_membership_history(start_on: date, notes: notes)
     owner.save!
   end
 

data/app/models/concerns/effective_memberships_status.rb

@@ -68,6 +68,10 @@ module EffectiveMembershipsStatus
     status_type == 'Organization'
   end
 
+  def not_in_good_standing?
+    title == 'Not In Good Standing'
+  end
+
   # Used for Apply to Join Reinstatement
   def reinstatable?
     true

data/app/models/effective/fee.rb

@@ -23,8 +23,8 @@ module Effective
 
       period            :date
 
-      late_on           :date
-      bad_standing_on   :date
+      late_on                   :date
+      not_in_good_standing_on   :date
 
       price             :integer
       qb_item_name      :string
@@ -62,8 +62,8 @@ module Effective
     validates :late_on, presence: true,
       if: -> { fee_type == 'Renewal' && category&.create_late_fees? }
 
-    validates :bad_standing_on, presence: true,
-      if: -> { fee_type == 'Renewal' && category&.create_bad_standing? }
+    validates :not_in_good_standing_on, presence: true,
+      if: -> { fee_type == 'Renewal' && category&.create_not_in_good_standing? }
 
     def to_s
       title.presence || default_title()
@@ -76,11 +76,11 @@ module Effective
       late_on <= Time.zone.now.to_date
     end
 
-    def bad_standing?
-      return false if bad_standing_on.blank?
+    def not_in_good_standing?
+      return false if not_in_good_standing_on.blank?
       return false if purchased?
 
-      bad_standing_on <= Time.zone.now.to_date
+      not_in_good_standing_on <= Time.zone.now.to_date
     end
 
     # Used by applicant.applicant_submit_fees

data/app/models/effective/membership.rb

@@ -18,26 +18,47 @@ module Effective
       number_as_integer         :integer  # A unique integer
 
       joined_on                 :date     # When they first receive a membership category
-      registration_on           :date     # When the membership category last changed. Applied or reclassified.
+      registration_on           :date     # When the membership category last changed. Applied or reclassified. Not status change.
 
       # Membership Status
       fees_paid_period          :date     # The most recent period they have paid in. Start date of period.
       fees_paid_through_period  :date     # The most recent period they have paid in. End date of period. Kind of an expires.
 
-      bad_standing              :boolean   # Calculated value. Is this owner in bad standing? (fees due)
-      bad_standing_admin        :boolean   # Admin set this
-      bad_standing_reason       :text      # Reason for bad standing
-
       timestamps
     end
 
-    scope :deep, -> { includes(membership_categories: :category) }
+    scope :deep, -> { includes(:owner, membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
-    scope :good_standing, -> { where(bad_standing: [nil, false]) }
+    scope :with_status, -> (statuses) {
+      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where(id: MembershipStatus.where(status: statuses).select(:membership_id))
+    }
 
-    scope :joined_before, -> (date) { where(arel_table[:joined_on].lt(date)) }
-    scope :joined_after, -> (date) { where(arel_table[:joined_on].gteq(date)) }
+    scope :without_status, -> (statuses) {
+      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where.not(id: MembershipStatus.where(status: statuses).select(:membership_id))
+    }
+
+    scope :with_category, -> (categories) {
+      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where(id: MembershipCategory.where(category: categories).select(:membership_id))
+    }
+
+    scope :without_category, -> (categories) {
+      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where.not(id: MembershipCategory.where(category: categories).select(:membership_id))
+    }
+
+    scope :joined_before, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+      where(arel_table[:joined_on].lt(date))
+    }
+
+    scope :joined_after, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+      where(arel_table[:joined_on].gteq(date))
+    }
 
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
@@ -49,6 +70,11 @@ module Effective
       joined.merge(unpaid)
     }
 
+    scope :not_in_good_standing, -> { with_status(EffectiveMemberships.Registrar.not_in_good_standing_status) }
+    scope :in_good_standing, -> { without_status(EffectiveMemberships.Registrar.not_in_good_standing_status) }
+
+    scope :directory, -> { deep.in_good_standing.order(:id) }
+
     before_validation do
       self.registration_on ||= joined_on
     end
@@ -76,6 +102,11 @@ module Effective
       maximum('number_as_integer') || 0
     end
 
+    def self.owner_klasses
+      klasses = Effective::Membership.distinct(:owner_type).pluck(:owner_type)
+      klasses.select { |klass| klass.safe_constantize }.map { |klass| klass.constantize }
+    end
+
     def to_s
       return 'membership' if owner.blank?
 
@@ -87,8 +118,7 @@ module Effective
         'member',
         ("##{number_was}" if number_was.present?),
         "who joined #{joined_on&.strftime('%F') || '-'}",
-        ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on),
-        (". Membership is Not In Good Standing because #{bad_standing_reason}" if bad_standing?)
+        ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on)
       ].compact.join(' ')
 
       (summary + '.').html_safe
@@ -170,8 +200,12 @@ module Effective
       registration_on.present? && joined_on.present? && registration_on > joined_on
     end
 
-    def good_standing?
-      !bad_standing?
+    def not_in_good_standing?
+      membership_statuses.any? { |ms| ms.status.not_in_good_standing? }
+    end
+
+    def in_good_standing?
+      membership_statuses.none? { |ms| ms.status.not_in_good_standing? }
     end
 
     def fees_paid?
@@ -222,7 +256,7 @@ module Effective
       # Otherwise build fees right now
       EffectiveMemberships.Registrar.create_renewal_fees!(self, period: period)
       EffectiveMemberships.Registrar.create_late_fees!(self, period: period)
-      EffectiveMemberships.Registrar.update_membership_status!(self, period: period)
+      EffectiveMemberships.Registrar.create_not_in_good_standing!(self, period: period)
 
       true
     end

data/app/models/effective/membership_directory.rb

@@ -0,0 +1,5 @@
+module Effective
+  class MembershipDirectory
+    include EffectiveMembershipsDirectory
+  end
+end

data/app/models/effective/membership_history.rb

@@ -3,18 +3,17 @@ module Effective
     belongs_to :owner, polymorphic: true
 
     effective_resource do
-      start_on       :date
-      end_on         :date
+      start_on        :date
+      end_on          :date
 
-      number         :string
+      number          :string
 
-      bad_standing   :boolean
-      removed        :boolean
+      removed         :boolean
 
       categories      :text
       category_ids    :text
 
-      notes          :text
+      notes           :text
 
       timestamps
     end
@@ -65,6 +64,5 @@ module Effective
       assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
     end
 
-
   end
 end

data/app/models/effective/registrar.rb

@@ -11,8 +11,8 @@ module Effective
       Date.new(period.year, 2, 1) # Fees are late after February 1st
     end
 
-    def bad_standing_date(period:)
-      Date.new(period.year, 3, 1) # Membership in bad standing after March 1st
+    def not_in_good_standing_date(period:)
+      Date.new(period.year, 3, 1) # Membership are Not In Good Standing after March 1st
     end
 
   end

data/app/models/effective/registrar_action.rb

@@ -9,9 +9,6 @@ module Effective
     attr_accessor :current_action
     attr_accessor :owner, :owner_id, :owner_type
 
-    # Bad Standing
-    attr_accessor :bad_standing_reason
-
     # Register
     attr_accessor :status_id
 
@@ -39,9 +36,6 @@ module Effective
     validates :current_user, presence: true
     validates :owner, presence: true
 
-    # Bad Standing
-    validates :bad_standing_reason, presence: true, if: -> { current_action == :bad_standing }
-
     # Reclassification & Register
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
@@ -84,16 +78,6 @@ module Effective
       EffectiveMemberships.Registrar.assign!(owner, categories: categories, statuses: statuses, number: number)
     end
 
-    def good_standing!
-      update!(current_action: :good_standing)
-      EffectiveMemberships.Registrar.good_standing!(owner)
-    end
-
-    def bad_standing!
-      update!(current_action: :bad_standing)
-      EffectiveMemberships.Registrar.bad_standing!(owner, reason: bad_standing_reason)
-    end
-
     def fees_paid!
       update!(current_action: :fees_paid)
       EffectiveMemberships.Registrar.fees_paid!(owner, order_attributes: order_attributes)

data/app/views/admin/categories/_form_fees.html.haml

@@ -45,12 +45,12 @@
       .col-3= f.price_field :late_fee
 
   %h3 Bad Standing
-  = f.check_box :create_bad_standing, label: 'Yes, bad standing status should be applied'
+  = f.check_box :create_not_in_good_standing, label: 'Yes, Not in Good Standing status should be applied'
 
-  = f.show_if(:create_bad_standing, true) do
+  = f.show_if(:create_not_in_good_standing, true) do
     - period = EffectiveMemberships.Registrar.current_period
-    - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
+    - date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: period)
 
-    %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked in bad standing.
+    %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked #{badge('Not In Good Standing')}.
 
   = f.submit

data/app/views/admin/membership_histories/_form.html.haml

@@ -4,7 +4,7 @@
     = f.hidden_field :owner_type
   - else
     - raise('todo')
-    - collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
+    /- collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
     = f.select :owner_id, collection, polymorphic: true
 
   = f.date_field :start_on, hint: 'The start date of this period in history. Must be present.'
@@ -15,7 +15,8 @@
   = f.select :membership_category_ids, EffectiveMemberships.Category.all.sorted, label: 'Membership Categories', hint: 'The membership category or categories held during this period in history.'
   = f.select :membership_status_ids, EffectiveMemberships.Status.all.sorted, label: 'Membership Statuses', hint: 'The membership status or statuses held during this period in history.'
 
-  = f.check_box :bad_standing, hint: 'Membership in bad standing'
   = f.check_box :removed, hint: 'Membership removed'
 
+  = f.text_area :notes
+
   = f.submit 'Update History', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

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

@@ -12,6 +12,6 @@
   - if owner.registrar_action_statuses(:status_change).present?
     .mb-4= render 'admin/registrar_actions/form_status_change', registrar_action: registrar_action
 
-  .mb-4= render 'admin/registrar_actions/form_bad_standing', registrar_action: registrar_action
+  .mb-4= render 'admin/registrar_actions/form_not_in_good_standing', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_fees_paid', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_remove', registrar_action: registrar_action

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

@@ -0,0 +1,23 @@
+.card
+  .card-body
+    %h5.card-title Not In Good Standing
+
+    - period = EffectiveMemberships.Registrar.current_period
+    - date = (EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) rescue false)
+
+    %p.text-muted
+      - if date.present?
+        Members with outstanding renewal fees are automatically marked
+        not in good standing on #{date.strftime('%B %e')}.
+        The status is cleared when they pay their fees.
+      - else
+        Members with outstanding renewal fees are not automatically marked not in good standing.
+
+    = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+      - membership = f.object.owner.membership
+
+      = f.static_field :current_action, label: 'Current Status' do
+        - if membership.not_in_good_standing?
+          Not In Good Standing
+        - else
+          In Good Standing

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

@@ -12,9 +12,9 @@
     - date = EffectiveMemberships.Registrar.late_fee_date(period: Time.zone.now)
     %p Late fees will be applied on #{date.strftime('%B %e')}.
 
-  - if memberships.any? { |membership| membership.categories.any?(&:create_bad_standing?) }
-    - date = EffectiveMemberships.Registrar.bad_standing_date(period: Time.zone.now)
-    %p Memberships with unpaid fees or dues will be marked in bad standing on #{date.strftime('%B %e')}.
+  - if memberships.any? { |membership| membership.categories.any?(&:create_not_in_good_standing?) }
+    - date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: Time.zone.now)
+    %p Memberships with unpaid fees or dues will be marked Not In Good Standing on #{date.strftime('%B %e')}.
 
 - if outstanding_owners.present?
   .alert.alert-warning.mb-3 You have outstanding fees or dues ready to purchase.

data/app/views/effective/membership_directory/_form.html.haml

@@ -0,0 +1,11 @@
+= effective_form_with(scope: :q, model: membership_directory, method: :get, url: request.path) do |f|
+  - if f.object.term.present?
+    = f.search_field :term, label: 'Name'
+
+  = f.search_field :first_name
+  = f.search_field :last_name
+
+  = f.select :category, EffectiveMemberships.Category.all
+
+  = f.save('Search', class: 'btn btn-primary btn-search mr-3', name: nil)
+  = link_to 'Reset filters', request.path

data/app/views/effective/membership_directory/_layout.html.haml

@@ -0,0 +1,2 @@
+.effective-membership-directory
+  = yield

data/app/views/effective/membership_directory/_membership.html.haml

@@ -0,0 +1,4 @@
+= card do
+  %h6= membership.owner
+  %p= membership.categories.to_sentence
+  %p= membership.statuses.to_sentence

data/app/views/effective/membership_directory/_membership_directory.html.haml

@@ -0,0 +1,16 @@
+= render 'layout' do
+  = render('effective/membership_directory/form', membership_directory: membership_directory)
+
+  - results = membership_directory.results(page: params[:page])
+
+  - if membership_directory.present? && results.length == 0
+    .alert.alert-info There are no results for your search. Please try again.
+
+  - results.in_groups_of(3).each do |group|
+    .row.mt-4
+      - group.each do |membership|
+        - next unless membership
+        .col-md= render('effective/membership_directory/membership', membership: membership)
+
+  %nav.d-flex.justify-content-center
+    = bootstrap_paginate(results, per_page: membership_directory.per_page)

data/app/views/effective/membership_directory/index.html.haml

@@ -0,0 +1,2 @@
+/= render_datatable(@datatable, buttons: false)
+= render('effective/membership_directory/membership_directory', membership_directory: @membership_directory)

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

@@ -30,8 +30,8 @@
   - if membership.registration_on > membership.joined_on
     %p You last changed categories on #{membership.registration_on.strftime('%F')}.
 
-  - if membership.bad_standing?
-    %p Your membership is in bad standing with the following reason: #{membership.bad_standing_reason}.
+  - if membership.not_in_good_standing?
+    %p Your membership is Not In Good Standing because of unpurchased fees or dues. Please purchase these dues or contact us.
 
 - if current_user.membership_removed?
   %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.

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

@@ -23,6 +23,21 @@
           - membership.categories.each do |category|
             %div= category
 
+    - if membership.statuses.length == 0
+      %tr
+        %th Status
+        %td None
+    - elsif membership.statuses.length == 1
+      %tr
+        %th Status
+        %td= membership.status
+    - else
+      %tr
+        %th Statuses
+        %td
+          - membership.statuses.each do |status|
+            %div= status
+
     %tr
       %th Number
       %td= membership.number
@@ -30,11 +45,3 @@
     %tr
       %th Fees Paid Through
       %td= membership.fees_paid_through_period&.strftime('%F') || '-'
-
-    %tr
-      %th In Bad Standing
-      %td
-        - if membership.bad_standing?
-          %p Yes. #{membership.bad_standing_reason}
-        - else
-          = '-'

data/config/effective_memberships.rb

@@ -20,6 +20,7 @@ EffectiveMemberships.setup do |config|
   # config.applicant_review_class_name = 'Effective::ApplicantReview'
   # config.fee_payment_class_name = 'Effective::FeePayment'
   # config.membership_card_class_name = 'Effective::MembershipCard'
+  # config.membership_directory_class_name = 'Effective::MembershipDirectory'
   # config.registrar_class_name = 'Effective::Registrar'
   # config.organization_class_name = 'Effective::Organization'
   # config.status_class_name = 'Effective::Status'

data/config/routes.rb

@@ -26,7 +26,8 @@ EffectiveMemberships::Engine.routes.draw do
       resources :build, controller: :fee_payments, only: [:show, :update]
     end
 
-    get '/directory', to: 'memberships_directory#index'
+    resources :membership_directory, only: :index
+    get '/directory', to: 'membership_directory#index'
 
     resources :membership_cards, only: :index
 

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -54,7 +54,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.boolean :create_late_fees, default: false
       t.integer :late_fee
 
-      t.boolean :create_bad_standing, default: false
+      t.boolean :create_not_in_good_standing, default: false
 
       t.string :qb_item_name
       t.boolean :tax_exempt, default: false
@@ -95,10 +95,6 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.date :fees_paid_period
       t.date :fees_paid_through_period
 
-      t.boolean :bad_standing, default: false
-      t.boolean :bad_standing_admin, default: false
-      t.text :bad_standing_reason
-
       t.datetime :updated_at
       t.datetime :created_at
     end
@@ -140,7 +136,6 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
 
       t.string :number
 
-      t.boolean :bad_standing, default: false
       t.boolean :removed, default: false
 
       t.text :notes
@@ -474,7 +469,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
 
       t.date :period
       t.date :late_on
-      t.date :bad_standing_on
+      t.date :not_in_good_standing_on
 
       t.string :title
       t.integer :price

data/db/seeds.rb

@@ -12,6 +12,7 @@ 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!
+Effective::Status.where(title: 'Not In Good Standing').first_or_create!
 
 member = Effective::Category.create!(
   title: "Full Member",

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.7.7'
+  VERSION = '0.8.1'
 end

data/lib/effective_memberships.rb

@@ -7,7 +7,7 @@ module EffectiveMemberships
   def self.config_keys
     [
       :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name, :statuses_table_name,
-      :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name, :status_class_name,
+      :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name, :membership_directory_class_name, :status_class_name,
       :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
@@ -40,6 +40,10 @@ module EffectiveMemberships
     membership_card_class_name&.constantize || Effective::MembershipCard
   end
 
+  def self.MembershipDirectory
+    membership_directory_class_name&.constantize || Effective::MembershipDirectory
+  end
+
   def self.Status
     status_class_name&.constantize || Effective::Status
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -275,7 +275,7 @@ files:
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
 - app/controllers/effective/membership_cards_controller.rb
-- app/controllers/effective/memberships_directory_controller.rb
+- app/controllers/effective/membership_directory_controller.rb
 - app/controllers/effective/organizations_controller.rb
 - app/controllers/effective/representatives_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
@@ -312,6 +312,7 @@ files:
 - app/models/concerns/effective_memberships_applicant_review.rb
 - app/models/concerns/effective_memberships_card.rb
 - app/models/concerns/effective_memberships_category.rb
+- app/models/concerns/effective_memberships_directory.rb
 - app/models/concerns/effective_memberships_fee_payment.rb
 - app/models/concerns/effective_memberships_organization.rb
 - app/models/concerns/effective_memberships_owner.rb
@@ -334,6 +335,7 @@ files:
 - app/models/effective/membership.rb
 - app/models/effective/membership_card.rb
 - app/models/effective/membership_category.rb
+- app/models/effective/membership_directory.rb
 - app/models/effective/membership_history.rb
 - app/models/effective/membership_status.rb
 - app/models/effective/organization.rb
@@ -377,8 +379,8 @@ files:
 - app/views/admin/organizations/_form_organization.html.haml
 - app/views/admin/registrar_actions/_form.html.haml
 - app/views/admin/registrar_actions/_form_assign.html.haml
-- app/views/admin/registrar_actions/_form_bad_standing.html.haml
 - app/views/admin/registrar_actions/_form_fees_paid.html.haml
+- app/views/admin/registrar_actions/_form_not_in_good_standing.html.haml
 - app/views/admin/registrar_actions/_form_reclassify.html.haml
 - app/views/admin/registrar_actions/_form_register.html.haml
 - app/views/admin/registrar_actions/_form_remove.html.haml
@@ -477,9 +479,13 @@ files:
 - app/views/effective/fees/_dashboard.html.haml
 - app/views/effective/fees/_fee.html.haml
 - app/views/effective/membership_cards/index.html.haml
+- app/views/effective/membership_directory/_form.html.haml
+- app/views/effective/membership_directory/_layout.html.haml
+- app/views/effective/membership_directory/_membership.html.haml
+- app/views/effective/membership_directory/_membership_directory.html.haml
+- app/views/effective/membership_directory/index.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
-- app/views/effective/memberships_directory/index.html.haml
 - app/views/effective/memberships_mailer/applicant_approved.liquid
 - app/views/effective/memberships_mailer/applicant_completed.liquid
 - app/views/effective/memberships_mailer/applicant_declined.liquid

data/app/controllers/effective/memberships_directory_controller.rb

@@ -1,14 +0,0 @@
-module Effective
-  class MembershipsDirectoryController < ApplicationController
-    include Effective::CrudController
-
-    def index
-      @page_title = 'Directory'
-
-      EffectiveResources.authorize!(self, :index, Effective::Membership)
-
-      @datatable = EffectiveResources.best('EffectiveMembershipsDirectoryDatatable').new
-    end
-
-  end
-end

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

@@ -1,44 +0,0 @@
-.card
-  .card-body
-    %h5.card-title Not In Good Standing
-
-    = 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
-
-      - membership = f.object.owner.membership
-
-      - period = EffectiveMemberships.Registrar.current_period
-      - date = (EffectiveMemberships.Registrar.bad_standing_date(period: period) rescue false)
-
-      %p.text-muted
-        - if date.present?
-          Members with outstanding renewal fees are automatically marked
-          not in good standing on #{date.strftime('%B %e')}.
-          The status is cleared when they pay their fees.
-          You can also mark a member as always in bad standing.
-
-      = f.static_field :current_action, label: 'Current Status' do
-
-        - if membership.bad_standing_admin?
-          In Bad Standing (set by an Admin) with the following reason: #{membership.bad_standing_reason}.
-        - elsif membership.bad_standing?
-          In Bad Standing with the following reason: #{membership.bad_standing_reason}.
-        - else
-          In Good Standing
-
-      - if membership.good_standing?
-        = f.check_box :current_action, label: 'Yes, set this member in bad standing'
-
-        = f.show_if :current_action, true do
-          = f.text_area :bad_standing_reason, required: true
-
-          = f.submit 'Set In Bad Standing', border: false, center: true,
-            'data-confirm': "Really set #{f.object.owner} in bad standing?"
-
-      - if membership.bad_standing_admin?
-        = f.check_box :current_action, label: 'Yes, remove in bad standing status'
-
-        = f.show_if :current_action, true do
-          = f.submit 'Remove In Bad Standing', border: false, center: true,
-            'data-confirm': "Really remove #{f.object.owner} bad standing?"

data/app/views/effective/memberships_directory/index.html.haml

@@ -1 +0,0 @@
-= render_datatable(@datatable, buttons: false)