effective_memberships 0.1.22 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8631bb8b93a7995e011f7adec1de42aeea234db706f39d09e2b82354263e7d79
-  data.tar.gz: 0bbb9dfcd4376d091ed21e9a0e06f2b48e4124b8292c0209d64b5ccb57966ef4
+  metadata.gz: 240ed521dcef407cae7be663d49f877b373012b2fbd8877b787a4fa315539a2b
+  data.tar.gz: 394ebf710135b07e984df6277e80ca2340f8f4e4e61980e127dd0113ea6e2dca
 SHA512:
-  metadata.gz: 81a13b9ff646557e043080d8dcda78b47291bcfd605b648ac6f5617c06fc5c575c10b96ccda6da7416f25580a1245fc230fb7e4a6396ab681a81e5302ff1e421
-  data.tar.gz: cdcb59441b8a561ea6324c30656bac165c67acebb9a593ab7133110a24e38ad32d2b753fe6f539fd87cadd9789df0bb4bcd90b408a735d7817c6b692f9437728
+  metadata.gz: 7602bafa9bd4d86c4d01db0acadf432da1b9af29c7eeee171d3e560baa74037318802e7604282986bbe09230fbee3ae8005ee1f3148ff477422d0ef5ed83d138
+  data.tar.gz: a3d51cf1a5d0941b48d1a3c400115973478acf21c501daf8e79aa61b83bb2109c314c6091d8a8742d1637b21895cd214819c94b53aef5e0743db3371f384bef8

data/app/controllers/effective/applicants_controller.rb

@@ -16,10 +16,6 @@ module Effective
       end
     end
 
-    before_render(only: :show, if: -> { step == :checkout }) do
-      resource.ready!
-    end
-
     after_save do
       flash.now[:success] = ''
     end

data/app/controllers/effective/fee_payments_controller.rb

@@ -16,10 +16,6 @@ module Effective
       end
     end
 
-    before_render(only: :show, if: -> { step == :checkout }) do
-      resource.ready!
-    end
-
     after_save do
       flash.now[:success] = ''
     end

data/app/controllers/effective/memberships_directory_controller.rb

@@ -0,0 +1,14 @@
+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/datatables/admin/effective_memberships_datatable.rb

@@ -8,7 +8,7 @@ module Admin
       col :owner_id, visible: false
       col :owner_type, visible: false
 
-      col :owner
+      val :owner
       col :categories
 
       col :number
@@ -28,7 +28,7 @@ module Admin
     end
 
     collection do
-      memberships = Effective::Membership.deep.all
+      memberships = Effective::Membership.deep.all.includes(:owner)
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -0,0 +1,31 @@
+# Member Directory Datatable
+class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
+  datatable do
+    length 100
+
+    col(:name) { |membership| membership.owner.to_s }
+
+    col :joined_on
+    col :number
+    col :categories, search: :string, label: 'Category'
+  end
+
+  collection do
+    scope = Effective::Membership.deep.includes(:owner)
+
+    archived_klasses.each do |klass|
+      scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)
+    end
+
+    scope
+  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
+  end
+
+end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -60,6 +60,8 @@ module EffectiveMembershipsApplicant
       submitted: 'Submitted'
     )
 
+    acts_as_purchasable_wizard
+
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     has_many_attached :applicant_files
@@ -247,12 +249,6 @@ module EffectiveMembershipsApplicant
       validates :declare_truth, acceptance: true
     end
 
-    # Billing Step
-    validate(if: -> { current_step == :billing && owner.present? }) do
-      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
-      self.errors.add(:base, "must have an email") unless owner.email.present?
-    end
-
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -288,10 +284,47 @@ module EffectiveMembershipsApplicant
       end
     end
 
-    after_purchase do |_|
-      raise('expected submit_order to be purchased') unless submit_order&.purchased?
-      submit_purchased!
+    # All Fees and Orders
+    def submit_fees
+      fees.select { |fee| fee.applicant_submit_fee? }
+    end
+
+    def submit_order
+      orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
+    end
+
+    def submit_fee_qb_item_name
+      'Applicant'
+    end
+
+    def find_or_build_submit_fees
+      return submit_fees if submit_fees.present?
+
+      fees.build(
+        owner: owner,
+        fee_type: 'Applicant',
+        category: category,
+        price: category.applicant_fee,
+        qb_item_name: submit_fee_qb_item_name()
+      )
+
+      submit_fees
+    end
+
+    # Draft -> Submitted requirements
+    def submit!
+      raise('already submitted') if was_submitted?
+      raise('expected a purchased order') unless submit_order&.purchased?
+
+      after_commit do
+        applicant_references.each { |reference| reference.notify! if reference.submitted? }
+      end
+
+      wizard_steps[:checkout] ||= Time.zone.now
+      wizard_steps[:submitted] = Time.zone.now
+      submitted!
     end
+
   end
 
   # Instance Methods
@@ -330,10 +363,6 @@ module EffectiveMembershipsApplicant
     approved? || declined?
   end
 
-  def can_visit_step?(step)
-    can_revisit_completed_steps(step)
-  end
-
   def summary
     case status_was
     when 'draft'
@@ -435,101 +464,9 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_files.to_i
   end
 
-  # All Fees and Orders
-  def submit_fees
-    fees.select { |fee| fee.applicant_submit_fee? }
-  end
-
-  def submit_order
-    orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
-  end
-
-  def submit_fee_qb_item_name
-    'Applicant'
-  end
-
-  def find_or_build_submit_fees
-    return submit_fees if submit_fees.present?
-
-    fees.build(
-      owner: owner,
-      fee_type: 'Applicant',
-      category: category,
-      price: category.applicant_fee,
-      qb_item_name: submit_fee_qb_item_name()
-    )
-
-    submit_fees
-  end
-
-  def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
-
-    # Adds fees, but does not overwrite any existing price.
-    fees.each do |fee|
-      order.add(fee) unless order.purchasables.include?(fee)
-    end
-
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
-    end
-
-    # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
-
-    order.save
-
-    order
-  end
-
-  # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
-
-    fees = find_or_build_submit_fees()
-    raise('already has purchased submit fees') if fees.any? { |fee| fee.purchased? }
-
-    order = find_or_build_submit_order()
-    raise('already has purchased submit order') if order.purchased?
-
-    true
-  end
-
-  # Owner clicks on the Billing step. Next step is Checkout
-  def billing!
-    ready!
-  end
-
-  # Ready to check out
-  def ready!
-    build_submit_fees_and_order
-    save!
-  end
-
-  # Called automatically via after_purchase hook above
-  def submit_purchased!
-    return false if was_submitted?
-
-    wizard_steps[:checkout] = Time.zone.now
-    submit!
-  end
-
-  # Draft -> Submitted requirements
-  def submit!
-    raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
-
-    after_commit do
-      applicant_references.each { |reference| reference.notify! if reference.submitted? }
-    end
-
-    wizard_steps[:checkout] ||= Time.zone.now
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
-  end
-
-  # Submitted -> Completed requirements
+  # The submit! method used to be here
+  # But it needs to be inside the included do block
+  # So see above. Sorry.
 
   def applicant_references_required?
     min_applicant_references > 0

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -44,6 +44,8 @@ module EffectiveMembershipsFeePayment
       submitted: 'Submitted'
     )
 
+    acts_as_purchasable_wizard
+
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     # Declarations Step
@@ -110,12 +112,6 @@ module EffectiveMembershipsFeePayment
       validates :declare_truth, acceptance: true
     end
 
-    # Billing Step
-    validate(if: -> { current_step == :billing && owner.present? }) do
-      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
-      self.errors.add(:base, "must have an email") unless owner.email.present?
-    end
-
     # Clear required steps memoization
     after_save { @_required_steps = nil }
 
@@ -135,13 +131,30 @@ module EffectiveMembershipsFeePayment
       end
     end
 
-    after_purchase do |_order|
-      raise('expected submit_order to be purchased') unless submit_order&.purchased?
+    # All Fees and Orders
+    # Overriding acts_as_purchasable_wizard
+    def outstanding_fees
+      owner&.outstanding_fee_payment_fees
+    end
+
+    def submit_fees
+      fees
+    end
+
+    def submit_order
+      orders.first
+    end
+
+    # 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) }
+      submit_fees
+    end
 
-      submit_purchased!
-      after_submit_purchased!
+    def after_submit_purchased!
       EffectiveMemberships.Registrar.fee_payment_purchased!(owner)
     end
+
   end
 
   def to_s
@@ -157,14 +170,6 @@ module EffectiveMembershipsFeePayment
     submitted?
   end
 
-  def can_visit_step?(step)
-    can_revisit_completed_steps(step)
-  end
-
-  def outstanding_fees
-    owner&.outstanding_fee_payment_fees
-  end
-
   def select!
     reset!
   end
@@ -200,83 +205,4 @@ module EffectiveMembershipsFeePayment
     owner.representatives.any?(&:marked_for_destruction?)
   end
 
-  # All Fees and Orders
-  def submit_fees
-    fees
-  end
-
-  def submit_order
-    orders.first
-  end
-
-  # 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) }
-    submit_fees
-  end
-
-  def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
-
-    fees.each do |fee|
-      order.add(fee) unless order.purchasables.include?(fee)
-    end
-
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
-    end
-
-    order.billing_address = owner.billing_address if owner.billing_address.present?
-
-    order.save
-
-    order
-  end
-
-  # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
-
-    fees = find_or_build_submit_fees()
-    raise('already has purchased submit fees') if fees.any? { |fee| fee.purchased? }
-
-    order = find_or_build_submit_order()
-    raise('already has purchased submit order') if order.purchased?
-
-    true
-  end
-
-  # Owner clicks on the Billing Submit. Next step is Checkout
-  def billing!
-    ready!
-  end
-
-  def ready!
-    build_submit_fees_and_order
-    save!
-  end
-
-  # Called automatically via after_purchase hook above
-  def submit_purchased!
-    return false if was_submitted?
-
-    wizard_steps[:checkout] = Time.zone.now
-    submit!
-  end
-
-  # A hook to extend
-  def after_submit_purchased!
-  end
-
-  # Draft -> Submitted
-  def submit!
-    raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
-
-    wizard_steps[:checkout] ||= Time.zone.now
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
-  end
-
 end

data/app/models/concerns/effective_memberships_owner.rb

@@ -21,6 +21,8 @@ module EffectiveMembershipsOwner
   end
 
   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
@@ -51,10 +53,37 @@ module EffectiveMembershipsOwner
   end
 
   def effective_memberships_owners
-    owners = users if respond_to?(:users) && users.any? { |user| user.class.respond_to?(:effective_memberships_owner?) }
-    owners = organizations if respond_to?(:organizations) && organizations.any? { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+    owners = organizations if self.class.respond_to?(:effective_organizations_user?)
+    owners = users if self.class.respond_to?(:effective_organizations_organization?)
+
+    owners = Array(owners).reject { |owner| owner.try(:archived?) }
+
+    owners.presence || [self]
+  end
 
-    owners || [self]
+  # 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.any? { |organization| organization != except && organization.membership_present? }
+  end
+
+  def assign_member_role
+    membership_present? ? add_role(:member) : remove_role(:member)
+  end
+
+  # This can be called by a script to recalculate the owner role based on current membership
+  def update_member_role!
+    assign_member_role
+    save!
   end
 
   def outstanding_fee_payment_owners
@@ -230,6 +259,7 @@ module EffectiveMembershipsOwner
     fee
   end
 
+  # Called by the registrar.
   def update_membership_status!
     raise('expected membership to be present') unless membership.present?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -37,7 +37,7 @@ module EffectiveMembershipsRegistrar
     categories = Array(categories)
 
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting a membership category') unless categories.present? && categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
 
     # Default Date and next number
     date ||= Time.zone.now
@@ -73,6 +73,9 @@ module EffectiveMembershipsRegistrar
       save!(owner, date: date)
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     owner.update_membership_status!
   end
 
@@ -113,6 +116,9 @@ module EffectiveMembershipsRegistrar
       raise('already has purchased prorated fee') if fee.purchased?
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     # Save owner
     save!(owner, date: date)
   end
@@ -163,6 +169,9 @@ module EffectiveMembershipsRegistrar
     owner.outstanding_fee_payment_fees.each { |fee| fee.mark_for_destruction }
     owner.outstanding_fee_payment_orders.each { |order| order.mark_for_destruction }
 
+    # Remove member role
+    remove_member_role(owner)
+
     save!(owner, date: date)
   end
 
@@ -293,6 +302,34 @@ module EffectiveMembershipsRegistrar
 
   protected
 
+  def add_member_role(owner)
+    owner.add_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+      organization.representatives.each { |representative| representative.user.add_role(:member) }
+    end
+
+    true
+  end
+
+  def remove_member_role(owner)
+    owner.remove_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+
+      organization.representatives.each do |representative|
+        user = representative.user
+        member = user.individual_membership_present? || user.organization_membership_present?(except: organization)
+
+        user.remove_role(:member) if !member
+      end
+    end
+
+    true
+  end
+
   def save!(owner, date: Time.zone.now)
     owner.build_membership_history(start_on: date)
     owner.save!

data/app/models/effective/membership.rb

@@ -26,7 +26,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:membership_categories) }
+    scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
     scope :with_paid_fees_through, -> (period = nil) {
@@ -58,6 +58,7 @@ module Effective
     validates :number, presence: true, uniqueness: true
     validates :joined_on, presence: true
     validates :registration_on, presence: true
+    validates :membership_categories, presence: true
 
     validate(if: -> { owner.present? }) do
       self.errors.add(:owner_id, 'must be a memberships owner') unless owner.class.effective_memberships_owner?

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

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

data/config/effective_memberships.rb

@@ -32,7 +32,7 @@ EffectiveMemberships.setup do |config|
   # config.deliver_method = :deliver_later
 
   # Default layout
-  config.mailer_layout = 'effective_memberships_mailer_layout'
+  # config.mailer_layout = 'effective_memberships_mailer_layout'
 
   # Default From
   config.mailer_sender = "no-reply@example.com"

data/config/routes.rb

@@ -16,6 +16,8 @@ EffectiveMemberships::Engine.routes.draw do
     resources :fee_payments, only: [:new, :show] do
       resources :build, controller: :fee_payments, only: [:show, :update]
     end
+
+    get '/directory', to: 'memberships_directory#index'
   end
 
   namespace :admin do

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.22'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.2.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_organizations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_developer
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +249,7 @@ files:
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
+- app/controllers/effective/memberships_directory_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
@@ -235,6 +264,7 @@ files:
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
 - app/datatables/effective_fee_payments_datatable.rb
+- app/datatables/effective_memberships_directory_datatable.rb
 - app/helpers/effective_memberships_helper.rb
 - app/mailers/effective/memberships_mailer.rb
 - app/models/concerns/effective_memberships_applicant.rb
@@ -344,6 +374,7 @@ files:
 - app/views/effective/fees/_fee.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_declined.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid