@things-factory/announcement 10.1.257 → 10.1.259

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/announcement",
-  "version": "10.1.257",
+  "version": "10.1.259",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,18 +36,18 @@
     "@operato/shell": "^10.29.69",
     "@operato/styles": "^10.29.1",
     "@operato/utils": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.257",
-    "@things-factory/attachment-base": "^10.1.257",
-    "@things-factory/auth-base": "^10.1.257",
+    "@things-factory/ai-assistant": "^10.1.259",
+    "@things-factory/attachment-base": "^10.1.259",
+    "@things-factory/auth-base": "^10.1.259",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/i18n-base": "^10.1.257",
-    "@things-factory/notification": "^10.1.257",
-    "@things-factory/organization": "^10.1.257",
-    "@things-factory/shell": "^10.1.254",
+    "@things-factory/i18n-base": "^10.1.259",
+    "@things-factory/notification": "^10.1.259",
+    "@things-factory/organization": "^10.1.259",
+    "@things-factory/shell": "^10.1.259",
     "graphql-scalars": "^1.22.0",
     "graphql-tag": "^2.12.6",
     "graphql-upload": "^15.0.2",
     "lit": "^3.1.2"
   },
-  "gitHead": "885b594299601ca4936f4f39701d6713273bbf1e"
+  "gitHead": "e7283779ee700b4b124226f0ad22d7c1e4063ae7"
 }

package/server/service/announcement/announcement-rules.ts

@@ -217,23 +217,3 @@ export function noticeWordsOf(one: { title: string; body?: string | null }, kind
     note: say('announcement.notice.note', 'Open Announcements in the application to read it.')
   }
 }
-
-export type NoticeCount = { receivers: number; email: { sent: number; failed: number }; teams: { sent: number; failed: number } }
-
-/** One telling as the announcement keeps it - when, why, and what went out. A send that could not go at all counts its receivers, nothing sent. */
-export function deliveryOf(kind: NoticeKind, result: NoticeCount | undefined, receivers: number, at = new Date()) {
-  return {
-    at: at.toISOString(),
-    kind,
-    receivers: result?.receivers ?? receivers,
-    email: result?.email ?? { sent: 0, failed: 0 },
-    teams: result?.teams ?? { sent: 0, failed: 0 },
-    ...(result ? {} : { failed: true })
-  }
-}
-
-/** The record kept on an announcement - the newest tellings, at most `MAX_DELIVERIES`. */
-export const MAX_DELIVERIES = 50
-export function withDelivery<T>(deliveries: T[] | null | undefined, one: T): T[] {
-  return [...(deliveries ?? []), one].slice(-MAX_DELIVERIES)
-}

package/server/service/announcement/announcement-service.ts

@@ -7,12 +7,12 @@ import { EntityManager, In, IsNull, LessThanOrEqual } from 'typeorm'
 import { checkPermission, User, UserStatus } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { translatorFor } from '@things-factory/i18n-base/translator'
-import { noticeLinkOf, sendNotice, sendNoticeWhenCommitted, type Notice, type NoticeResult } from '@things-factory/notification'
+import { keepNoticeDelivery, noticeDeliveryOf, noticeLinkOf, sendNotice, sendNoticeWhenCommitted, type Notice } from '@things-factory/notification'
 import { audienceMemberOf, audienceUserIds, type AudienceMember } from '@things-factory/organization'
 import { Domain, getDataSource, getRepository } from '@things-factory/shell'
 
 import { Announcement, AnnouncementAudience, AnnouncementReceipt, AnnouncementRevision, AnnouncementStatus } from './announcement'
-import { broadcastOf, deliveryOf, noticeWordsOf, viewAddressOf, withDelivery, type NoticeKind, type Say } from './announcement-rules'
+import { broadcastOf, noticeWordsOf, viewAddressOf, type NoticeKind, type Say } from './announcement-rules'
 
 /** The attachments of an announcement hang on it under this `refType` (attachment-base). */
 export const ANNOUNCEMENT_REF_TYPE = 'Announcement'
@@ -173,17 +173,6 @@ function noticeOf(one: Announcement, kind: NoticeKind, receivers: Notice['receiv
   }
 }
 
-/** Keeps what one telling sent on the announcement - in its own transaction, the request's being over. */
-async function recordDelivery(id: string, kind: NoticeKind, result: NoticeResult | undefined, receivers: number): Promise<void> {
-  try {
-    const repository = getRepository(Announcement)
-    const one = await repository.findOneBy({ id })
-    if (one) await repository.update(id, { deliveries: withDelivery(one.deliveries, deliveryOf(kind, result, receivers)) } as any)
-  } catch (error) {
-    logger.error(`announcement ${id}: what was sent could not be kept`, error)
-  }
-}
-
 /**
  * Tells `userIds` of it once the request's transaction has committed - a reader told before it would not find it yet -
  * and keeps what went out. A notice that does not arrive does not undo the announcement: its list, badge and popup
@@ -194,7 +183,7 @@ export async function tellWhenCommitted(context: any, one: Announcement, kind: N
   if (!receivers.length) return
   const broadcast = toEveryone && broadcastOf(await audiencesOf(one.id, context.state.tx), context.state.domain?.id)
   sendNoticeWhenCommitted(context, noticeOf(one, kind, receivers, broadcast, noticeLinkOf(context, viewAddressOf(one.id))), result =>
-    recordDelivery(one.id, kind, result, receivers.length)
+    keepNoticeDelivery(Announcement, one.id, 'deliveries', noticeDeliveryOf(kind, result, receivers.length))
   )
 }
 
@@ -222,7 +211,7 @@ export async function publishDue(now = new Date()): Promise<number> {
       /* No request, so no address to put on a mail button - the mail says where to find it instead. */
       const people = await receiversOf(receivers)
       const broadcast = broadcastOf(await audiencesOf(one.id), one.domain?.id)
-      if (people.length) await recordDelivery(one.id, 'published', await sendNotice(one.domain, noticeOf(one, 'published', people, broadcast)), people.length)
+      if (people.length) await keepNoticeDelivery(Announcement, one.id, 'deliveries', noticeDeliveryOf('published', await sendNotice(one.domain, noticeOf(one, 'published', people, broadcast)), people.length))
     } catch (error) {
       logger.error(`announcement ${one.id}: publishing at its start failed`, error)
     }

package/test/announcement-persistence.test.ts

@@ -11,9 +11,11 @@ const { existsSync } = require('fs')
 const { join } = require('path')
 const { DataSource } = require('typeorm')
 
-/* What notification was asked to send (ADR-0164) - the channels themselves are notification's tests. */
+/* What notification was asked to send (ADR-0164) - the channels themselves are notification's tests. What went out is
+ * kept on the announcement by notification's own record (`keepNoticeDelivery`), so the real one is used. */
 const told: { domain: any; notice: any }[] = []
 jest.mock('@things-factory/notification', () => ({
+  ...jest.requireActual('@things-factory/notification/dist-server/controllers/notice/notice-delivery-record.js'),
   sendNotice: async (domain: any, notice: any) => {
     told.push({ domain, notice })
     return { receivers: notice.receivers.length, email: { sent: notice.channels?.email ? notice.receivers.length : 0, failed: 0 }, teams: { sent: 0, failed: 0 } }

package/test/announcement-rules.test.ts

@@ -7,9 +7,7 @@ import {
   inputRefusal,
   isCurrent,
   linkRefusal,
-  deliveryOf,
   noticeWordsOf,
-  withDelivery,
   owedReminder,
   periodOf,
   readerNarrowingOf,
@@ -194,19 +192,6 @@ describe('the notice', () => {
     expect(noticeWordsOf({ title: 'x' }, 'published', say).body).toBe('')
   })
 
-  it('★ each telling is kept - what went out, or that nothing could go', () => {
-    const at = new Date('2026-10-26T09:00:00Z')
-    const sent = { receivers: 3, email: { sent: 2, failed: 1 }, teams: { sent: 0, failed: 0 } }
-    expect(deliveryOf('published', sent, 3, at)).toEqual({ at: '2026-10-26T09:00:00.000Z', kind: 'published', ...sent })
-    expect(deliveryOf('reminder', undefined, 4, at)).toEqual({ at: '2026-10-26T09:00:00.000Z', kind: 'reminder', receivers: 4, email: { sent: 0, failed: 0 }, teams: { sent: 0, failed: 0 }, failed: true })
-  })
-
-  it('the record keeps the newest fifty', () => {
-    const many = Array.from({ length: 50 }, (_, i) => i)
-    expect(withDelivery(many, 50)).toEqual(Array.from({ length: 50 }, (_, i) => i + 1))
-    expect(withDelivery(null, 1)).toEqual([1])
-  })
-
   it('★ only the marks that wrap words go - a lone ~, _ or | is part of the text', () => {
     expect(plainSummary('**11월 2일(월) 22시~24시** 점검 · ~~취소~~ `a_b` *기울임* | 표')).toBe('11월 2일(월) 22시~24시 점검 · 취소 a_b 기울임 | 표')
   })