fix: update test with complete sql sentence & add a test without orde…

…rBy argument
Greenstand · Jan 25, 2022 · 15377c1 · 15377c1
1 parent 05bc1d3
commit 15377c1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/server/infra/database/BaseRepository.spec.ts b/server/infra/database/BaseRepository.spec.ts
@@ -73,15 +73,33 @@ describe('BaseRepository', () => {
       tracker.uninstall()
       tracker.install()
       tracker.on('query', (query) => {
-        expect(query.sql).toMatch(/select.*testTable.*name.*order.*by.*desc.*/)
+        expect(query.sql).toMatch('select \* from "testTable" where \("name" \= $1\) order by "id" desc'
+)
         query.response([{ id: 1 }])
       })
       const result = await baseRepository.getByFilter(
         {
           name: 'testName',
         },
         {
-          order: { column: 'id', direction: 'desc' }
+          orderBy: { column: 'id', direction: 'desc' }
+        }
+      )
+      expect(result).toHaveLength(1)
+      expect(result[0]).toHaveProperty('id', 1)
+    })
+
+    it('getByFiliter without order', async () => {
+      tracker.uninstall()
+      tracker.install()
+      tracker.on('query', (query) => {
+        expect(query.sql).toMatch('select \* from "testTable" where \("name" \= $1\)'
+)
+        query.response([{ id: 1 }])
+      })
+      const result = await baseRepository.getByFilter(
+        {
+          name: 'testName',
         }
       )
       expect(result).toHaveLength(1)

diff --git a/server/infra/database/BaseRepository.ts b/server/infra/database/BaseRepository.ts
@@ -32,7 +32,7 @@ export default class BaseRepository<T> {
    */
   async getByFilter<T>(
     filter: T,
-    options: { limit?: number, order?: { column: string, direction?: 'asc' | 'desc' } } | undefined = undefined,
+    options: { limit?: number, orderBy?: { column: string, direction?: 'asc' | 'desc' } } | undefined = undefined,
   ) {
     const whereBuilder = function (object: any, builder: Knex.QueryBuilder) {
       let result = builder
@@ -76,9 +76,9 @@ export default class BaseRepository<T> {
     if (options && options.limit) {
       promise = promise.limit(options && options.limit)
     }
-    if (options && options.order) {
-      let direction = (options.order.direction !== undefined) ? options.order.direction : 'asc';
-      promise = promise.orderBy(options.order.column, direction)
+    if (options && options.orderBy) {
+      let direction = (options.orderBy.direction !== undefined) ? options.orderBy.direction : 'asc';
+      promise = promise.orderBy(options.orderBy.column, direction)
     }
     const result = await promise
     return result