From d18d807a9887fd219b7a0ab25262f0b34470491e Mon Sep 17 00:00:00 2001
From: KaemonIsland <kaemonlovendahl@outlook.com>
Date: Fri, 16 Sep 2022 09:50:42 -0400
Subject: [PATCH] fix: add sorting to search results

---
 app/controllers/api/v1/cards_controller.rb | 6 +++---
 app/controllers/api/v1/decks_controller.rb | 2 +-
 app/models/card.rb                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/cards_controller.rb b/app/controllers/api/v1/cards_controller.rb
index e9239d4e..c7071409 100644
--- a/app/controllers/api/v1/cards_controller.rb
+++ b/app/controllers/api/v1/cards_controller.rb
@@ -28,7 +28,7 @@ def search_with_collection
     .per(params[:per_page] || 30)
 
     render 'api/v1/cards/cards.json.jbuilder', status: 200
-end
+  end
 
   def search_with_deck
     @deck = Deck.find(params[:deck_id])
@@ -44,9 +44,9 @@ def search_with_deck
 
   def load_query
     if params[:q][:collection_only] && @collection
-      @query = @collection.cards.with_color(params[:colors], Card).ransack(params[:q])
+      @query = @collection.cards.with_color(params[:colors], Card).order("original_release_date ASC").ransack(params[:q])
     else
-      @query = Card.with_color(params[:colors], Card).ransack(params[:q])
+      @query = Card.with_color(params[:colors], Card).order("original_release_date ASC").ransack(params[:q])
     end
 
     @sorted_cards = Card.sort_by_color(@query.result.by_mana_and_name.limit(500))
diff --git a/app/controllers/api/v1/decks_controller.rb b/app/controllers/api/v1/decks_controller.rb
index 45be7548..f60213e3 100644
--- a/app/controllers/api/v1/decks_controller.rb
+++ b/app/controllers/api/v1/decks_controller.rb
@@ -6,7 +6,7 @@ class Api::V1::DecksController < ApplicationController
 
     def index
         if current_user
-            @decks = current_user.decks.order(updated_at:  :desc)
+            @decks = current_user.decks.order(updated_at: :desc)
             render 'api/v1/decks/decks.json.jbuilder', status: 200
         else
             render json: { error: 'User must be signed in' }, status: 401
diff --git a/app/models/card.rb b/app/models/card.rb
index 47cbd482..bc21a195 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -110,7 +110,7 @@ def self.sort_by_color(cards)
       C: [],
     }
 
-    cards.each do |card| 
+    cards.each do |card|
       card_colors = card.color_identity
 
       if card_colors.empty?