Fix demo migration (#321)

* fix demo migration * add tests
tryethernal · Jan 10, 2024 · feaa465 · feaa465
1 parent c14bc36
commit feaa465
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 7 deletions.
diff --git a/run/jobs/updateExplorerSyncingProcess.js b/run/jobs/updateExplorerSyncingProcess.js
@@ -32,7 +32,11 @@ module.exports = async job => {
     const pm2 = new PM2(process.env.PM2_HOST, process.env.PM2_SECRET);
     const { data: existingProcess } = await pm2.find(data.explorerSlug);
 
-    if (!explorer && existingProcess) {
+    if (data.reset) {
+        await pm2.reset(explorer.slug, explorer.workspaceId);
+        return 'Process reset.';
+    }
+    else if (!explorer && existingProcess) {
         await pm2.delete(data.explorerSlug);
         return 'Process deleted: no explorer.';
     }

diff --git a/run/lib/pm2.js b/run/lib/pm2.js
@@ -26,6 +26,13 @@ class PM2 {
         return withTimeout(axios.post(resource, { slug, workspaceId }));
     }
 
+    async reset(slug, workspaceId) {
+        if (!slug || !workspaceId) throw new Error('Missing parameter');
+
+        await this.delete(slug);
+        return this.start(slug, workspaceId);
+    }
+
     resume(slug) {
         if (!slug) throw new Error('Missing parameter');
 

diff --git a/run/lib/stripe.js b/run/lib/stripe.js
@@ -1,6 +1,7 @@
 const stripe = require('stripe')(process.env.STRIPE_SECRET_KEY);
 const Analytics = require('./analytics');
 const db = require('./firebase');
+const { enqueue } = require('./queue');
 const models = require('../models');
 const analytics = new Analytics();
 
@@ -72,12 +73,16 @@ const updateExplorerSubscription = async (stripeSubscription) => {
 
     if (!stripePlan)
         return 'Cannot find plan';
-    
+
     const stripeCustomer = await stripe.customers.retrieve(stripeSubscription.customer);
 
     if (explorer.stripeSubscription) {
         if (explorer.isDemo && !explorer.stripeSubscription.stripeId) {
             await db.migrateDemoExplorer(explorer.id, user.id, stripeSubscription);
+            await enqueue('updateExplorerSyncingProcess', `updateExplorerSyncingProcess-${explorer.id}`, {
+                explorerSlug: explorer.slug, reset: true
+            });
+
             analytics.track(user.id, 'explorer:demo_migrate', {
                 is_trial: stripeSubscription.status == 'trialing',
                 plan_slug: stripePlan.slug

diff --git a/run/models/block.js b/run/models/block.js
@@ -71,7 +71,7 @@ module.exports = (sequelize, DataTypes) => {
   }, {
     hooks: {
         async afterCreate(block, options) {
-          const workspace = await block.getWorkspace();
+          const workspace = await block.getWorkspace({ include: 'explorer' });
           if (workspace.public) {
             await enqueue('removeStalledBlock', `removeStalledBlock-${block.id}`, { blockId: block.id }, null, null, STALLED_BLOCK_REMOVAL_DELAY);
             const afterCreateFn = async () => {
@@ -96,6 +96,8 @@ module.exports = (sequelize, DataTypes) => {
                 }
                 await bulkEnqueue('processTransactionTrace', jobs);
               }
+              if (!workspace.integrityCheckStartBlockNumber && workspace.explorer && workspace.explorer.isDemo)
+                await workspace.update({ integrityCheckStartBlockNumber: block.number });
             }
             if (options.transaction)
               return options.transaction.afterCommit(afterCreateFn);

diff --git a/run/tests/jobs/updateExplorerSyncingProcess.test.js b/run/tests/jobs/updateExplorerSyncingProcess.test.js
@@ -10,6 +10,22 @@ beforeEach(() => jest.clearAllMocks());
 const hasReachedTransactionQuota = jest.fn().mockResolvedValue(false);
 
 describe('updateExplorerSyncingProcess', () => {
+    it('Should reset if flag is passed', (done) => {
+        const reset = jest.fn();
+        PM2.mockImplementationOnce(() => ({
+            reset,
+            find: jest.fn().mockResolvedValue({ data: { pm2_env: { status: 'online' }}})
+        }));
+        jest.spyOn(Explorer, 'findOne').mockResolvedValue({ slug: 'slug', workspaceId: 1 });
+
+        updateExplorerSyncingProcess({ data: { explorerSlug: 'explorer', reset: true }})
+            .then(res => {
+                expect(reset).toHaveBeenCalledWith('slug', 1);
+                expect(res).toEqual('Process reset.');
+                done();
+            });
+    });
+
     it('Should delete if no explorer', (done) => {
         PM2.mockImplementationOnce(() => ({
             delete: jest.fn(),

diff --git a/run/tests/lib/pm2.test.js b/run/tests/lib/pm2.test.js
@@ -8,7 +8,30 @@ const PM2 = require('../../lib/pm2');
 beforeEach(() => jest.clearAllMocks());
 
 const host = 'http://pm2';
-const secret= 'secret';
+const secret = 'secret';
+
+describe('reset', () => {
+    it('Should throw an error if missing parameter', (done) => {
+        const pm2 = new PM2(host, secret);
+        pm2.reset()
+            .catch(error => {
+                expect(error).toEqual(new Error('Missing parameter'));
+                done();
+            });
+    });
+
+    it('Should reset the process', (done) => {
+        jest.spyOn(axios, 'get').mockResolvedValueOnce({ data: null });
+
+        const pm2 = new PM2(host, secret);
+        pm2.reset('slug', 1)
+            .then(() => {
+                expect(axios.post).toHaveBeenCalledWith('http://pm2/processes/slug/delete?secret=secret');
+                expect(axios.post).toHaveBeenCalledWith('http://pm2/processes?secret=secret', { slug: 'slug', workspaceId: 1 });
+                done();
+            });
+    });
+});
 
 describe('restart', () => {
     it('Should throw an error if missing parameter', () => {

diff --git a/src/components/MigrateExplorerModal.vue b/src/components/MigrateExplorerModal.vue
@@ -28,7 +28,7 @@
                     </ul>
                 </v-card-text>
                 <div align="center" class="mb-4">
-                    <v-btn :disabled="!finalized" color="primary" @click="goToOverview()">Continue</v-btn>
+                    <v-btn :disabled="!finalized" color="primary" @click="goToExplorer()">Continue</v-btn>
                 </div>
             </template>
             <template v-else>
@@ -102,8 +102,8 @@ export default {
             this.justMigrated = true;
             this.finalized = true;
         },
-        goToOverview() {
-            document.location.assign(`//app.${this.mainDomain}/overview`);
+        goToExplorer() {
+            document.location.assign(`//app.${this.mainDomain}/explorers/${this.explorerId}`);
         },
         close(refresh) {
             this.resolve(refresh);