@dative-gpi/foundation-shared-domain 1.0.157-notif-update-v2 → 1.0.158-maps2

package/enums/applications.ts

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

package/models/notifications/index.ts

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

package/models/notifications/notificationInfos.ts

@@ -2,15 +2,16 @@ 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;
-  audiences: NotificationAudience[];
+  audienceId: string;
+  audienceScope: Scope;
   organisationId?: string;
+  entityId?: string;
   type: MessageType;
   criticity: Criticity;
   timestamp: number;
@@ -22,8 +23,10 @@ export class NotificationInfos {
     this.title = params.title;
     this.body = params.body;
     this.pageUrl = params.pageUrl;
-    this.audiences = params.audiences.map((a: NotificationAudience) => new NotificationAudience(a));
+    this.audienceId = params.audienceId;
+    this.audienceScope = params.audienceScope as Scope;
     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);
@@ -37,7 +40,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;
@@ -45,18 +48,15 @@ export class NotificationInfos {
     if (![Criticity.None, n.criticity].includes(criticity)) {
       return false;
     }
-
-    let showNotification = false;
-    for (const a of n.audiences) {
-      switch (a.targetScope) {
-        case Scope.Organisation:
-        case Scope.UserOrganisation: showNotification = showNotification || (organisationId && n.organisationId && n.organisationId === organisationId) as boolean;
-        case Scope.User: showNotification = showNotification || (userId && a.targetId === userId) as boolean;
-        case Scope.Application:
-        case Scope.Public: showNotification = showNotification || application as boolean;
-      }
+    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 showNotification;
+    return false;
   });
 
   static getForDrawer = (
@@ -78,8 +78,10 @@ export interface NotificationInfosDTO {
   title: string;
   body: string;
   pageUrl: string;
-  audiences: NotificationAudience[];
+  audienceId: string;
+  audienceScope: number;
   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.157-notif-update-v2",
+  "version": "1.0.158-maps2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "d2fe03e1334c0c0bf4e1d31fee0132c07c8ccf35"
+  "gitHead": "99a7e7aebf7e4bb0687672dfb8f7cc6a54ba923a"
 }

package/models/notifications/notificationAudience.ts

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