From 4f7b6df4dc9de5b6986e62288810044126e24766 Mon Sep 17 00:00:00 2001
From: deanchen <antlet2004@gmail.com>
Date: Wed, 16 Mar 2022 15:59:34 +0800
Subject: [PATCH] fix: order by calculated at

---
 docs/api/spec/treetracker-earnings-api.yaml | 2 +-
 server/handlers/earningsHandler.js          | 2 +-
 server/models/Earnings.js                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api/spec/treetracker-earnings-api.yaml b/docs/api/spec/treetracker-earnings-api.yaml
index 5fcbb88..aaf3a38 100644
--- a/docs/api/spec/treetracker-earnings-api.yaml
+++ b/docs/api/spec/treetracker-earnings-api.yaml
@@ -388,7 +388,7 @@ paths:
               - funder
               - amount
               - payment_method
-              - effective_payment_date
+              - calculated_at
           in: query
           name: sort_by
           description: column with which to sort by
diff --git a/server/handlers/earningsHandler.js b/server/handlers/earningsHandler.js
index 1114bf5..39f5baa 100644
--- a/server/handlers/earningsHandler.js
+++ b/server/handlers/earningsHandler.js
@@ -35,7 +35,7 @@ const earningsGetQuerySchema = Joi.object({
     'funder',
     'amount',
     'payment_method',
-    'effective_payment_date',
+    'calculated_at',
     'status',
     'paid_at',
   ),
diff --git a/server/models/Earnings.js b/server/models/Earnings.js
index 251bc71..019db12 100644
--- a/server/models/Earnings.js
+++ b/server/models/Earnings.js
@@ -90,7 +90,7 @@ const FilterCriteria = ({
     case 'payment_method':
       orderBy = 'payment_method';
       break;
-    case 'effective_payment_date':
+    case 'calculated_at':
       orderBy = 'calculated_at';
       break;
     default: