fix: Error with order on count query (#45)

decentraland · Jan 29, 2025 · ee45108 · ee45108
1 parent 039c67d
commit ee45108
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/adapters/db.ts b/src/adapters/db.ts
@@ -73,15 +73,18 @@ export function createDBComponent(components: Pick<AppComponents, 'pg' | 'logs'>
         FROM friendship_actions fa2
         WHERE fa2.friendship_id = fa.friendship_id
       )
-      ORDER BY fa.timestamp DESC
     `)
 
-    if (limit) {
-      baseQuery.append(SQL` LIMIT ${limit}`)
-    }
+    if (!onlyCount) {
+      baseQuery.append(SQL` ORDER BY fa.timestamp DESC`)
+
+      if (limit) {
+        baseQuery.append(SQL` LIMIT ${limit}`)
+      }
 
-    if (offset) {
-      baseQuery.append(SQL` OFFSET ${offset}`)
+      if (offset) {
+        baseQuery.append(SQL` OFFSET ${offset}`)
+      }
     }
 
     return baseQuery

diff --git a/test/unit/adapters/db.spec.ts b/test/unit/adapters/db.spec.ts
@@ -293,6 +293,11 @@ describe('db', () => {
       const result = await dbComponent.getReceivedFriendshipRequestsCount('0x456')
 
       expect(result).toBe(mockCount)
+      expect(mockPg.query).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          text: expect.stringContaining('ORDER BY fa.timestamp DESC')
+        })
+      )
     })
   })
 
@@ -336,6 +341,11 @@ describe('db', () => {
       const result = await dbComponent.getSentFriendshipRequestsCount('0x123')
 
       expect(result).toBe(mockCount)
+      expect(mockPg.query).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          text: expect.stringContaining('ORDER BY fa.timestamp DESC')
+        })
+      )
     })
   })