Merge pull request #293 from kunalznk/tree_order

fix: #291 tress order by default time_created
Greenstand · Mar 17, 2023 · 6c7545a · 6c7545a
2 parents 6677cbb + 13da656
commit 6c7545a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/server/routers/treesRouter.ts b/server/routers/treesRouter.ts
@@ -76,16 +76,14 @@ 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) {

diff --git a/server/routers/treesRouterV2.ts b/server/routers/treesRouterV2.ts
@@ -76,16 +76,14 @@ 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) {