chore: linting and tests

Author: wilsonrivera

controlplane/src/bin/db-cleanup.ts

@@ -130,10 +130,7 @@ async function queueOrganizationsForDeletion({
         isNull(schema.organizations.queuedForDeletionAt),
         eq(schema.organizations.isDeactivated, false),
         lt(schema.organizations.createdAt, inactivityThreshold),
-        or(
-          isNull(schema.organizationBilling.plan),
-          eq(schema.organizationBilling.plan, 'developer'),
-        ),
+        or(isNull(schema.organizationBilling.plan), eq(schema.organizationBilling.plan, 'developer')),
       ),
     )
     .groupBy(schema.organizations.id, schema.organizationBilling.plan)
@@ -209,8 +206,8 @@ async function processChunkOfOrganizations({
     // Queue the organization deletion notification job
     await notifyOrganizationDeletionQueuedQueue.addJob({
       organizationId: org.id,
-      queuedAt: queuedAt.getTime(),
-      deletesAt: deletesAt.getTime(),
+      queuedAt: Number(queuedAt),
+      deletesAt: Number(deletesAt),
     });
   }
 }

controlplane/src/core/workers/NotifyOrganizationDeletionQueuedWorker.ts

@@ -85,6 +85,10 @@ class NotifyOrganizationDeletionQueuedWorker implements IWorker {
 
       const organizationMembers = await orgRepo.getMembers({ organizationID: org.id });
       const orgAdmins = organizationMembers.filter((m) => m.rbac.isOrganizationAdmin);
+      if (orgAdmins.length === 0) {
+        this.input.logger.warn({ organizationId: org.id }, 'No admins found for organization, skipping notification');
+        return;
+      }
 
       const intl = Intl.DateTimeFormat(undefined, {
         dateStyle: 'medium',

controlplane/test/test-util.ts

@@ -416,6 +416,7 @@ export const SetupTest = async function ({
       deactivateOrganizationQueue,
       deleteUserQueue,
       reactivateOrganizationQueue,
+      notifyOrganizationDeletionQueuedQueue,
     },
   };
 };