From 6d71bd2c2fb7193051db52cb2ed5af63e1bb2f0f Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Wed, 17 Mar 2021 13:12:13 +0100
Subject: [PATCH] Fix active ordergroup

---
 app/controllers/foodcoop/ordergroups_controller.rb | 2 +-
 app/models/ordergroup.rb                           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/foodcoop/ordergroups_controller.rb b/app/controllers/foodcoop/ordergroups_controller.rb
index 6ef90245..8aeb977e 100644
--- a/app/controllers/foodcoop/ordergroups_controller.rb
+++ b/app/controllers/foodcoop/ordergroups_controller.rb
@@ -7,7 +7,7 @@ class Foodcoop::OrdergroupsController < ApplicationController
     end
 
     if params[:only_active] # Select only active groups
-      @ordergroups = @ordergroups.joins(:orders).where("orders.starts >= ?", Time.now.months_ago(3)).uniq
+      @ordergroups = @ordergroups.active
     end
 
     @ordergroups = @ordergroups.page(params[:page]).per(@per_page)
diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb
index ee5f5aa9..f699755b 100644
--- a/app/models/ordergroup.rb
+++ b/app/models/ordergroup.rb
@@ -20,6 +20,8 @@ class Ordergroup < Group
 
   after_create :update_stats!
 
+  scope :active, -> { joins(:orders).where(orders: { starts: (Time.now.months_ago(3)..) }).group(:id) }
+
   def contact
     "#{contact_phone} (#{contact_person})"
   end