From cf95b6fa07430addfaaa26fe2e8411b234c73dc8 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 25 Oct 2023 14:41:49 +0800
Subject: [PATCH] rename the endpoint to /prune

---
 packages/api/src/routers/svc/user.ts   | 60 ++++++++++++--------------
 packages/api/test/routers/user.test.ts |  6 +--
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/packages/api/src/routers/svc/user.ts b/packages/api/src/routers/svc/user.ts
index 5b4350e59..ca6e9dbea 100644
--- a/packages/api/src/routers/svc/user.ts
+++ b/packages/api/src/routers/svc/user.ts
@@ -34,41 +34,37 @@ const getCleanupMessage = (msgStr: string): CleanupMessage => {
 export function userServiceRouter() {
   const router = express.Router()
 
-  router.post(
-    '/cleanup',
-    cors<express.Request>(corsConfig),
-    async (req, res) => {
-      logger.info('cleanup soft deleted users')
+  router.post('/prune', cors<express.Request>(corsConfig), async (req, res) => {
+    logger.info('prune soft deleted users')
 
-      const { message: msgStr, expired } = readPushSubscription(req)
+    const { message: msgStr, expired } = readPushSubscription(req)
 
-      if (!msgStr) {
-        return res.status(200).send('Bad Request')
-      }
-
-      if (expired) {
-        logger.info('discarding expired message')
-        return res.status(200).send('Expired')
-      }
-
-      const cleanupMessage = getCleanupMessage(msgStr)
-      const subTime = cleanupMessage.subDays * 1000 * 60 * 60 * 24 // convert days to milliseconds
-
-      try {
-        const result = await deleteUsers({
-          status: StatusType.Deleted,
-          updatedAt: LessThan(new Date(Date.now() - subTime)), // subDays ago
-        })
-        logger.info('cleanup result', result)
-
-        return res.sendStatus(200)
-      } catch (error) {
-        logger.error('error cleaning up users', error)
-
-        return res.sendStatus(500)
-      }
+    if (!msgStr) {
+      return res.status(200).send('Bad Request')
     }
-  )
+
+    if (expired) {
+      logger.info('discarding expired message')
+      return res.status(200).send('Expired')
+    }
+
+    const cleanupMessage = getCleanupMessage(msgStr)
+    const subTime = cleanupMessage.subDays * 1000 * 60 * 60 * 24 // convert days to milliseconds
+
+    try {
+      const result = await deleteUsers({
+        status: StatusType.Deleted,
+        updatedAt: LessThan(new Date(Date.now() - subTime)), // subDays ago
+      })
+      logger.info('prune result', result)
+
+      return res.sendStatus(200)
+    } catch (error) {
+      logger.error('error prune users', error)
+
+      return res.sendStatus(500)
+    }
+  })
 
   return router
 }
diff --git a/packages/api/test/routers/user.test.ts b/packages/api/test/routers/user.test.ts
index a5c61c2aa..d6ca4a003 100644
--- a/packages/api/test/routers/user.test.ts
+++ b/packages/api/test/routers/user.test.ts
@@ -12,7 +12,7 @@ import { request } from '../util'
 describe('User Service Router', () => {
   const token = process.env.PUBSUB_VERIFICATION_TOKEN || ''
 
-  describe('cleanup', () => {
+  describe('prune', () => {
     let toDeleteUserIds: string[] = []
 
     before(async () => {
@@ -43,7 +43,7 @@ describe('User Service Router', () => {
       await deleteUsers({ id: In(toDeleteUserIds) })
     })
 
-    it('deletes soft deleted users a day ago', async () => {
+    it('prunes soft deleted users a day ago', async () => {
       const data = {
         message: {
           data: Buffer.from(
@@ -54,7 +54,7 @@ describe('User Service Router', () => {
       }
 
       await request
-        .post('/svc/pubsub/user/cleanup?token=' + token)
+        .post('/svc/pubsub/user/prune?token=' + token)
         .send(data)
         .expect(200)