generic explirer removal jjob (#398)

* generic explirer removal jjob * fix bug * fix tests --------- Co-authored-by: Antoine de Chevigné <antoine@tryethernal.com>
tryethernal · Dec 12, 2024 · 3c2df6e · 3c2df6e
1 parent 097d3a6
commit 3c2df6e
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 44 deletions.
diff --git a/run/jobs/cancelDemoExplorers.js b/run/jobs/cancelDemoExplorers.js
diff --git a/run/jobs/index.js b/run/jobs/index.js
@@ -35,7 +35,7 @@ module.exports = {
     workspaceReset: require('./workspaceReset'),
     batchBlockDelete: require('./batchBlockDelete'),
     batchContractDelete: require('./batchContractDelete'),
-    cancelDemoExplorers: require('./cancelDemoExplorers'),
+    removeExpiredExplorers: require('./removeExpiredExplorers'),
     deleteWorkspace: require('./deleteWorkspace'),
     tokenTransferCleanup: require('./tokenTransferCleanup'),
     queueMonitoring: require('./queueMonitoring'),

diff --git a/run/jobs/removeExpiredExplorers.js b/run/jobs/removeExpiredExplorers.js
@@ -0,0 +1,52 @@
+const { Op } = require('sequelize');
+const { Explorer, StripeSubscription, StripePlan, Workspace } = require('../models');
+const { enqueue } = require('../lib/queue');
+
+module.exports = async () => {
+    const explorers = (await Explorer.findAll({
+        include: [
+            {
+                model: StripeSubscription,
+                as: 'stripeSubscription',
+                include: {
+                    model: StripePlan,
+                    as: 'stripePlan',
+                    where: {
+                        capabilities: {
+                            expiresAfter: {
+                                [Op.not]: null
+                            }
+                        }
+                    }
+                }
+            },
+            {
+                model: Workspace,
+                as: 'workspace'
+            }
+        ]
+    })).filter(e => !!e.stripeSubscription);
+
+    const deleted = [];
+    for (let i = 0; i < explorers.length; i++) {
+        const explorer = explorers[i];
+        const expiresAfterDays = explorer.stripeSubscription.stripePlan.capabilities.expiresAfter;
+        const expirationDate = new Date(explorer.createdAt);
+        expirationDate.setDate(expirationDate.getDate() + expiresAfterDays);
+
+        const daysDiff = Math.floor((expirationDate - new Date()) / (1000 * 60 * 60 * 24));
+
+        if (daysDiff <= 0) {
+            await explorer.workspace.update({ pendingDeletion: true, public: false });
+            await explorer.safeDelete({ deleteSubscription: true });
+            await enqueue('workspaceReset', `workspaceReset-${explorer.workspaceId}`, {
+                workspaceId: explorer.workspaceId,
+                from: new Date(0),
+                to: new Date()
+            });
+            await enqueue('deleteWorkspace', `deleteWorkspace-${explorer.workspaceId}`, { workspaceId: explorer.workspaceId });
+            deleted.push(explorer.slug);
+        }
+    }
+    return deleted;
+};
diff --git a/run/models/explorer.js b/run/models/explorer.js
@@ -355,11 +355,19 @@ module.exports = (sequelize, DataTypes) => {
         return subscription && subscription.stripePlan.capabilities[capability];
     }
 
-    async safeDelete() {
+    async safeDelete(opts = { deleteSubscription: false }) {
         const stripeSubscription = await this.getStripeSubscription();
-        if (!stripeSubscription || stripeSubscription && stripeSubscription.isPendingCancelation || !isStripeEnabled()) {
+        if (
+            !stripeSubscription ||
+            stripeSubscription && stripeSubscription.isPendingCancelation ||
+            stripeSubscription && opts.deleteSubscription ||
+            !isStripeEnabled()
+        ) {
             const transaction = await sequelize.transaction();
             try {
+                if (stripeSubscription && opts.deleteSubscription)
+                    await stripeSubscription.destroy({ transaction });
+
                 const domains = await this.getDomains();
                 for (let i = 0; i < domains.length; i++)
                     await domains[i].destroy({ transaction });

diff --git a/run/scheduler.js b/run/scheduler.js
@@ -9,8 +9,8 @@ const BLOCK_SYNC_MONITORING_INTERVAL = 60 * 1000;
 
 (async () => {
     await enqueue(
-        'cancelDemoExplorers',
-        'cancelDemoExplorers',
+        'removeExpiredExplorers',
+        'removeExpiredExplorers',
         {},
         10,
         { every: CANCEL_DEMO_INTERVAL }

diff --git a/run/tests/jobs/deleteWorkspace.test.js b/run/tests/jobs/deleteWorkspace.test.js
@@ -10,7 +10,7 @@ beforeEach(() => jest.clearAllMocks());
 
 jest.spyOn(env, 'getMaxBlockForSyncReset').mockReturnValue(2);
 
-describe('cancelDemoExplorers', () => {
+describe('deleteWorkspace', () => {
     it('Should return if cannot find workspace', (done) => {
         jest.spyOn(Workspace, 'findByPk').mockResolvedValueOnce(null);
 

diff --git a/run/tests/jobs/cancelDemoExplorers.test.js → ...tests/jobs/removeExpiredExplorers.test.js b/run/tests/jobs/cancelDemoExplorers.test.js → ...tests/jobs/removeExpiredExplorers.test.js
@@ -2,15 +2,15 @@ require('../mocks/lib/queue');
 const { Explorer } = require('../mocks/models');
 const { enqueue } = require('../../lib/queue');
 
-const cancelDemoExplorers = require('../../jobs/cancelDemoExplorers');
+const removeExpiredExplorers = require('../../jobs/removeExpiredExplorers');
 
 beforeEach(() => jest.clearAllMocks());
 
 const safeDeleteSubscription = jest.fn();
 const safeDelete = jest.fn();
 const update = jest.fn();
 
-describe('cancelDemoExplorers', () => {
+describe('removeExpiredExplorers', () => {
     it('Should delete subscription, explorer, update workspace & enqueue ws reset & deletion', (done) => {
         jest.useFakeTimers()
             .setSystemTime(new Date('2023-12-26'));
@@ -19,18 +19,35 @@ describe('cancelDemoExplorers', () => {
             {
                 workspaceId: 1,
                 slug: 'slug',
-                stripeSubscription: { stripeId: '123' },
+                stripeSubscription: { stripeId: '123', stripePlan: { capabilities: { expiresAfter: 7 }}},
+                createdAt: new Date('2023-11-26'),
+                safeDeleteSubscription,
+                safeDelete,
+                workspace: { update }
+            },
+            {
+                workspaceId: 1,
+                slug: 'slug',
+                stripeSubscription: { stripeId: '123', stripePlan: { capabilities: { expiresAfter: 7 }}},
+                createdAt: new Date('2023-12-25'),
+                safeDeleteSubscription,
+                safeDelete,
+                workspace: { update }
+            },
+            {
+                workspaceId: 1,
+                slug: 'slug',
+                stripeSubscription: { stripeId: '123', stripePlan: { capabilities: {} }},
                 safeDeleteSubscription,
                 safeDelete,
                 workspace: { update }
             }
         ]);
 
-        cancelDemoExplorers()
+        removeExpiredExplorers()
             .then(res => {
-                expect(safeDeleteSubscription).toHaveBeenCalledWith();
-                expect(safeDelete).toHaveBeenCalled();
                 expect(update).toHaveBeenCalledWith({ pendingDeletion: true, public: false });
+                expect(safeDelete).toHaveBeenNthCalledWith(1, { deleteSubscription: true });
                 expect(enqueue).toHaveBeenCalledWith('workspaceReset', 'workspaceReset-1', {
                     workspaceId: 1,
                     from: new Date(0),

diff --git a/run/workers/priorities.json b/run/workers/priorities.json
@@ -33,7 +33,7 @@
         "workspaceReset",
         "batchBlockDelete",
         "batchContractDelete",
-        "cancelDemoExplorers",
+        "removeExpiredExplorers",
         "deleteWorkspace",
         "tokenTransferCleanup",
         "removeStalledBlock",