Merge branch 'fix/save-workspace-blocked-date' of https://github.com/codex-team/hawk.workers into fix/save-workspace-blocked-date

Author: talyguryn

lib/utils/payday.ts

@@ -62,9 +62,9 @@ export function countDaysAfterBlock(workspace: WorkspaceDBScheme): number | unde
     return;
   }
 
-  const expectedPayDay = new Date(workspace.blockedDate);
+  const blockedDay = new Date(workspace.blockedDate);
 
   const now = new Date().getTime();
 
-  return Math.floor((now - expectedPayDay.getTime()) / MILLISECONDS_IN_DAY);
+  return Math.floor((now - blockedDay.getTime()) / MILLISECONDS_IN_DAY);
 }

workers/paymaster/src/index.ts

@@ -373,7 +373,7 @@ export default class PaymasterWorker extends Worker {
    * Sends reminder emails to blocked workspace admins
    *
    * @param workspace - workspace to send reminders for
-   * @param daysAfterBlock - number of days the workspace spent after payday
+   * @param daysAfterBlock - number of days since the workspace was blocked
    */
   private async sendBlockedWorkspaceReminders(
     workspace: WorkspaceDBScheme,

workers/paymaster/tests/index.test.ts

@@ -60,7 +60,7 @@ const createWorkspaceMock = (parameters: {
     balance: 0,
     subscriptionId: parameters.subscriptionId,
     isBlocked: parameters.isBlocked,
-    blockedDate: parameters.isBlocked ? new Date() : null,
+    blockedDate: parameters.blockedDate !== undefined ? parameters.blockedDate : (parameters.isBlocked ? new Date() : null),
   };
 
   if (parameters.paidUntil) {