From 3446bc35556def29cfd50550455a90d663c419fa Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 27 Oct 2022 14:01:32 +0800
Subject: [PATCH] Use the correct data format in the pub/sub queue

---
 packages/api/src/routers/svc/integrations.ts   | 15 ++++++++++++---
 packages/api/test/routers/integrations.test.ts |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index f8dda9d40..108c5efc7 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -13,8 +13,10 @@ import { DateFilter } from '../../utils/search'
 
 export interface Message {
   type?: EntityType
-  data?: any
+  id?: string
   userId: string
+  pageId?: string
+  articleId?: string
 }
 
 const logger = buildLogger('app.dispatch')
@@ -41,7 +43,9 @@ export function integrationsServiceRouter() {
     }
 
     try {
-      const { userId, type, data }: Message = JSON.parse(msgStr)
+      const data: Message = JSON.parse(msgStr)
+      const userId = data.userId
+      const type = data.type
       if (!userId) {
         logger.info('No userId found in message')
         res.status(400).send('Bad Request')
@@ -62,7 +66,7 @@ export function integrationsServiceRouter() {
       const action = req.params.action.toUpperCase()
       if (action === 'SYNC_UPDATED') {
         // get updated page by id
-        let id = ''
+        let id: string | undefined
         switch (type) {
           case EntityType.PAGE:
             id = data.id
@@ -74,6 +78,11 @@ export function integrationsServiceRouter() {
             id = data.pageId
             break
         }
+        if (!id) {
+          logger.info('No id found in message')
+          res.status(400).send('Bad Request')
+          return
+        }
         const page = await getPageById(id)
         if (!page) {
           logger.info('No page found for id', { id })
diff --git a/packages/api/test/routers/integrations.test.ts b/packages/api/test/routers/integrations.test.ts
index 99892f724..453f2248a 100644
--- a/packages/api/test/routers/integrations.test.ts
+++ b/packages/api/test/routers/integrations.test.ts
@@ -190,7 +190,7 @@ describe('Integrations routers', () => {
                       JSON.stringify({
                         userId: user.id,
                         type: 'page',
-                        data: { id: page.id },
+                        id: page.id,
                       })
                     ).toString('base64'),
                     publishTime: new Date().toISOString(),
@@ -257,7 +257,7 @@ describe('Integrations routers', () => {
                       JSON.stringify({
                         userId: user.id,
                         type: 'highlight',
-                        data: { articleId: page.id },
+                        articleId: page.id,
                       })
                     ).toString('base64'),
                     publishTime: new Date().toISOString(),