effective_memberships 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9916218e0d606b59b230debdc5c7a70e1d3754333f786298a4b9f3cf21222ce
-  data.tar.gz: 7ee9f5e5f4f64ea6764c206b053a81dc0d253a596de57d2e20324e3c64b86aa4
+  metadata.gz: 60f83e2a6f429e7a417d5a9b3a9026a1a391ec6fe301230514d66a1a2493574d
+  data.tar.gz: aedbc568e9fa8c3679c3bbc99567dd49cf379d735da7372d8460985e4eee401f
 SHA512:
-  metadata.gz: 6e6f8b7f49df86cd4461dba072f3106e3a095076d44f298ced308857e7ee86b3f91455d6823716470d6b4dccdb75ed42e8e05cc2be9bc0208e314aaef011e759
-  data.tar.gz: 936b9c462cede66151ae4a9d186a3b3d6aee60989f284f6157373fb043f73498e486678e09d39af0f75f648a5ace5826f66f0ec553427fbeb77375a1b5822fa9
+  metadata.gz: 1adb7214ff9a1b55255c55f076cf7684b3484926db1d2158365f5b367976b7867e65de05f722b8649d53736f214164b08241291c9e8f4170d07867ab33c0429c
+  data.tar.gz: 86c67adb9985b2bbbd626f271b3d537f61feb5c8b32daea1dba14669c538681be80d475e2ad06c579c513a1da4dee3b259303b0741cda1ad403c86377a9519e9

data/app/controllers/effective/membership_directory_controller.rb

@@ -16,6 +16,15 @@ module Effective
       @memberships = @membership_directory.results(page: params[:page])
     end
 
+    def show
+      @page_title = 'Directory'
+
+      @membership = Effective::Membership.find_by_token(params[:id])
+
+      EffectiveResources.authorize!(self, :show, @membership)
+      EffectiveResources.authorize!(self, :show, @membership.owner)
+    end
+
     def build_membership_directory
       directory = EffectiveMemberships.MembershipDirectory.new(search_params)
       directory.current_user = current_user

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -63,7 +63,7 @@ module Admin
     end
 
     collection do
-      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: :membership_categories)
+      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: [membership_categories: :category], representatives: :user)
     end
 
     def categories

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -3,25 +3,25 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   datatable do
     length 100
 
-    col(:name) { |membership| membership.owner.to_s }
-
+    col :owner_name, label: 'Name'
     col :joined_on
     col :number
-    col :categories, search: :string, label: 'Category'
-  end
-
-  collection do
-    scope = Effective::Membership.directory.all
 
-    archived_klasses.each do |klass|
-      scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)
+    col(:categories, search: categories, label: 'Category', sql_column: true).search do |collection, term|
+      collection.with_category(EffectiveMemberships.Category.find(term))
     end
 
-    scope
   end
 
-  def archived_klasses
-    @archived_klasses ||= Effective::Membership.owner_klasses.select { |klass| klass.try(:acts_as_archived?) }
+  collection do
+    Effective::Membership.deep.sorted
+      .in_good_standing
+      .without_archived_owners
+      .with_category(categories)
+  end
+
+  def categories
+    EffectiveMemberships.Category.membership_directory.all
   end
 
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -624,12 +624,12 @@ module EffectiveMembershipsApplicant
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = user.membership.category_ids
+    category_ids = user.membership.category_ids.map(&:to_s) - [nil, '']
 
-    categories.select do |cat|
-      cat.can_apply_new? ||
-      cat.can_apply_existing? ||
-      (cat.can_apply_restricted? && (category_ids & cat.can_apply_restricted_ids).present?)
+    categories.select do |category|
+      category.can_apply_new? ||
+      category.can_apply_existing? ||
+      (category.can_apply_restricted? && (category_ids & category.can_apply_restricted_ids).present?)
     end
   end
 

data/app/models/concerns/effective_memberships_category.rb

@@ -114,6 +114,9 @@ module EffectiveMembershipsCategory
       .or(where(can_apply_restricted: true))
     }
 
+    # Can be used to limit which memberships are displayed in the directory
+    scope :membership_directory, -> { sorted }
+
     validates :title, presence: true, uniqueness: true
     validates :category_type, presence: true
     validates :position, presence: true

data/app/models/concerns/effective_memberships_directory.rb

@@ -19,18 +19,29 @@ module EffectiveMembershipsDirectory
     attr_accessor :term
     attr_accessor :category
 
+    # Users
     attr_accessor :first_name
     attr_accessor :last_name
 
+    # Organizations
+    attr_accessor :title
+
     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 }
+    validates :title, length: { minimum: 2, allow_blank: true }
+  end
+
+  def categories
+    EffectiveMemberships.Category.membership_directory.all
   end
 
   # Base collection to search. Can be configured per tenant.
   def collection
-    # Example::User.members.membership_in_good_standing.all
-    raise('to be implemented by app membership_directory')
+    Effective::Membership.deep.sorted
+      .in_good_standing
+      .without_archived_owners
+      .with_category(categories)
   end
 
   # Search Users and Organizations for only these fields. Passed into search_any. Return nil for all.
@@ -44,21 +55,21 @@ module EffectiveMembershipsDirectory
   end
 
   def present?
-    term.present? || first_name.present? || last_name.present? || category.present?
+    term.present? || first_name.present? || last_name.present? || title.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!
-    @membership_owners = build_collection()
-    @membership_owners = @membership_owners.none if present? && !valid?
-    @membership_owners
+    @memberships = build_collection()
+    @memberships = @memberships.none if present? && !valid?
+    @memberships
   end
 
   # The unpaginated results of the search
-  def membership_owners
-    @membership_owners || collection
+  def memberships
+    @memberships || collection
   end
 
   # The paginated results
@@ -66,38 +77,53 @@ module EffectiveMembershipsDirectory
     page = (page || 1).to_i
     offset = [(page - 1), 0].max * per_page
 
-    membership_owners.limit(per_page).offset(offset)
+    memberships.limit(per_page).offset(offset)
   end
 
   protected
 
   def build_collection
-    owners = collection()
-    raise('expected an ActiveRecord collection') unless owners.kind_of?(ActiveRecord::Relation)
-    raise('expected a collection of membership_owners') unless owners.klass.respond_to?(:effective_memberships_owner?)
+    memberships = collection()
+    raise('expected an ActiveRecord collection') unless memberships.kind_of?(ActiveRecord::Relation)
+    raise('expected an ActiveRecord collection of Effective::Memberships') unless memberships.klass.respond_to?(:effective_membership?)
 
     # Filter by term
     if term.present?
-      owners = Effective::Resource.new(owners).search_any(term, columns: search_any_columns)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(term, columns: search_any_columns) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by first name
     if first_name.present?
-      owners = Effective::Resource.new(owners).search_any(first_name, columns: :first_name)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(first_name, columns: :first_name) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by last name
     if last_name.present?
-      owners = Effective::Resource.new(owners).search_any(last_name, columns: :last_name)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(last_name, columns: :last_name) }
+      memberships = memberships.where(owner: owners)
+    end
+
+    # Filter by title
+    if title.present?
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(last_name, columns: :title) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by category
     if category.present?
-      cat = EffectiveMemberships.Category.where(id: category)
-      owners = owners.members_with_category(cat) if cat.present?
+      memberships = memberships.with_category(EffectiveMemberships.Category.where(id: category))
     end
 
-    owners
+    # Return an ActiveRecord::Relation of Effective::Memberships
+    memberships
+  end
+
+  private
+
+  def owner_klasses
+    Effective::Membership.owner_klasses
   end
 
 end

data/app/models/concerns/effective_memberships_organization.rb

@@ -97,4 +97,8 @@ module EffectiveMembershipsOrganization
     representatives.reject(&:marked_for_destruction?).map(&:user)
   end
 
+  def membership_users
+    users.select { |user| user.is?(:member) && !user.archived? }
+  end
+
 end

data/app/models/effective/membership.rb

@@ -1,6 +1,7 @@
 module Effective
   class Membership < ActiveRecord::Base
     belongs_to :owner, polymorphic: true
+    has_secure_token
 
     attr_accessor :current_action
 
@@ -24,30 +25,34 @@ module Effective
       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.
 
+      # Membership Directory
+      owner_name                :string
+      token                     :string
+
       timestamps
     end
 
     scope :deep, -> { includes(:owner, membership_categories: :category, membership_statuses: :status) }
-    scope :sorted, -> { order(:id) }
+    scope :sorted, -> { order('lower(owner_name)') }
 
     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))
+      raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where(id: MembershipStatus.where(status_id: statuses).select(:membership_id))
     }
 
     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))
+      raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where.not(id: MembershipStatus.where(status_id: 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))
+      raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where(id: MembershipCategory.where(category_id: 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))
+      raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where.not(id: MembershipCategory.where(category_id: categories).select(:membership_id))
     }
 
     scope :joined_before, -> (date) {
@@ -73,14 +78,24 @@ module Effective
     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 :without_archived_owners, -> {
+      where.not(owner: klass.acts_as_archived_owner_klasses.map { |klass| klass.archived })
+    }
+
     before_validation do
       self.registration_on ||= joined_on
     end
 
+    before_validation(if: -> { owner.present? }) do
+      self.owner_name = owner.to_s
+    end
+
     before_validation(if: -> { number_changed? }) do
       self.number_as_integer = (number.present? ? (Integer(number) rescue nil) : nil)
     end
 
+    validates :owner_name, presence: true
+
     validates :number, uniqueness: { allow_blank: true }
     validates :number, presence: true, if: -> { categories.any?(:membership_number_required?) }
 
@@ -100,11 +115,19 @@ module Effective
       maximum('number_as_integer') || 0
     end
 
+    def self.effective_membership?
+      true
+    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 self.acts_as_archived_owner_klasses
+      owner_klasses.select { |klass| klass.try(:acts_as_archived?) }
+    end
+
     def to_s
       return 'membership' if owner.blank?
 

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

@@ -1,11 +1,14 @@
 = 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 :term, label: 'Name'
 
-  = f.search_field :first_name
-  = f.search_field :last_name
+  -# Users only
+  /= f.search_field :first_name
+  /= f.search_field :last_name
 
-  = f.select :category, EffectiveMemberships.Category.all
+  - # Organizations only
+  /= f.search_field :title
+
+  = f.select :category, membership_directory.categories
 
   = 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/_membership.html.haml

@@ -0,0 +1,20 @@
+= card do
+  %h6= membership.owner
+  %p= membership.categories.map(&:membership_directory_title).to_sentence
+  %p= membership.statuses.map(&:membership_directory_title).to_sentence
+
+  - if membership.owner.try(:email).present?
+    %p= reveal_mail_to(membership.owner.email)
+
+  - if (organizations = membership.owner.try(:membership_organizations)).present?
+    .mb-4.membership-directory-organizations
+      - organizations.each do |organization|
+        %div= organization
+
+  - if (users = membership.owner.try(:membership_users)).present?
+    .mb-4.membership-directory-users
+      - users.each do |user|
+        %div= user
+
+  - if EffectiveResources.authorized?(self, :show, membership) && EffectiveResources.authorized?(self, :show, membership.owner)
+    = link_to 'Show more', effective_memberships.membership_directory_path(membership.token)

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

@@ -4,14 +4,14 @@
   - 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.
+    .mt-4.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 |owner|
-        - next unless owner
+      - group.each do |membership|
         .col-md
-          = render('effective/membership_directory/membership_owner', membership: owner.membership, owner: owner)
+          - next unless membership
+          = 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/show.html.haml

@@ -0,0 +1,25 @@
+= render 'layout' do
+  .effective-membership
+
+    %h6= @membership.owner
+    %p= @membership.categories.map(&:membership_directory_title).to_sentence
+    %p= @membership.statuses.map(&:membership_directory_title).to_sentence
+
+    - if @membership.owner.respond_to?(:rich_text_body)
+      .mb-4= @membership.owner.rich_text_body.to_s
+
+    - if @membership.owner.try(:email).present?
+      %p= reveal_mail_to(@membership.owner.email)
+
+    - if (organizations = @membership.owner.try(:membership_organizations)).present?
+      .mb-4.membership-directory-organizations
+        - organizations.each do |organization|
+          %div= organization
+
+    - if (users = @membership.owner.try(:membership_users)).present?
+      .mb-4.membership-directory-users
+        - users.each do |user|
+          %div= user
+
+  %hr
+  = link_to 'Return to Directory', effective_memberships.membership_directory_index_path, class: 'btn btn-primary'

data/config/routes.rb

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

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

@@ -95,6 +95,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.date :fees_paid_period
       t.date :fees_paid_through_period
 
+      t.string :owner_name
+      t.string :token
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.7'
+  VERSION = '0.9.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -483,9 +483,10 @@ files:
 - 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/_membership_owner.html.haml
 - app/views/effective/membership_directory/index.html.haml
+- app/views/effective/membership_directory/show.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
 - app/views/effective/memberships_mailer/applicant_approved.liquid

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

@@ -1,7 +0,0 @@
-= card do
-  %h6= owner
-  %p= membership.categories.map(&:membership_directory_title).to_sentence
-  %p= membership.statuses.map(&:membership_directory_title).to_sentence
-
-  - if owner.try(:email).present?
-    %p= reveal_mail_to(owner.email)