Add scope to filter lobbies with accepted events

AyuntamientoMadrid · Jul 27, 2018 · a44416c · a44416c
1 parent 9eeec29
commit a44416c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -7,6 +7,7 @@ class OrganizationsController < ApplicationController
   def index
     @organizations = search(params)
     @paginated_organizations = Organization.lobbies.where(id: @organizations.hits.map(&:primary_key))
+    @paginated_organizations = @paginated_organizations.with_accepted_events if params[:lobby_activity].present?
     @paginated_organizations = @paginated_organizations.reorder(sorting_option(params[:order]))
 
   end

diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -55,6 +55,7 @@ class Organization < ActiveRecord::Base
   scope :validated, -> { where('invalidated_at is null') }
   scope :lobbies, -> { where('entity_type = ?', 2) }
   scope :full_like, ->(name) { where("identifier ilike ? OR name ilike ? OR first_surname ilike ?", name, name, name) }
+  scope :with_accepted_events, -> { joins(:events).where("events.status IN (?)", [1,2]) }
 
   def entity_type_id
     Organization.entity_types[entity_type]