Skip to content

Commit 4a8eb8f

Browse files
committed
added test for account query builder
1 parent ec5dc59 commit 4a8eb8f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

app/services/discourse_kofi/account_query_builder.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
module DiscourseKofi
44
class AccountQueryBuilder
5-
ORDER_MAPPING = { "user" => "users.username", "created_at" => "created_at" }
5+
ORDER_MAPPING = {
6+
"user" => "users.username",
7+
"created_at" => "created_at",
8+
"email" => "email"
9+
}
610

711
attr_reader :query
812

@@ -28,9 +32,7 @@ def init_query(pre_filter)
2832
order << "#{order_directive} #{custom_direction} NULLS LAST"
2933
end
3034

31-
if !custom_order.present?
32-
order << "created_at desc" if !custom_order.present?
33-
end
35+
order << "created_at desc" if order.empty?
3436

3537
query =
3638
Account

app/services/discourse_kofi/payment_query_builder.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ def init_query(pre_filter)
3333
order << "#{order_directive} #{custom_direction} NULLS LAST"
3434
end
3535

36-
if !custom_order.present?
37-
order << "timestamp desc" if !custom_order.present?
38-
end
36+
order << "timestamp desc" if order.empty?
3937

4038
query = Payment.where(pre_filter).order(order.reject(&:blank?).join(","))
4139

0 commit comments

Comments
 (0)