effective_memberships 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2ae153f152ca4d2295c8847e7848d10dde99d015c77367606cc1d00feb8743
-  data.tar.gz: f41d582a3c5da8491cfb82ac7129aaa796c3f4fc14ee49e5eff6e2770d725200
+  metadata.gz: d55b0a5c31e8f259614c649af1fe89e2d36cb412652dc6d5ac96f051a925a7ee
+  data.tar.gz: 3850e9a4d2ba175becb4e0f487bc041c726516d9462470ee6c464a19ece0d559
 SHA512:
-  metadata.gz: 218f5706b65bfc70fa9cd458678fb24cfa106751f91c98a636e304dc66494879789e95bcccfebf79eb993dd7797b56b72cf640de69013ded6b117e2ca6fb0f64
-  data.tar.gz: 2fcba0dab68d21ce5653e9d9e227895e227d887c3fbc80c2533be72cd190b1ad6a8a02b7b7041692957cd4edca505d24533fcb8653c82c3ace37623122d4498a
+  metadata.gz: d6b197509eb8ce44fd7b15230c8b55171eccf2b017017f6e38eb45917453abf96a210118fd25df35d962cf448efc3625db45f1dafe720da32c18d1ee68ab7569
+  data.tar.gz: 7c2e9ecd43439c7abf4a174ef1adae97938704a941e8338225b3905b38fb0e7d10aae5d075ce169b1140b77f193dc055349751569524163d5a301d65801848cf

data/app/models/concerns/effective_memberships_directory.rb

@@ -29,7 +29,8 @@ module EffectiveMembershipsDirectory
 
   # Base collection to search. Can be configured per tenant.
   def collection
-    Effective::Membership.directory
+    # Example::User.members.membership_in_good_standing.all
+    raise('to be implemented by app membership_directory')
   end
 
   # Search Users and Organizations for only these fields. Passed into search_any. Return nil for all.
@@ -50,14 +51,14 @@ module EffectiveMembershipsDirectory
   # 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
+    @membership_owners = build_collection()
+    @membership_owners = @membership_owners.none if present? && !valid?
+    @membership_owners
   end
 
   # The unpaginated results of the search
-  def memberships
-    @memberships || collection
+  def membership_owners
+    @membership_owners || collection
   end
 
   # The paginated results
@@ -65,54 +66,38 @@ module EffectiveMembershipsDirectory
     page = (page || 1).to_i
     offset = [(page - 1), 0].max * per_page
 
-    memberships().limit(per_page).offset(offset)
+    membership_owners.limit(per_page).offset(offset)
   end
 
   protected
 
   def build_collection
-    memberships = collection()
-    raise('expected an ActiveRecord collection') unless memberships.kind_of?(ActiveRecord::Relation)
+    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?)
 
     # Filter by term
     if term.present?
-      memberships = search_owners(memberships, term, search_any_columns)
+      owners = Effective::Resource.new(owners).search_any(term, columns: search_any_columns)
     end
 
     # Filter by first name
     if first_name.present?
-      memberships = search_owners(memberships, first_name, :first_name)
+      owners = Effective::Resource.new(owners).search_any(first_name, columns: :first_name)
     end
 
     # Filter by last name
     if last_name.present?
-      memberships = search_owners(memberships, last_name, :last_name)
+      owners = Effective::Resource.new(owners).search_any(last_name, columns: :last_name)
     end
 
     # Filter by category
     if category.present?
       cat = EffectiveMemberships.Category.where(id: category)
-      memberships = memberships.with_category(cat) if cat.present?
+      owners = owners.members_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
+    owners
   end
 
 end

data/app/models/effective/membership.rb

@@ -73,8 +73,6 @@ 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 :directory, -> { deep.in_good_standing.order(:id) }
-
     before_validation do
       self.registration_on ||= joined_on
     end

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

@@ -8,9 +8,10 @@
 
   - 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)
+      - group.each do |owner|
+        - next unless owner
+        .col-md
+          = render('effective/membership_directory/membership_owner', membership: owner.membership, owner: owner)
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(results, per_page: membership_directory.per_page)

data/app/views/effective/membership_directory/{_membership.html.haml → _membership_owner.html.haml}

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

data/lib/effective_memberships/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Code and Effect
@@ -481,8 +481,8 @@ 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/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml