@things-factory/announcement 10.1.270 → 10.1.272

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/announcement",
-  "version": "10.1.270",
+  "version": "10.1.272",
   "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.270",
-    "@things-factory/attachment-base": "^10.1.270",
-    "@things-factory/auth-base": "^10.1.270",
+    "@things-factory/ai-assistant": "^10.1.272",
+    "@things-factory/attachment-base": "^10.1.271",
+    "@things-factory/auth-base": "^10.1.271",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/i18n-base": "^10.1.270",
-    "@things-factory/notification": "^10.1.270",
-    "@things-factory/organization": "^10.1.270",
+    "@things-factory/i18n-base": "^10.1.271",
+    "@things-factory/notification": "^10.1.272",
+    "@things-factory/organization": "^10.1.272",
     "@things-factory/shell": "^10.1.270",
     "graphql-scalars": "^1.22.0",
     "graphql-tag": "^2.12.6",
     "graphql-upload": "^15.0.2",
     "lit": "^3.1.2"
   },
-  "gitHead": "9fb23e57702302f1a6c6572d9f0f37ef6f12b446"
+  "gitHead": "f87fefe0687eedf52a25cda1c54d59efabaf3dc2"
 }

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

@@ -19,6 +19,7 @@ import { Announcement, AnnouncementAudience, AnnouncementImportance, Announcemen
 import { inputRefusal, isCurrent, owedReminder, periodOf, popupDue, publishedStatusOf, publishRefusal, rankOf, readerNarrowingOf, readerStateOf } from './announcement-rules'
 import {
   alignRoster,
+  announcementNoticeKey,
   ANNOUNCEMENT_REF_TYPE,
   audiencesOf,
   isWriter,
@@ -39,6 +40,7 @@ import {
   AnnouncementReceiptRow,
   AnnouncementSummary
 } from './announcement-types'
+import { closeNotices } from '@things-factory/notification'
 
 const WRITE = '@privilege(category: "announcement", privilege: "mutation", domainOwnerGranted: true)'
 
@@ -247,6 +249,8 @@ export class AnnouncementResolver {
     if (!Object.keys(patch).length) return visible.announcement
     if (!receipt) await repository.save({ domain, announcement: { id }, user: { id: user.id }, listed: false, ...patch, creator: user, updater: user } as any)
     else await repository.update(receipt.id, { ...patch, updater: user })
+    /* Read: its notice is read too, on every device and screen (ADR-0164 amendment 1) - one reading, not two. */
+    if (patch.readAt) await closeNotices(tx, domain, 'announcement', announcementNoticeKey(id), [user.id])
     /* The reader's other windows - their badge asks again. */
     tellChange(context as any, { kind: 'announcement', id, userIds: [user.id] })
     return visible.announcement

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

@@ -147,6 +147,9 @@ async function receiversOf(userIds: string[], tx?: EntityManager) {
   return people.filter(one => one.status === UserStatus.ACTIVATED).map(one => ({ id: one.id, email: one.email, locale: (one as any).locale }))
 }
 
+/** What an announcement's notices tell of - a reader's are closed once they read it. */
+export const announcementNoticeKey = (id: string) => `announcement:${id}`
+
 /**
  * The notice of an announcement (notification ADR-0164): in the app and by web push always - the `announcement` type is
  * what pops it up - and by mail when the announcement asks for it and the domain has mail on.
@@ -159,6 +162,8 @@ function noticeOf(one: Announcement, kind: NoticeKind, receivers: Notice['receiv
     words: lng => noticeWordsOf(one, kind, sayIn(lng)),
     address: viewAddressOf(one.id),
     link,
+    /* closed for a person once they read it (`readAnnouncement`) */
+    key: announcementNoticeKey(one.id),
     label: `announcement ${kind} ${one.id}`,
     /* The mail carries the whole body, drawn from its Markdown; the inbox and push show the summary. */
     format: 'markdown',

package/test/announcement-persistence.test.ts

@@ -16,6 +16,9 @@ const { DataSource } = require('typeorm')
 const told: { domain: any; notice: any }[] = []
 jest.mock('@things-factory/notification', () => ({
   ...jest.requireActual('@things-factory/notification/dist-server/controllers/notice/notice-delivery-record.js'),
+  /* a reader's notice is closed as they read (ADR-0164 amendment 1) - the real closing, on the kept notices */
+  closeNotices: jest.requireActual('@things-factory/notification/dist-server/service/notification/notice-service.js').closeNotices,
+  Notification: jest.requireActual('@things-factory/notification/dist-server/service/notification/notification.js').Notification,
   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 } }
@@ -26,6 +29,7 @@ jest.mock('@things-factory/notification', () => ({
 
 const shell = require('@things-factory/shell')
 const authBase = require('@things-factory/auth-base')
+const notification = require('@things-factory/notification')
 const contact = require('@things-factory/contact')
 const bizBase = require('@things-factory/biz-base')
 const attachmentBase = require('@things-factory/attachment-base')
@@ -55,7 +59,7 @@ beforeAll(async () => {
     synchronize: true,
     dropSchema: true,
     namingStrategy: new shell.NamingStrategy(),
-    entities: [...shell.entities, ...authBase.entities, ...bizBase.entities, ...contact.entities, ...organization.entities, ...attachmentBase.entities, Announcement, AnnouncementAudience, AnnouncementReceipt, AnnouncementRevision],
+    entities: [...shell.entities, ...authBase.entities, ...bizBase.entities, ...contact.entities, ...organization.entities, ...attachmentBase.entities, Announcement, AnnouncementAudience, AnnouncementReceipt, AnnouncementRevision, notification.Notification],
     logging: false
   })
   await dataSource.initialize()