refactor created at filter to use model scopes

3 files changed, 11 insertions, 3 deletions

diff --git a/app/finders/created_at_filter.rb b/app/finders/created_at_filter.rb
new file mode 100644
index 00000000000..ac9ac77732c
--- /dev/null
+++ b/app/finders/created_at_filter.rb
@@ -0,0 +1,8 @@
+module CreatedAtFilter
+  def by_created_at(items)
+    items = items.created_before(params[:created_before]) if params[:created_before].present?
+    items = items.created_after(params[:created_after]) if params[:created_after].present?
+
+    items
+  end
+end
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 39427d83669..6e37c10166d 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -19,7 +19,7 @@
 #     iids: integer[]
 #
 class IssuableFinder
-  include Gitlab::Database::CreatedAtFilter
+  include CreatedAtFilter
   
   NONE = '0'.freeze
   IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page].freeze
@@ -34,6 +34,7 @@ class IssuableFinder
   def execute
     items = init_collection
     items = by_scope(items)
+    items = by_created_at(items)
     items = by_state(items)
     items = by_group(items)
     items = by_search(items)
@@ -44,7 +45,6 @@ class IssuableFinder
     items = by_iids(items)
     items = by_milestone(items)
     items = by_label(items)
-    items = by_created_at(items)
 
     # Filtering by project HAS TO be the last because we use the project IDs yielded by the issuable query thus far
     items = by_project(items)
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index c6bfc380c1c..33f7ae90598 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -14,7 +14,7 @@
 #     external: boolean
 #
 class UsersFinder
-  include Gitlab::Database::CreatedAtFilter
+  include CreatedAtFilter
 
   attr_accessor :current_user, :params