@dative-gpi/foundation-shared-domain 1.0.158 → 1.0.159-notification

package/enums/applications.ts

@@ -2,6 +2,7 @@ export enum Scope {
   None = 0,
   Public = 0b1111,
   Application = 0b1000,
+  OrganisationType = 0b10000,
   Organisation = 0b0100,
   User = 0b0010,
   UserOrganisation = 0b0001

package/models/notifications/index.ts

@@ -1,2 +1,3 @@
+export * from "./notificationAudience";
 export * from "./notificationDetails";
 export * from "./notificationInfos";

package/models/notifications/notificationAudience.ts

@@ -0,0 +1,20 @@
+import type { Scope } from "../../enums";
+
+export class NotificationAudience {
+  id: string;
+  targetId: string;
+  targetScope: Scope;
+
+
+  constructor(params: NotificationAudienceDTO) {
+    this.id = params.id;
+    this.targetId = params.targetId;
+    this.targetScope = params.targetScope as Scope;
+  }
+}
+
+export interface NotificationAudienceDTO {
+  id: string;
+  targetId: string;
+  targetScope: number;
+}

package/models/notifications/notificationInfos.ts

@@ -2,16 +2,15 @@ import { type MessageType } from "../../enums/messages";
 import { isoToEpoch } from "../../tools/datesTools";
 import { Scope } from "../../enums/applications";
 import { Criticity } from "../../enums/alerts";
+import { NotificationAudience } from "./notificationAudience";
 
 export class NotificationInfos {
   id: string;
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: Scope;
+  audiences: NotificationAudience[];
   organisationId?: string;
-  entityId?: string;
   type: MessageType;
   criticity: Criticity;
   timestamp: number;
@@ -23,10 +22,8 @@ export class NotificationInfos {
     this.title = params.title;
     this.body = params.body;
     this.pageUrl = params.pageUrl;
-    this.audienceId = params.audienceId;
-    this.audienceScope = params.audienceScope as Scope;
+    this.audiences = params.audiences.map((a: NotificationAudience) => new NotificationAudience(a));
     this.organisationId = params.organisationId;
-    this.entityId = params.entityId;
     this.type = params.type as MessageType;
     this.criticity = params.criticity as Criticity;
     this.timestamp = isoToEpoch(params.timestamp);
@@ -40,7 +37,7 @@ export class NotificationInfos {
     application: boolean,
     criticity: Criticity,
     organisationId?: string | null,
-    userId?: string | null,
+    userId?: string | null
   ): NotificationInfos[] => notifications.filter((n: NotificationInfos) => {
     if (n.acknowledged) {
       return false;
@@ -48,15 +45,22 @@ export class NotificationInfos {
     if (![Criticity.None, n.criticity].includes(criticity)) {
       return false;
     }
-    switch (n.audienceScope) {
-      case Scope.Organisation    :
-      case Scope.UserOrganisation: return organisationId && n.organisationId && n.organisationId === organisationId;
-      case Scope.User            : return userId && n.audienceId === userId;
-      case Scope.Application     :
-      case Scope.Public          : return application;
-  
-    }
-    return false;
+
+    return n.audiences.some(a => {
+      switch (a.targetScope) {
+        case Scope.OrganisationType:
+        case Scope.Organisation:
+        case Scope.UserOrganisation:
+          return Boolean(organisationId && n.organisationId && n.organisationId === organisationId);
+        case Scope.User:
+          return Boolean(userId && a.targetId === userId);
+        case Scope.Application:
+        case Scope.Public:
+          return Boolean(application);
+        default:
+          return false;
+      }
+    });
   });
 
   static getForDrawer = (
@@ -78,10 +82,8 @@ export interface NotificationInfosDTO {
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: number;
+  audiences: NotificationAudience[];
   organisationId?: string;
-  entityId?: string;
   type: number;
   criticity: number;
   timestamp: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "1.0.158",
+  "version": "1.0.159-notification",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "8e284ac045b19fef0565f6ab8026702da3dc12e6"
+  "gitHead": "bd9f45c4be8554c7778b5388f3d60d25c9244054"
 }