@tstdl/base 0.93.184 → 0.93.186

package/notification/api/notification.api.d.ts

@@ -96,10 +96,12 @@ export declare const notificationApiDefinition: {
         updatePreferences: {
             resource: string;
             method: "POST";
-            parameters: import("../../schema/index.js").ArraySchema<{
-                type: string;
-                enabled: boolean;
-                channel: "email" | "in-app" | "web-push";
+            parameters: import("../../schema/index.js").ObjectSchema<{
+                preferences: {
+                    type: string;
+                    enabled: boolean;
+                    channel: "email" | "in-app" | "web-push";
+                }[];
             }>;
             result: import("../../schema/index.js").LiteralSchema<"ok">;
             credentials: true;
@@ -213,10 +215,12 @@ declare const _NotificationApiClient: import("../../api/client/index.js").ApiCli
         updatePreferences: {
             resource: string;
             method: "POST";
-            parameters: import("../../schema/index.js").ArraySchema<{
-                type: string;
-                enabled: boolean;
-                channel: "email" | "in-app" | "web-push";
+            parameters: import("../../schema/index.js").ObjectSchema<{
+                preferences: {
+                    type: string;
+                    enabled: boolean;
+                    channel: "email" | "in-app" | "web-push";
+                }[];
             }>;
             result: import("../../schema/index.js").LiteralSchema<"ok">;
             credentials: true;

package/notification/api/notification.api.js

@@ -99,11 +99,13 @@ export const notificationApiDefinition = defineApi({
         updatePreferences: {
             resource: 'preferences',
             method: 'POST',
-            parameters: array(object({
-                type: string(),
-                channel: enumeration(NotificationChannel),
-                enabled: boolean(),
-            })),
+            parameters: object({
+                preferences: array(object({
+                    type: string(),
+                    channel: enumeration(NotificationChannel),
+                    enabled: boolean(),
+                })),
+            }),
             result: literal('ok'),
             credentials: true,
         },

package/notification/models/notification-preference.model.d.ts

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 import { TenantEntity, type Uuid } from '../../orm/index.js';
 import { NotificationChannel } from './notification-log.model.js';
 export declare class NotificationPreference extends TenantEntity {
@@ -7,3 +8,9 @@ export declare class NotificationPreference extends TenantEntity {
     channel: NotificationChannel;
     enabled: boolean;
 }
+export declare class NotificationPreferenceView {
+    type: string;
+    channel: NotificationChannel;
+    enabled: boolean;
+}
+export declare function toNotificationPreferenceView(preference: NotificationPreference): NotificationPreferenceView;

package/notification/models/notification-preference.model.js

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -43,3 +44,27 @@ NotificationPreference = __decorate([
     Unique(['tenantId', 'userId', 'type', 'channel'])
 ], NotificationPreference);
 export { NotificationPreference };
+export class NotificationPreferenceView {
+    type;
+    channel;
+    enabled;
+}
+__decorate([
+    StringProperty(),
+    __metadata("design:type", String)
+], NotificationPreferenceView.prototype, "type", void 0);
+__decorate([
+    Enumeration(NotificationChannel),
+    __metadata("design:type", String)
+], NotificationPreferenceView.prototype, "channel", void 0);
+__decorate([
+    BooleanProperty(),
+    __metadata("design:type", Boolean)
+], NotificationPreferenceView.prototype, "enabled", void 0);
+export function toNotificationPreferenceView(preference) {
+    return {
+        type: preference.type,
+        channel: preference.channel,
+        enabled: preference.enabled,
+    };
+}

package/notification/server/api/notification.api-controller.d.ts

@@ -1,22 +1,23 @@
 import type { ApiController, ApiRequestContext, ApiServerResult } from '../../../api/types.js';
 import type { NotificationApiDefinition } from '../../api/notification.api.js';
+import type { InAppNotificationView, NotificationPreferenceView } from '../../models/index.js';
 import { NotificationSseService } from '../services/notification-sse.service.js';
 import { NotificationTypeService } from '../services/notification-type.service.js';
 import { NotificationService } from '../services/notification.service.js';
 export declare class NotificationApiController implements ApiController<NotificationApiDefinition> {
-    protected readonly notificationService: NotificationService<Record<string, import("../../index.js").NotificationDefinition<import("../../../types/types.js").ObjectLiteral, import("../../../types/types.js").ObjectLiteral>>>;
+    protected readonly notificationService: NotificationService<Record<string, import("../../models/notification-log.model.js").NotificationDefinition<import("../../../types/types.js").ObjectLiteral, import("../../../types/types.js").ObjectLiteral>>>;
     protected readonly notificationTypeService: NotificationTypeService;
     protected readonly sseService: NotificationSseService;
     stream({ abortSignal, getToken, serverSentEvents: { lastEventId } }: ApiRequestContext<NotificationApiDefinition, 'stream'>): ApiServerResult<NotificationApiDefinition, 'stream'>;
     types(): Promise<Record<string, string>>;
-    listInApp({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'listInApp'>): Promise<any>;
-    listArchivedInApp({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'listArchivedInApp'>): Promise<any>;
+    listInApp({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'listInApp'>): Promise<InAppNotificationView[]>;
+    listArchivedInApp({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'listArchivedInApp'>): Promise<InAppNotificationView[]>;
     markRead({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'markRead'>): Promise<'ok'>;
     markAllRead({ getToken }: ApiRequestContext<NotificationApiDefinition, 'markAllRead'>): Promise<'ok'>;
     archive({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'archive'>): Promise<'ok'>;
     archiveAll({ getToken }: ApiRequestContext<NotificationApiDefinition, 'archiveAll'>): Promise<'ok'>;
     unreadCount({ getToken }: ApiRequestContext<NotificationApiDefinition, 'unreadCount'>): Promise<number>;
-    getPreferences({ getToken }: ApiRequestContext<NotificationApiDefinition, 'getPreferences'>): Promise<any>;
+    getPreferences({ getToken }: ApiRequestContext<NotificationApiDefinition, 'getPreferences'>): Promise<NotificationPreferenceView[]>;
     updatePreferences({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'updatePreferences'>): Promise<'ok'>;
     registerWebPush({ parameters, getToken }: ApiRequestContext<NotificationApiDefinition, 'registerWebPush'>): Promise<'ok'>;
 }

package/notification/server/api/notification.api-controller.js

@@ -83,11 +83,11 @@ let NotificationApiController = class NotificationApiController {
     }
     async getPreferences({ getToken }) {
         const token = await getToken();
-        return await this.notificationService.getPreferences(token.payload.tenant, token.payload.subject);
+        return await this.notificationService.getPreferenceViews(token.payload.tenant, token.payload.subject);
     }
     async updatePreferences({ parameters, getToken }) {
         const token = await getToken();
-        await this.notificationService.updatePreferences(token.payload.tenant, token.payload.subject, parameters);
+        await this.notificationService.updatePreferences(token.payload.tenant, token.payload.subject, parameters.preferences);
         return 'ok';
     }
     async registerWebPush({ parameters, getToken }) {

package/notification/server/services/notification.service.d.ts

@@ -1,7 +1,7 @@
 import { type NewEntity, type Query } from '../../../orm/index.js';
 import { Transactional, type Transaction } from '../../../orm/server/index.js';
 import type { TypedOmit } from '../../../types/types.js';
-import { NotificationChannel, NotificationLogEntity, NotificationPreference, type InAppNotificationView, type NotificationDefinitionMap, type NotificationLog } from '../../models/index.js';
+import { NotificationChannel, NotificationLogEntity, NotificationPreference, type InAppNotificationView, type NotificationDefinitionMap, type NotificationLog, type NotificationPreferenceView } from '../../models/index.js';
 export type NewNotificationData<Definitions extends NotificationDefinitionMap = NotificationDefinitionMap> = TypedOmit<NewEntity<NotificationLog<Definitions>>, 'tenantId' | 'id' | 'userId' | 'timestamp' | 'status' | 'currentStep' | 'priority'> & Partial<Pick<NotificationLog<Definitions>, 'priority'>>;
 export declare class NotificationService<Definitions extends NotificationDefinitionMap = NotificationDefinitionMap> extends Transactional {
     #private;
@@ -33,6 +33,7 @@ export declare class NotificationService<Definitions extends NotificationDefinit
         archiveIds: string[];
     }>;
     getPreferences(tenantId: string, userId: string): Promise<NotificationPreference[]>;
+    getPreferenceViews(tenantId: string, userId: string): Promise<NotificationPreferenceView[]>;
     updatePreference(tenantId: string, userId: string, type: string, channel: NotificationChannel, enabled: boolean): Promise<void>;
     updatePreferences(tenantId: string, userId: string, preferences: {
         type: string;

package/notification/server/services/notification.service.js

@@ -16,7 +16,7 @@ import { injectRepository, Transactional } from '../../../orm/server/index.js';
 import { TaskQueue } from '../../../task-queue/task-queue.js';
 import { tryIgnoreLogAsync } from '../../../utils/try-ignore.js';
 import { isDefined, isUndefined } from '../../../utils/type-guards.js';
-import { InAppNotification, InAppNotificationArchive, NotificationChannel, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, toInAppNotificationView, WebPushSubscription } from '../../models/index.js';
+import { InAppNotification, InAppNotificationArchive, NotificationChannel, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, toInAppNotificationView, toNotificationPreferenceView, WebPushSubscription } from '../../models/index.js';
 import { NotificationConfiguration } from '../module.js';
 import { inAppNotification, inAppNotificationArchive, notificationLog } from '../schemas.js';
 import { NotificationAncillaryService } from './notification-ancillary.service.js';
@@ -234,6 +234,10 @@ let NotificationService = NotificationService_1 = class NotificationService exte
     async getPreferences(tenantId, userId) {
         return await this.#preferenceRepository.loadManyByQuery({ tenantId, userId });
     }
+    async getPreferenceViews(tenantId, userId) {
+        const preferences = await this.getPreferences(tenantId, userId);
+        return preferences.map(toNotificationPreferenceView);
+    }
     async updatePreference(tenantId, userId, type, channel, enabled) {
         await this.#preferenceRepository.upsert(['tenantId', 'userId', 'type', 'channel'], { tenantId, userId, type, channel, enabled });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.184",
+  "version": "0.93.186",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"