fix: Syntax error on query (#43)

decentraland · Jan 27, 2025 · 518f0d5 · 518f0d5
1 parent a461f71
commit 518f0d5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/adapters/db.ts b/src/adapters/db.ts
@@ -30,21 +30,19 @@ export function createDBComponent(components: Pick<AppComponents, 'pg' | 'logs'>
       received: SQL` f.address_requester`
     }
     const filterMapping = {
-      sent: SQL`LOWER(f.address_requester)`,
-      received: SQL`LOWER(f.address_requested)`
+      sent: SQL` LOWER(f.address_requester)`,
+      received: SQL` LOWER(f.address_requested)`
     }
 
     const baseQuery = SQL`SELECT fa.id,`
     baseQuery.append(columnMapping[type])
-    baseQuery.append(SQL` as address`)
-    baseQuery.append(SQL`
-      fa.timestamp, fa.metadata
-      FROM friendships f
-      INNER JOIN friendship_actions fa ON f.id = fa.friendship_id
-      WHERE
-    `)
+    baseQuery.append(SQL` as address, fa.timestamp, fa.metadata`)
+    baseQuery.append(SQL` FROM friendships f`)
+    baseQuery.append(SQL` INNER JOIN friendship_actions fa ON f.id = fa.friendship_id`)
+    baseQuery.append(SQL` WHERE`)
 
-    baseQuery.append(filterMapping[type].append(SQL` = ${normalizeAddress(userAddress)}`))
+    baseQuery.append(filterMapping[type])
+    baseQuery.append(SQL` = ${normalizeAddress(userAddress)}`)
 
     baseQuery.append(SQL`
       AND fa.action = 'request'

diff --git a/test/unit/adapters/db.spec.ts b/test/unit/adapters/db.spec.ts
@@ -266,6 +266,14 @@ describe('db', () => {
       const result = await dbComponent.getReceivedFriendshipRequests('0x456', { limit: 10, offset: 5 })
 
       expect(result).toEqual(mockRequests)
+
+      expect(mockPg.query).toHaveBeenCalledWith(
+        expect.objectContaining({
+          text: expect.stringContaining(
+            'SELECT fa.id, f.address_requester as address, fa.timestamp, fa.metadata FROM friendships f INNER JOIN friendship_actions fa ON f.id = fa.friendship_id'
+          )
+        })
+      )
       expect(mockPg.query).toHaveBeenCalledWith(
         expect.objectContaining({
           text: expect.stringContaining('LOWER(f.address_requested) ='),
@@ -292,6 +300,13 @@ describe('db', () => {
       const result = await dbComponent.getSentFriendshipRequests('0x123', { limit: 10, offset: 5 })
 
       expect(result).toEqual(mockRequests)
+      expect(mockPg.query).toHaveBeenCalledWith(
+        expect.objectContaining({
+          text: expect.stringContaining(
+            'SELECT fa.id, f.address_requested as address, fa.timestamp, fa.metadata FROM friendships f INNER JOIN friendship_actions fa ON f.id = fa.friendship_id'
+          )
+        })
+      )
       expect(mockPg.query).toHaveBeenCalledWith(
         expect.objectContaining({
           text: expect.stringContaining('LOWER(f.address_requester) ='),