effective_memberships 0.3.14 → 0.4.0

data/app/models/concerns/effective_memberships_category.rb

@@ -16,6 +16,10 @@ module EffectiveMembershipsCategory
   module ClassMethods
     def effective_memberships_category?; true; end
 
+    def category_types
+      ['Individual', 'Organization']
+    end
+
     def categories
       []
     end
@@ -35,6 +39,8 @@ module EffectiveMembershipsCategory
     has_many :membership_categories, class_name: 'Effective::MembershipCategory', as: :category
 
     effective_resource do
+      category_type         :string
+
       title                 :string
       category              :string
       position              :integer
@@ -110,17 +116,18 @@ module EffectiveMembershipsCategory
     scope :create_bad_standing, -> { where(create_bad_standing: true) }
 
     validates :title, presence: true, uniqueness: true
-
+    validates :category_type, presence: true
     validates :position, presence: true
 
-    after_initialize(if: -> { new_record? }) do
-      self.applicant_wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
-      self.applicant_review_wizard_steps = EffectiveMemberships.ApplicantReview.all_wizard_steps
-      self.fee_payment_wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
+    before_validation do
+      self.applicant_wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps if applicant_wizard_steps.blank?
+      self.applicant_review_wizard_steps = EffectiveMemberships.ApplicantReview.all_wizard_steps if applicant_review_wizard_steps.blank?
+      self.fee_payment_wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps if fee_payment_wizard_steps.blank?
     end
 
     before_validation do
       self.position ||= (self.class.pluck(:position).compact.max || -1) + 1
+      self.category_type ||= self.class.category_types.first
     end
 
     with_options(if: -> { can_apply? }) do
@@ -155,6 +162,14 @@ module EffectiveMembershipsCategory
     can_apply_new? || can_apply_existing? || can_apply_restricted?
   end
 
+  def individual?
+    category_type == 'Individual'
+  end
+
+  def organization?
+    category_type == 'Organization'
+  end
+
   def prorated_fee(date:)
     send("prorated_#{date.strftime('%b').downcase}").to_i
   end
@@ -167,6 +182,18 @@ module EffectiveMembershipsCategory
     Array(self[:can_apply_restricted_ids]) - [nil, '']
   end
 
+  def optional_applicant_wizard_steps
+    applicant_wizard_steps - EffectiveMemberships.Applicant.required_wizard_steps
+  end
+
+  def optional_fee_payment_wizard_steps
+    fee_payment_wizard_steps - EffectiveMemberships.FeePayment.required_wizard_steps
+  end
+
+  def optional_applicant_review_wizard_steps
+    applicant_review_wizard_steps - EffectiveMemberships.ApplicantReview.required_wizard_steps
+  end
+
   def applicant_wizard_steps
     (Array(self[:applicant_wizard_steps]) - [nil, '']).map(&:to_sym)
   end

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -32,7 +32,8 @@ module EffectiveMembershipsFeePayment
 
     acts_as_wizard(
       start: 'Start',
-      demographics: 'Demographics',
+      demographics: 'Demographics',         # Individual only. Users fields.
+      organization: 'Organization',         # Organization only. Organization fields.
       declarations: 'Declarations',
       summary: 'Review',
       billing: 'Billing Address',
@@ -48,23 +49,20 @@ module EffectiveMembershipsFeePayment
     attr_accessor :declare_code_of_ethics
     attr_accessor :declare_truth
 
-    # Throwaway
-    attr_accessor :upgrade, :downgrade
-
     # Application Namespace
-    belongs_to :owner, polymorphic: true
-    accepts_nested_attributes_for :owner
-
-    belongs_to :user, polymorphic: true, optional: true
+    belongs_to :user, polymorphic: true
     accepts_nested_attributes_for :user
 
+    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
 
+    # Effective Namespace
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
-    # Effective Namespace
     has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
 
@@ -83,24 +81,32 @@ module EffectiveMembershipsFeePayment
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, :category, :orders) }
+    scope :deep, -> { includes(:user, :organization, :category, :orders) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:submitted]) }
     scope :done, -> { where(status: [:submitted]) }
 
+    scope :for, -> (user) {
+      raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
+      where(user: user).or(where(organization: user.organizations))
+    }
+
     before_validation do
       self.period ||= EffectiveMemberships.Registrar.current_period
     end
 
-    before_validation(if: -> { current_step == :start && owner && owner.membership }) do
-      self.category ||= owner.membership.categories.first if owner.membership.categories.length == 1
+    before_validation(if: -> { new_record? || current_step == :start }) do
+      self.organization_type = (EffectiveMemberships.Organization.name if organization_id.present?)
     end
 
-    validates :period, presence: true
+    before_validation(if: -> { current_step == :start && user && user.membership }) do
+      self.category ||= user.membership.categories.first if user.membership.categories.length == 1
+    end
 
     # All Steps validations
-    validates :owner, presence: true
+    validates :user, presence: true
+    validates :period, presence: true
 
     # Declarations Step
     with_options(if: -> { current_step == :declarations }) do
@@ -121,6 +127,9 @@ module EffectiveMembershipsFeePayment
 
         fee_payment_steps = Array(category&.fee_payment_wizard_steps)
 
+        fee_payment_steps.delete(:organization) unless organization?
+
+
         wizard_steps.select do |step|
           required_steps.include?(step) || category.blank? || fee_payment_steps.include?(step)
         end
@@ -129,10 +138,6 @@ module EffectiveMembershipsFeePayment
 
     # All Fees and Orders
     # Overriding acts_as_purchasable_wizard
-    def outstanding_fees
-      owner&.outstanding_fee_payment_fees
-    end
-
     def submit_fees
       fees
     end
@@ -143,7 +148,7 @@ module EffectiveMembershipsFeePayment
 
     # We take over the owner's outstanding fees.
     def find_or_build_submit_fees
-      Array(outstanding_fees).each { |fee| fees << fee unless fees.include?(fee) }
+      Array(owner.outstanding_fee_payment_fees).each { |fee| fees << fee unless fees.include?(fee) }
       submit_fees
     end
 
@@ -157,6 +162,26 @@ module EffectiveMembershipsFeePayment
     'Fee Payment'
   end
 
+  def owner
+    organization || user
+  end
+
+  def owner_symbol
+    organization? ? :organization : :user
+  end
+
+  def build_organization(params = {})
+    self.organization = EffectiveMemberships.Organization.new(params)
+  end
+
+  def individual?
+    !owner.kind_of?(EffectiveMemberships.Organization)
+  end
+
+  def organization?
+    owner.kind_of?(EffectiveMemberships.Organization)
+  end
+
   # Instance Methods
   def in_progress?
     draft?
@@ -175,30 +200,4 @@ module EffectiveMembershipsFeePayment
     save!
   end
 
-  # Work with effective_organizations
-  def organization!
-    if upgrade_individual_to_organization?
-      save!
-      update!(owner: owner.representatives.first.organization)
-    elsif downgrade_organization_to_individual?
-      save!
-      update!(owner: current_user)
-    else
-      save!
-    end
-  end
-
-  def upgrade_individual_to_organization?
-    return false unless EffectiveResources.truthy?(upgrade)
-    return false unless owner.class.respond_to?(:effective_organizations_user?)
-    owner.representatives.any?(&:new_record?)
-  end
-
-  def downgrade_organization_to_individual?
-    return false unless EffectiveResources.truthy?(downgrade)
-    return false unless owner.class.respond_to?(:effective_organizations_organization?)
-    return false if current_user.blank?
-    owner.representatives.any?(&:marked_for_destruction?)
-  end
-
 end

data/app/models/concerns/effective_memberships_organization.rb

@@ -0,0 +1,94 @@
+# EffectiveMembershipsOrganization
+#
+# Mark your category model with effective_memberships_organization to get all the includes
+
+module EffectiveMembershipsOrganization
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_memberships_organization
+      include ::EffectiveMembershipsOrganization
+    end
+  end
+
+  module ClassMethods
+    def effective_memberships_organization?; true; end
+
+    def categories
+      []
+    end
+  end
+
+  included do
+    effective_memberships_owner
+
+    acts_as_addressable :billing # effective_addresses
+    log_changes(except: [:representatives, :users]) if respond_to?(:log_changes)
+
+    # rich_text_body
+    # has_many_rich_texts
+
+    # App scoped
+    has_many :applicants, -> { order(:id) }, inverse_of: :organization, as: :organization
+    has_many :fee_payments, -> { order(:id) }, inverse_of: :organization, as: :organization
+
+    # Effective scoped
+    has_many :representatives, -> { Effective::Representative.sorted },
+      class_name: 'Effective::Representative', inverse_of: :organization, dependent: :delete_all
+
+    accepts_nested_attributes_for :representatives, allow_destroy: true
+
+    effective_resource do
+      title                 :string
+      email                 :string
+
+      phone                 :string
+      fax                   :string
+      website               :string
+
+      category              :string
+
+      notes                 :text
+
+      roles_mask            :integer
+      archived              :boolean
+
+      representatives_count :integer # Counter cache
+
+      timestamps
+    end
+
+    scope :deep, -> { includes(:representatives) }
+    scope :sorted, -> { order(:title) }
+
+    validates :title, presence: true, uniqueness: true
+    validates :email, presence: true
+  end
+
+  # Instance Methods
+  def to_s
+    title.presence || 'organization'
+  end
+
+  def membership_present?
+    membership.present? && !membership.marked_for_destruction?
+  end
+
+  def outstanding_fee_payment_fees
+    fees.select { |fee| fee.fee_payment_fee? && !fee.purchased? }
+  end
+
+  def representative(user:)
+    representatives.find { |rep| rep.user_id == user.id }
+  end
+
+  # Find or build
+  def build_representative(user:)
+    representative(user: user) || representatives.build(user: user)
+  end
+
+  def users
+    representatives.reject(&:marked_for_destruction?).map(&:user)
+  end
+
+end

data/app/models/concerns/effective_memberships_owner.rb

@@ -23,10 +23,6 @@ module EffectiveMembershipsOwner
   included do
     acts_as_role_restricted unless respond_to?(:acts_as_role_restricted?)
 
-    # App scoped
-    has_many :applicants, -> { order(:id) }, inverse_of: :owner, as: :owner
-    has_many :fee_payments, -> { order(:id) }, inverse_of: :owner, as: :owner
-
     # Effective scoped
     has_many :fees, -> { order(:id) }, inverse_of: :owner, as: :owner, class_name: 'Effective::Fee', dependent: :nullify
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
@@ -40,48 +36,9 @@ module EffectiveMembershipsOwner
     has_many :membership_histories, -> { Effective::MembershipHistory.sorted }, inverse_of: :owner, as: :owner, class_name: 'Effective::MembershipHistory'
     accepts_nested_attributes_for :membership_histories
 
-    effective_resource do
-      timestamps
-    end
-
     scope :members, -> { joins(:membership) }
   end
 
-  def effective_memberships_owner
-    raise('expected singular usage but there are more than one owner') if effective_memberships_owners.length > 1
-    effective_memberships_owners.first
-  end
-
-  def effective_memberships_owners
-    owners = organizations if self.class.respond_to?(:effective_organizations_user?)
-    owners = users if self.class.respond_to?(:effective_organizations_organization?)
-
-    owners = Array(owners)
-      .select { |owner| owner.class.respond_to?(:effective_memberships_owner?) }
-      .reject { |owner| owner.try(:archived?) }
-
-    owners.presence || [self]
-  end
-
-  # This is the calculated way of determining if an owner is a member or not.
-  # The correct way to check for membership is: current_user.is?(:member)
-  def membership_present?
-    individual_membership_present? || organization_membership_present?
-  end
-
-  def individual_membership_present?
-    membership.present? && !membership.marked_for_destruction?
-  end
-
-  def organization_membership_present?(except: nil)
-    return false unless self.class.respond_to?(:effective_organizations_user?)
-
-    organizations
-      .select { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
-      .reject { |organization| organization.try(:archived?) }
-      .any? { |organization| organization != except && organization.membership_present? }
-  end
-
   def assign_member_role
     membership_present? ? add_role(:member) : remove_role(:member)
   end
@@ -92,18 +49,6 @@ module EffectiveMembershipsOwner
     save!
   end
 
-  def outstanding_fee_payment_owners
-    effective_memberships_owners.select { |owner| !owner.membership_fees_paid? }
-  end
-
-  def current_fee_payment_owner
-    outstanding_fee_payment_owners.first || self
-  end
-
-  def owner_label
-    self.class.name.split('::').last
-  end
-
   def membership_fees_paid?
     outstanding_fee_payment_fees.blank? && membership && membership.fees_paid?
   end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -305,7 +305,7 @@ module EffectiveMembershipsRegistrar
   def add_member_role(owner)
     owner.add_role(:member)
 
-    if owner.class.respond_to?(:effective_organizations_organization?)
+    if owner.class.respond_to?(:effective_memberships_organization?)
       organization = owner
       organization.representatives.each { |representative| representative.user.add_role(:member) }
     end
@@ -316,7 +316,7 @@ module EffectiveMembershipsRegistrar
   def remove_member_role(owner)
     owner.remove_role(:member)
 
-    if owner.class.respond_to?(:effective_organizations_organization?)
+    if owner.class.respond_to?(:effective_memberships_organization?)
       organization = owner
 
       organization.representatives.each do |representative|

data/app/models/concerns/effective_memberships_user.rb

@@ -0,0 +1,70 @@
+# EffectiveMembershipsUser
+#
+# Mark your user model with effective_memberships_user to get all the includes
+
+module EffectiveMembershipsUser
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_memberships_user
+      include ::EffectiveMembershipsUser
+    end
+  end
+
+  module ClassMethods
+    def effective_memberships_user?; true; end
+  end
+
+  included do
+    effective_memberships_owner
+
+    # App scoped
+    has_many :applicants, -> { order(:id) }, inverse_of: :user, as: :user
+    has_many :fee_payments, -> { order(:id) }, inverse_of: :user, as: :user
+
+    # Effective Scoped
+    has_many :representatives, -> { Effective::Representative.sorted },
+      class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
+
+    accepts_nested_attributes_for :representatives, allow_destroy: true
+  end
+
+  # Instance Methods
+  def memberships
+    Array(membership) + membership_organizations.map(&:membership)
+  end
+
+  def memberships_owners
+    Array(is?(:member) ? self : nil) + membership_organizations
+  end
+
+  def membership_present?
+    individual_membership_present? || organization_membership_present?
+  end
+
+  def individual_membership_present?
+    membership.present? && !membership.marked_for_destruction?
+  end
+
+  def organization_membership_present?(except: nil)
+    organizations.reject(&:archived?).any? { |organization| organization != except && organization.membership_present? }
+  end
+
+  def representative(organization:)
+    representatives.find { |rep| rep.organization_id == organization.id } if organization
+  end
+
+  # Find or build
+  def build_representative(organization:)
+    representative(organization: organization) || representatives.build(organization: organization)
+  end
+
+  def organizations
+    representatives.reject(&:marked_for_destruction?).map(&:organization)
+  end
+
+  def membership_organizations
+    organizations.select { |organization| organization.is?(:member) && !organization.archived? }
+  end
+
+end

data/app/models/effective/fee.rb

@@ -4,7 +4,7 @@ module Effective
 
     log_changes(to: :owner) if respond_to?(:log_changes)
 
-    # Every fee is charged to a owner
+    # Every fee is charged to a owner: a user or an organization
     belongs_to :owner, polymorphic: true
 
     # This fee may belong to an application, fee payment, or other parent model

data/app/models/effective/organization.rb

@@ -0,0 +1,8 @@
+module Effective
+  class Organization < ActiveRecord::Base
+    self.table_name = EffectiveMemberships.organizations_table_name.to_s
+
+    effective_memberships_organization
+
+  end
+end

data/app/models/effective/representative.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Effective
+  class Representative < ActiveRecord::Base
+    attr_accessor :new_representative_user_action
+
+    acts_as_role_restricted
+
+    log_changes(to: :organization) if respond_to?(:log_changes)
+
+    belongs_to :organization, polymorphic: true, counter_cache: true
+    belongs_to :user, polymorphic: true
+
+    accepts_nested_attributes_for :organization
+    accepts_nested_attributes_for :user
+
+    effective_resource do
+      roles_mask    :integer
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:id) }
+    scope :deep, -> { includes(:user, :organization) }
+
+    before_validation(if: -> { user && user.new_record? }) do
+      user.password ||= SecureRandom.base64(12) + '!@#123abcABC-'
+    end
+
+    after_commit(on: [:create, :destroy], if: -> { user.class.respond_to?(:effective_memberships_owner?) }) do
+      user.representatives.reload
+      user.update_member_role!
+    end
+
+    validates :organization, presence: true
+    validates :user, presence: true
+
+    validates :user_id, if: -> { user_id && user_type && organization_id && organization_type },
+      uniqueness: { scope: [:organization_id, :organization_type], message: 'already belongs to this organization' }
+
+    def to_s
+      user.to_s
+    end
+
+    def build_user(attributes = {})
+      raise('please assign user_type first') if user_type.blank?
+      self.user = user_type.constantize.new(attributes)
+    end
+
+    def build_organization(attributes = {})
+      raise('please assign organization_type first') if organization_type.blank?
+      self.organization = organization_type.constantize.new(attributes)
+    end
+
+  end
+end

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

@@ -2,7 +2,7 @@
   %h3 Eligibility
   %p Please configure who may apply for this membership category.
 
-  = f.check_box :can_apply_new, label: 'Yes, new users may apply to join'
+  = f.check_box :can_apply_new, label: 'Yes, new applicants may apply to join'
   = f.check_box :can_apply_existing, label: 'Yes, existing members of any category may apply to join'
   = f.check_box :can_apply_restricted, label: 'Only existing members of the following categories may apply to join'
 

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

@@ -14,29 +14,34 @@
 
   %table.table.table-sm
     %tbody
-      %tr
-        %td= applicant.wizard_step_title(:education)
-        %td= f.number_field :min_applicant_educations, label: false
-        %td minimum number of degrees
-
-      %tr
-        %td= applicant.wizard_step_title(:course_amounts)
-        %td= f.number_field :min_applicant_courses, label: false
-        %td minimum number of courses
-
-      %tr
-        %td= applicant.wizard_step_title(:experience)
-        %td= f.number_field :min_applicant_experiences_months, label: false
-        %td minimimum months of work experience
-
-      %tr
-        %td= applicant.wizard_step_title(:references)
-        %td= f.number_field :min_applicant_references, label: false
-        %td minimimum number of references
-
-      %tr
-        %td= applicant.wizard_step_title(:files)
-        %td= f.number_field :min_applicant_files, label: false
-        %td minimimum number of attached files
+      - if applicant.wizard_step_keys.include?(:education)
+        %tr
+          %td= applicant.wizard_step_title(:education)
+          %td= f.number_field :min_applicant_educations, label: false
+          %td minimum number of degrees
+
+      - if applicant.wizard_step_keys.include?(:course_amounts)
+        %tr
+          %td= applicant.wizard_step_title(:course_amounts)
+          %td= f.number_field :min_applicant_courses, label: false
+          %td minimum number of courses
+
+      - if applicant.wizard_step_keys.include?(:experience)
+        %tr
+          %td= applicant.wizard_step_title(:experience)
+          %td= f.number_field :min_applicant_experiences_months, label: false
+          %td minimimum months of work experience
+
+      - if applicant.wizard_step_keys.include?(:references)
+        %tr
+          %td= applicant.wizard_step_title(:references)
+          %td= f.number_field :min_applicant_references, label: false
+          %td minimimum number of references
+
+      - if applicant.wizard_step_keys.include?(:files)
+        %tr
+          %td= applicant.wizard_step_title(:files)
+          %td= f.number_field :min_applicant_files, label: false
+          %td minimimum number of attached files
 
   = f.submit

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

@@ -1,6 +1,9 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = f.text_field :title
 
+  = f.select :category_type, f.object.class.category_types,
+    hint: 'When Organization, the organization will be given membership. Otherwise the individual user'
+
   - if f.object.class.categories.present?
     = f.select :category, f.object.class.categories
 

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

@@ -1,6 +1,4 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h2 Renewals
-
   %h3 Renewal Fees
   = f.check_box :create_renewal_fees, label: 'Yes, renewal fees should be created'
 

data/app/views/admin/organizations/_fields.html.haml

@@ -0,0 +1,6 @@
+- categories = EffectiveMemberships.Organization.categories
+
+- if categories.present?
+  = f.select :category, categories, required: true
+
+= f.text_field :title