[E] Add order + subject scopes to journal_issue

Author: 1aurend

api/app/controllers/concerns/validation.rb

@@ -629,7 +629,7 @@ def project_filter_params
   def journal_issue_filter_params
     params.permit(
       filter: [:keyword, :order, :typeahead, :journal_id, :journal_volume_id,
-               :volume_is_nil, :with_update_ability]
+               :volume_is_nil, :with_update_ability, :subject]
     )[:filter]
   end
 

api/app/models/journal.rb

@@ -90,8 +90,9 @@ class Journal < ApplicationRecord
   scope :by_subject, ->(subject = nil) {
     next all unless subject.present?
 
-    where(id: unscoped.joins(:journal_subjects)
-                      .merge(JournalSubject.by_subject(subject)).select(:journal_id))
+    joins(:journal_subjects)
+    .merge(JournalSubject.by_subject(subject))
+    .distinct
   }
 
   multisearches! :description_plaintext

api/app/models/journal_issue.rb

@@ -20,6 +20,7 @@ class JournalIssue < ApplicationRecord
   belongs_to :journal_volume, optional: true, counter_cache: true, inverse_of: :journal_issues
 
   has_one :project, required: true, inverse_of: :journal_issue, dependent: :destroy
+  has_many :project_subjects, through: :project
 
   validates :number, presence: true
 
@@ -63,6 +64,33 @@ class JournalIssue < ApplicationRecord
     includes(:project).where(id: Project.select(:journal_issue_id))
   end
 
+  scope :with_order, ->(by = nil) do
+    case by
+    when "updated_at ASC"
+      reorder(updated_at: :asc)
+    when "updated_at DESC"
+      reorder(updated_at: :desc)
+    when "created_at ASC"
+      reorder(created_at: :asc)
+    when "created_at DESC"
+      reorder(created_at: :desc)
+    when "sort_title ASC"
+      reorder(sort_title: :asc)
+    when "sort_title DESC"
+      reorder(sort_title: :desc)
+    else
+      in_order
+    end
+  end
+
+  scope :by_subject, ->(subject = nil) {
+    next all unless subject.present?
+
+    joins(:project_subjects)
+    .merge(ProjectSubject.by_subject(subject))
+    .distinct
+  }
+
   delegate :avatar, to: :project
   delegate :avatar_color, to: :project
   delegate :avatar_meta, to: :project