effective_memberships 0.1.23 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928383b46dabf57a0ee3e4ebed61050c15ddd4d2da01fcc50cec8ead2ded706b
-  data.tar.gz: 2e7b2f5b6e5e75991239f093783ab8a83c6f2b522fa8f5a482c067d04cb122ba
+  metadata.gz: 981aea653a25a94a440ce8599ab99cab71f429ac409a839f5f061d9731239d2e
+  data.tar.gz: b88503a72edd658d63e81b49d4b17c4402dde65d717692db4dff53f3b54c02fe
 SHA512:
-  metadata.gz: 8cd3faa8139e44db7aa485de820bed35f09b9d8cf8b2d56010cd87bf47515f143b9289362978cc305d63a50d8a24b4b8b9dadaabd240fffcc50abb970e8ac7d4
-  data.tar.gz: ba43e01d4180108144333d61d17f22a4297374db0842c6e33bf7044d381b192883d6813532b5717dca8df778293b065e1a0ba7d07a2c867f2c60b03912520e1e
+  metadata.gz: 67066fc2672c948a59c20cd1422e88d39a5b41be07aecf36ede4dcace2919e91c0d1058c165ebad70af7ed6dedcdc47015f447d89449c330d7cd1edf537a80cb
+  data.tar.gz: 7f46ea79c2d79e431f1150224180520850dbc683b399b9758801818d9ab213de67e6e4902a1e3861a1b16a5f54843fe048f5e0c5222d89cda27351ae5f6e28a6

data/app/controllers/admin/applicant_references_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class ApplicantReferencesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/controllers/effective/applicant_references_controller.rb

@@ -24,12 +24,11 @@ module Effective
 
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
-      authorized = current_user.effective_memberships_owners.include?(resource.applicant.owner) == false
 
-      if resource.submitted? && resource.applicant.was_submitted? && authorized
-        permitted
-      else
+      if current_user && current_user.effective_memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
+      else
+        permitted
       end
 
     end

data/app/controllers/effective/applicants_controller.rb

@@ -16,7 +16,6 @@ module Effective
       end
     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_applicant_references_datatable.rb

@@ -0,0 +1,31 @@
+class Admin::EffectiveApplicantReferencesDatatable < Effective::Datatable
+
+  datatable do
+    order :name
+
+    col :applicant
+
+    col :name
+    col :email
+    col :phone
+
+    col :status do |reference|
+      if reference.submitted?
+        'Waiting on response'
+      elsif reference.completed?
+        'Completed'
+      end
+    end
+
+    col :last_notified_at do |reference|
+      reference.last_notified_at&.strftime('%F') unless reference.completed?
+    end
+
+    actions_col
+  end
+
+  collection do
+    Effective::ApplicantReference.deep.all
+  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_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/admin/applicant_references/_applicant_reference.html.haml

@@ -0,0 +1 @@
+= render '/effective/applicant_references/applicant_reference', applicant_reference: applicant_reference, skip_actions: true

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

@@ -21,6 +21,10 @@
     = tab 'Process' do
       = render 'admin/applicants/form_process', applicant: applicant
 
+  - if applicant.applicant_references.present?
+    = tab 'References' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
+
   - if applicant.fees.present?
     = tab 'Fees' do
       .mb-4= render_inline_datatable(Admin::EffectiveFeesDatatable.new(applicant_id: applicant.to_param))

data/app/views/admin/applicants/_status.html.haml

@@ -51,9 +51,9 @@
             = applicant.min_applicant_references
             Required References Responded
         - else
-          - if applicant.applicant_references.count(&:submitted?) > 0
+          - if applicant.applicant_references.present?
             %p
-              = applicant.applicant_references.count(&:submitted?)
+              = applicant.applicant_references.count(&:completed?)
               = '/'
               = applicant.applicant_references.count
               References Responded

data/app/views/effective/applicant_references/_applicant_reference.html.haml

@@ -23,7 +23,7 @@
           - elsif reference.completed?
             Response completed
 
-    - if reference.applicant.was_submitted? && !reference.completed?
+    - unless reference.applicant.was_approved?
       %tr
         %th Last Notified at
         %td= reference.last_notified_at&.strftime('%F') || 'Never'

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,10 +16,17 @@ 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
     resources :applicants, except: [:new, :create, :show]
+
+    resources :applicant_references, only: [:show] do
+      post :notify, on: :member
+    end
+
     resources :fees
     resources :categories, except: [:show]
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.23'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-28 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
@@ -212,6 +240,7 @@ files:
 - app/assets/stylesheets/effective_memberships/base.scss
 - app/controllers/admin/applicant_course_areas_controller.rb
 - app/controllers/admin/applicant_course_names_controller.rb
+- app/controllers/admin/applicant_references_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
@@ -221,8 +250,10 @@ 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_applicant_references_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
 - app/datatables/admin/effective_fee_payments_datatable.rb
@@ -235,6 +266,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
@@ -263,6 +295,7 @@ files:
 - app/views/admin/applicant_course_areas/_form_applicant_course_area.html.haml
 - app/views/admin/applicant_course_areas/index.html.haml
 - app/views/admin/applicant_course_name/_form.html.haml
+- app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
 - app/views/admin/applicants/_form_decline.html.haml
@@ -344,6 +377,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