imp(limiter): use methods consistently

Author: e11sy

workers/limiter/src/dbHelper.ts

@@ -109,25 +109,6 @@ export class DbHelper {
     await this.workspacesCollection.bulkWrite(operations);
   }
 
-  /**
-   * Method to change workspace isBlocked state
-   *
-   * @param workspaceId - id of the workspace to be changed
-   * @param isBlocked - new isBlocked state of the workspace
-   */
-  public async changeWorkspaceBlockedState(workspaceId: string, isBlocked: boolean): Promise<void> {
-    const result = await this.workspacesCollection.updateOne(
-      { _id: new ObjectId(workspaceId) },
-      {
-        $set: {
-          isBlocked,
-        },
-      }
-    );
-
-    console.log('result of changeWorkspaceBlockedState', JSON.stringify(result));
-  }
-
   /**
    * Returns total event counts for last billing period
    *

workers/limiter/src/index.ts

@@ -128,7 +128,10 @@ export default class LimiterWorker extends Worker {
     const workspaceProjects = await this.dbHelper.getProjects(event.workspaceId);
     const projectIds = workspaceProjects.map(project => project._id.toString());
 
-    await this.dbHelper.changeWorkspaceBlockedState(event.workspaceId, true);
+    const { updatedWorkspace } = await this.prepareWorkspaceUsageUpdate(workspace, workspaceProjects);
+
+    updatedWorkspace.isBlocked = true;
+    await this.dbHelper.updateWorkspacesEventsCountAndIsBlocked([updatedWorkspace]);
 
     this.logger.info('workspace blocked in db ', event.workspaceId)
 
@@ -170,7 +173,8 @@ export default class LimiterWorker extends Worker {
       return;
     }
 
-    await this.dbHelper.changeWorkspaceBlockedState(event.workspaceId, false);
+    updatedWorkspace.isBlocked = false;
+
     await this.dbHelper.updateWorkspacesEventsCountAndIsBlocked([updatedWorkspace]);
     await this.redis.removeBannedProjects(projectIds);
 

workers/limiter/tests/dbHelper.test.ts

@@ -272,34 +272,6 @@ describe('DbHelper', () => {
     });
   });
 
-  describe('changeWorkspaceBlockedState', () => {
-    test('Should change workspace blocked state', async () => {
-      /**
-       * Arrange
-       */
-      const workspace = createWorkspaceMock({
-        plan: mockedPlans.eventsLimit10,
-        billingPeriodEventsCount: 0,
-        lastChargeDate: new Date(),
-        isBlocked: false,
-      });
-
-      await workspaceCollection.insertOne(workspace);
-
-      /**
-       * Act
-       */
-      await dbHelper.changeWorkspaceBlockedState(workspace._id.toString(), true);
-
-      /**
-       * Assert
-       */
-      const updatedWorkspace = await workspaceCollection.findOne({ _id: workspace._id });
-
-      expect(updatedWorkspace.isBlocked).toBe(true);
-    });
-  });
-
   describe('getEventsCountByProject', () => {
     test('Should count events and repetitions for a project', async () => {
       /**