Skip to content

Commit 2a7afe9

Browse files
authored
Merge pull request #92 from amatsuda/use_yyyymm
Use yyyymm column instead of calling function
2 parents e9c93af + a5ab23c commit 2a7afe9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

app/controllers/messages_controller.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def show(list_name:, list_seq:)
3232
# If this is a turbo frame request, just render the message
3333
return if turbo_frame_request?
3434

35-
render_threads yyyymm: @message.published_at.strftime('%Y%m')
35+
render_threads yyyymm: @message.yyyymm
3636
end
3737

3838
private
@@ -68,9 +68,9 @@ def render_threads(yyyymm: nil, q: nil)
6868
if q
6969
root_query.where!('body %> ?', q)
7070
else
71-
@yyyymms = Message.where(list_id: @list, parent_id: nil).order('yyyymm').pluck(Arel.sql "distinct to_char(published_at, 'YYYYMM') as yyyymm")
71+
@yyyymms = Message.distinct.where(list_id: @list, parent_id: nil).order('yyyymm').pluck('yyyymm')
7272
@yyyymm = yyyymm || @yyyymms.last
73-
root_query.where!("to_char(published_at, 'YYYYMM') = ?", @yyyymm)
73+
root_query.where!(yyyymm: @yyyymm)
7474
end
7575

7676
messages = Message.with_recursive(parent_and_children: [root_query, Message.joins('inner join parent_and_children on messages.parent_id = parent_and_children.id')])
@@ -79,7 +79,7 @@ def render_threads(yyyymm: nil, q: nil)
7979
@messages = compose_tree(messages)
8080

8181
if q
82-
@yyyymms = @messages.map { it.published_at.strftime('%Y%m') }.uniq
82+
@yyyymms = @messages.map { it.yyyymm }.uniq
8383
@yyyymm = @yyyymms.last
8484
end
8585

0 commit comments

Comments
 (0)