From d5eac2decb5552a68cc4d2a253d1f3364a768884 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Fri, 9 Aug 2024 10:58:51 +0100
Subject: [PATCH] Reuse existing scopes

---
 app/models/merge_request.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 806c06623..42496a8fe 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -16,15 +16,11 @@ class MergeRequest < ApplicationRecord
   enum status: STATUS
 
   scope :not_merged, -> { where.not(status: "request_merged") }
+  scope :merged, -> { where(status: "request_merged") }
   scope :visible, lambda {
     open_collection_period_start_date = FormHandler.instance.start_date_of_earliest_open_collection_period
-    where(
-      "(merge_requests.status != :merged_status) OR (merge_requests.status = :merged_status AND merge_requests.merge_date >= :open_collection_period_start_date)",
-      merged_status: 4,
-      open_collection_period_start_date:,
-    )
+    merged.where("merge_requests.merge_date >= ?", open_collection_period_start_date).or(not_merged)
   }
-  scope :merged, -> { where(status: "request_merged") }
 
   def organisation_name_uniqueness
     if Organisation.where("lower(name) = ?", new_organisation_name&.downcase).exists?