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

package/models/notifications/notificationInfos.ts

@@ -1,7 +1,6 @@
 import { type MessageType } from "../../enums/messages";
 import { isoToEpoch } from "../../tools/datesTools";
-import { Scope } from "../../enums/applications";
-import { Criticity } from "../../enums/alerts";
+import type { Criticity } from "../../enums/alerts";
 import { NotificationAudience } from "./notificationAudience";
 
 export class NotificationInfos {
@@ -31,50 +30,6 @@ export class NotificationInfos {
     this.acknowledgingTimestamp = params.acknowledgingTimestamp ?
       isoToEpoch(params.acknowledgingTimestamp) : null;
   }
-
-  static getFromAudience = (
-    notifications: NotificationInfos[],
-    application: boolean,
-    criticity: Criticity,
-    organisationId?: string | null,
-    userId?: string | null
-  ): NotificationInfos[] => notifications.filter((n: NotificationInfos) => {
-    if (n.acknowledged) {
-      return false;
-    }
-    if (![Criticity.None, n.criticity].includes(criticity)) {
-      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 = (
-    notifications: NotificationInfos[],
-    organisationId: string,
-    userId: string,
-    criticity: Criticity = Criticity.None
-  ): NotificationInfos[] => NotificationInfos.getFromAudience(notifications, true, criticity, organisationId, userId);
-
-  static getForCard = (
-    notifications: NotificationInfos[],
-    organisationId: string,
-    criticity: Criticity = Criticity.None
-  ): NotificationInfos[] => NotificationInfos.getFromAudience(notifications, false, criticity, organisationId, null);
 }
 
 export interface NotificationInfosDTO {

package/models/organisations/organisationDetails.ts

@@ -6,21 +6,19 @@ import type { DashboardType } from "../../enums/dashboards";
 
 export class OrganisationDetails extends OrganisationInfos {
     code: string;
-    organisationTypeId: string;
     mainDashboardId: string | null;
     mainDashboardType: DashboardType;
     description: string;
     locationsCount: number;
     groupsCount: number;
     deviceOrganisationsCount: number;
-    alertsCount : number;
+    alertsCount: number;
     permissions: PermissionInfos[];
 
     constructor(params: OrganisationDetailsDTO) {
         super(params);
 
         this.code = params.code;
-        this.organisationTypeId = params.organisationTypeId;
         this.mainDashboardType = params.mainDashboardType;
         this.mainDashboardId = params.mainDashboardId;
         this.description = params.description;
@@ -34,14 +32,13 @@ export class OrganisationDetails extends OrganisationInfos {
 
 export interface OrganisationDetailsDTO extends OrganisationInfosDTO {
     code: string;
-    organisationTypeId: string;
     mainDashboardId: string | null;
     mainDashboardType: DashboardType;
     description: string;
     locationsCount: number;
     groupsCount: number;
     deviceOrganisationsCount: number;
-    alertsCount : number;
+    alertsCount: number;
     permissions: PermissionInfosDTO[];
 }
 

package/models/organisations/organisationInfos.ts

@@ -1,5 +1,6 @@
 export class OrganisationInfos {
     id: string;
+    organisationTypeId: string;
     imageId: string | null;
     label: string;
     userOrganisationsCount: number;
@@ -8,6 +9,7 @@ export class OrganisationInfos {
 
     constructor(params: OrganisationInfosDTO) {
         this.id = params.id;
+        this.organisationTypeId = params.organisationTypeId;
         this.imageId = params.imageId;
         this.label = params.label;
         this.userOrganisationsCount = params.userOrganisationsCount;
@@ -18,6 +20,7 @@ export class OrganisationInfos {
 
 export interface OrganisationInfosDTO {
     id: string;
+    organisationTypeId: string;
     imageId: string | null;
     label: string;
     userOrganisationsCount: number;

package/package.json

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