From 9c02b8ba3145eaf2c8d71cde6a00ad0dc03f16e8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 14 Nov 2023 16:53:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue=E5=AD=90?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 2 +- app/services/api/v1/issues/journals/list_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/journal.rb b/app/models/journal.rb index 30cd94143..e0553ad40 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -44,7 +44,7 @@ class Journal < ApplicationRecord belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy - has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id + has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(20)}, class_name: 'Journal', foreign_key: :parent_id has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id, dependent: :destroy scope :journal_includes, ->{includes(:user, :journal_details, :attachments)} diff --git a/app/services/api/v1/issues/journals/list_service.rb b/app/services/api/v1/issues/journals/list_service.rb index 486fa5d3f..6d54e3b47 100644 --- a/app/services/api/v1/issues/journals/list_service.rb +++ b/app/services/api/v1/issues/journals/list_service.rb @@ -48,7 +48,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService @queried_journals = @queried_journals.where(notes: nil) end - @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal]) + @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, :children_journals) @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct @queried_journals