A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(api): report final system DM progress (#3074)
Hampuseaeeb3b502e8
diff --git a/fluxer_api/src/api/worker/tasks/SendSystemDm.ts b/fluxer_api/src/api/worker/tasks/SendSystemDm.tsindex 295dad199..07fb1d644 100644--- a/fluxer_api/src/api/worker/tasks/SendSystemDm.ts+++ b/fluxer_api/src/api/worker/tasks/SendSystemDm.ts@@ -6,7 +6,7 @@ import type {User} from '@app/api/models/User';import {UserChannelService} from '@app/api/user/services/UserChannelService';import {getWorkerDependencies} from '@app/api/worker/WorkerContext';import {UserFlags} from '@fluxer/constants/src/UserConstants';-import {JobCancelledError, type WorkerTaskHelpers} from '@pkgs/worker/src/contracts/WorkerTask';+import {JobCancelledError, type WorkerTaskHelpers, type WorkerTaskResult} from '@pkgs/worker/src/contracts/WorkerTask';import {z} from 'zod';const SYSTEM_USER_ID: UserID = createUserID(0n);@@ -56,7 +56,7 @@ async function* listedRecipients(userIds: Array<string>): AsyncGenerator<UserID>}}-export async function sendSystemDm(payload: unknown, helpers: WorkerTaskHelpers): Promise<void> {+export async function sendSystemDm(payload: unknown, helpers: WorkerTaskHelpers): Promise<WorkerTaskResult> {const parsed = PayloadSchema.parse(payload);const {content} = parsed;const total = 'user_ids' in parsed ? parsed.user_ids.length : null;@@ -105,5 +105,7 @@ export async function sendSystemDm(payload: unknown, helpers: WorkerTaskHelpers)}}requestCache.clear();+ await helpers.reportProgress(sent + failed, sent + failed, `${sent} sent, ${failed} failed`);helpers.logger.info({sent, failed, total: sent + failed}, 'System DM job complete');+ return {sent_count: sent, failed_count: failed};}diff --git a/fluxer_api/src/api/worker/tests/SendSystemDmCancel.test.ts b/fluxer_api/src/api/worker/tests/SendSystemDmCancel.test.tsindex c11419d2f..3d32dace1 100644--- a/fluxer_api/src/api/worker/tests/SendSystemDmCancel.test.ts+++ b/fluxer_api/src/api/worker/tests/SendSystemDmCancel.test.ts@@ -219,7 +219,7 @@ describe('System DM cancellation', () => {await expect(runner.runJob(TASK_TYPE, createJobMessage({all_users: true}) as unknown as JsMsg)).resolves.toBe(true);expect(recipientIds).toEqual([21n, 24n]);- expect(markSucceeded).toHaveBeenCalledTimes(1);+ expect(markSucceeded).toHaveBeenCalledWith(LEDGER_JOB_ID, {sent_count: 2, failed_count: 0});expect(kv.size).toBe(0);});});