@meshmakers/octo-services 3.5.380 → 3.5.390

package/fesm2022/meshmakers-octo-services.mjs

@@ -8719,6 +8719,7 @@ function deliveryStateOf(subjectId, states) {
 function toEntityId(ref) {
     return { rtId: ref.rtId, ckTypeId: ref.ckTypeId };
 }
+const USERS_CACHE_MS = 60_000;
 class NotificationSubscriptionService {
     getSubscriptionsGQL = inject(NotificationsGetSubscriptionsDtoGQL);
     getSubscriptionGQL = inject(NotificationsGetSubscriptionDtoGQL);
@@ -8732,6 +8733,8 @@ class NotificationSubscriptionService {
     communication = inject(CommunicationService);
     cronParser = inject(CronParserService);
     candidates = inject(NOTIFICATION_RECIPIENT_CANDIDATES);
+    tenantIdProvider = inject(TENANT_ID_PROVIDER, { optional: true });
+    usersCache = new Map();
     async getSubscriptions(request) {
         const result = await firstValueFrom(this.getSubscriptionsGQL.fetch({
             variables: {
@@ -8769,8 +8772,22 @@ class NotificationSubscriptionService {
     undeploy(tenantId, subscriptionRtId) {
         return this.communication.undeployNotificationSubscription(tenantId, subscriptionRtId);
     }
-    loadUsers() {
-        return this.candidates.load();
+    async loadUsers() {
+        const tenantId = await this.tenantIdProvider?.();
+        if (!tenantId)
+            return this.candidates.load();
+        const cached = this.usersCache.get(tenantId);
+        if (cached && (cached.loadedAt === null || Date.now() - cached.loadedAt < USERS_CACHE_MS))
+            return cached.users;
+        const entry = { loadedAt: null, users: this.candidates.load() };
+        this.usersCache.set(tenantId, entry);
+        entry.users.then(() => {
+            entry.loadedAt = Date.now();
+        }, () => {
+            if (this.usersCache.get(tenantId) === entry)
+                this.usersCache.delete(tenantId);
+        });
+        return entry.users;
     }
     scheduleIssue(cronExpression) {
         return notificationScheduleIssue((cron, count) => this.cronParser.getNextExecutions(cron, count), cronExpression);
@@ -8928,7 +8945,7 @@ class NotificationSubscriptionService {
     }
     async usersById() {
         try {
-            return new Map((await this.candidates.load()).map(user => [user.id, user]));
+            return new Map((await this.loadUsers()).map(user => [user.id, user]));
         }
         catch {
             return null;
@@ -8943,6 +8960,7 @@ class NotificationSubscriptionService {
             ckTypeId: item.ckTypeId,
             subjectId: item.subjectId,
             userLabel: user?.label ?? item.subjectId,
+            user: user ?? null,
             cronExpression: item.cronExpression,
             timeZone: item.timeZone ?? null,
             lastSentAt: state?.lastSentAt ?? null,