From 7dca2eaa26acd0ea769ea0f44a745baecc3b68f4 Mon Sep 17 00:00:00 2001 From: Kunal Zanke <50258809+kunalznk@users.noreply.github.com> Date: Thu, 16 Mar 2023 19:41:40 +0530 Subject: [PATCH] Revert "fix: #291 default tree order time_created" This reverts commit b1ea2194e4ca08e09644dcb527b2c8f230a1dd35. --- server/routers/treesRouter.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/routers/treesRouter.ts b/server/routers/treesRouter.ts index 6fb8d738..a99357c0 100644 --- a/server/routers/treesRouter.ts +++ b/server/routers/treesRouter.ts @@ -76,14 +76,16 @@ router.get( const options: FilterOptions = { limit, offset, - orderBy: { - column: order_by || 'time_created', - direction: desc === true ? 'desc' : 'asc', - }, }; if (planter_id) { filter.planter_id = planter_id; + if (order_by) { + options.orderBy = { + column: order_by === 'created_at' ? 'time_created' : order_by, + direction: desc === true ? 'desc' : 'asc', + }; + } } else if (organization_id) { filter.organization_id = organization_id; } else if (startDate && endDate) {