@tstdl/base 0.93.99 → 0.93.101

package/notification/models/{notification-category.model.js → notification-type.model.js}

@@ -7,12 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { JsonProperty, TenantEntity, Unique } from '../../orm/index.js';
+import { Entity, JsonProperty, Unique } from '../../orm/index.js';
 import { StringProperty } from '../../schema/index.js';
-import { NotificationChannel } from '../enums.js';
 import { NotificationTable } from './notification-table.js';
-let NotificationCategory = class NotificationCategory extends TenantEntity {
-    static entityName = 'NotificationCategory';
+let NotificationType = class NotificationType extends Entity {
+    static entityName = 'NotificationType';
     label;
     key;
     throttling;
@@ -21,21 +20,21 @@ let NotificationCategory = class NotificationCategory extends TenantEntity {
 __decorate([
     StringProperty(),
     __metadata("design:type", String)
-], NotificationCategory.prototype, "label", void 0);
+], NotificationType.prototype, "label", void 0);
 __decorate([
     StringProperty(),
     __metadata("design:type", String)
-], NotificationCategory.prototype, "key", void 0);
+], NotificationType.prototype, "key", void 0);
 __decorate([
     JsonProperty({ nullable: true }),
     __metadata("design:type", Object)
-], NotificationCategory.prototype, "throttling", void 0);
+], NotificationType.prototype, "throttling", void 0);
 __decorate([
     JsonProperty({ nullable: true }),
     __metadata("design:type", Object)
-], NotificationCategory.prototype, "escalations", void 0);
-NotificationCategory = __decorate([
-    NotificationTable({ name: 'category' }),
-    Unique(['tenantId', 'key'])
-], NotificationCategory);
-export { NotificationCategory };
+], NotificationType.prototype, "escalations", void 0);
+NotificationType = __decorate([
+    NotificationTable({ name: 'type' }),
+    Unique(['key'])
+], NotificationType);
+export { NotificationType };

package/notification/models/web-push-subscription.model.d.ts

@@ -3,6 +3,6 @@ export declare class WebPushSubscription extends TenantEntity {
     static readonly entityName = "WebPushSubscription";
     userId: Uuid;
     endpoint: string;
-    p256dh: string;
-    auth: string;
+    p256dh: Uint8Array<ArrayBuffer>;
+    auth: Uint8Array<ArrayBuffer>;
 }

package/notification/models/web-push-subscription.model.js

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { User } from '../../authentication/models/user.model.js';
-import { TenantEntity, TenantReference, UuidProperty } from '../../orm/index.js';
-import { StringProperty } from '../../schema/index.js';
+import { TenantEntity, TenantReference, Unique, UuidProperty } from '../../orm/index.js';
+import { StringProperty, Uint8ArrayProperty } from '../../schema/index.js';
 import { NotificationTable } from './notification-table.js';
 let WebPushSubscription = class WebPushSubscription extends TenantEntity {
     static entityName = 'WebPushSubscription';
@@ -28,14 +28,15 @@ __decorate([
     __metadata("design:type", String)
 ], WebPushSubscription.prototype, "endpoint", void 0);
 __decorate([
-    StringProperty(),
-    __metadata("design:type", String)
+    Uint8ArrayProperty(),
+    __metadata("design:type", Uint8Array)
 ], WebPushSubscription.prototype, "p256dh", void 0);
 __decorate([
-    StringProperty(),
-    __metadata("design:type", String)
+    Uint8ArrayProperty(),
+    __metadata("design:type", Uint8Array)
 ], WebPushSubscription.prototype, "auth", void 0);
 WebPushSubscription = __decorate([
-    NotificationTable({ name: 'web_push_subscription' })
+    NotificationTable(),
+    Unique(['tenantId', 'userId', 'endpoint'])
 ], WebPushSubscription);
 export { WebPushSubscription };

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

@@ -1,8 +1,8 @@
 import type { ApiController, ApiRequestContext } from '../../../api/types.js';
+import type { ServerSentEventsSource } from '../../../sse/server-sent-events-source.js';
 import type { NotificationApiDefinition } from '../../api/notification.api.js';
-import { NotificationService } from '../services/notification.service.js';
 import { NotificationSseService } from '../services/notification-sse.service.js';
-import type { ServerSentEventsSource } from '../../../sse/server-sent-events-source.js';
+import { NotificationService } from '../services/notification.service.js';
 export declare class NotificationApiController implements ApiController<NotificationApiDefinition> {
     protected readonly notificationService: NotificationService;
     protected readonly sseService: NotificationSseService;

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

@@ -6,9 +6,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { apiController } from '../../../api/server/index.js';
 import { inject } from '../../../injector/index.js';
+import { decodeBase64 } from '../../../utils/base64.js';
 import { notificationApiDefinition } from '../../api/notification.api.js';
-import { NotificationService } from '../services/notification.service.js';
 import { NotificationSseService } from '../services/notification-sse.service.js';
+import { NotificationService } from '../services/notification.service.js';
 let NotificationApiController = class NotificationApiController {
     notificationService = inject(NotificationService);
     sseService = inject(NotificationSseService);
@@ -36,12 +37,12 @@ let NotificationApiController = class NotificationApiController {
     }
     async updatePreference({ parameters, getToken }) {
         const token = await getToken();
-        await this.notificationService.updatePreference(token.payload.tenant, token.payload.subject, parameters.categoryId, parameters.channel, parameters.enabled);
+        await this.notificationService.updatePreference(token.payload.tenant, token.payload.subject, parameters.type, parameters.channel, parameters.enabled);
         return 'ok';
     }
     async registerWebPush({ parameters, getToken }) {
         const token = await getToken();
-        await this.notificationService.registerWebPush(token.payload.tenant, token.payload.subject, parameters.endpoint, parameters.keys.p256dh, parameters.keys.auth);
+        await this.notificationService.registerWebPush(token.payload.tenant, token.payload.subject, parameters.endpoint, decodeBase64(parameters.keys.p256dhBase64), decodeBase64(parameters.keys.authBase64));
         return 'ok';
     }
 };

package/notification/server/drizzle/{0000_glorious_randall.sql → 0000_shiny_the_anarchist.sql}

@@ -6,37 +6,15 @@ CREATE TABLE "notification"."in_app" (
 	"tenant_id" uuid NOT NULL,
 	"user_id" uuid NOT NULL,
 	"log_id" uuid NOT NULL,
-	"read_at" timestamp with time zone,
-	"archived_at" timestamp with time zone,
-	"revision" integer NOT NULL,
-	"revision_timestamp" timestamp with time zone NOT NULL,
-	"create_timestamp" timestamp with time zone NOT NULL,
-	"delete_timestamp" timestamp with time zone,
-	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	"read_timestamp" timestamp with time zone,
+	"archive_timestamp" timestamp with time zone,
 	CONSTRAINT "in_app_tenant_id_id_pk" PRIMARY KEY("tenant_id","id")
 );
 --> statement-breakpoint
-CREATE TABLE "notification"."category" (
-	"id" uuid DEFAULT gen_random_uuid() NOT NULL,
-	"tenant_id" uuid NOT NULL,
-	"label" text NOT NULL,
-	"key" text NOT NULL,
-	"throttling" jsonb,
-	"escalations" jsonb,
-	"revision" integer NOT NULL,
-	"revision_timestamp" timestamp with time zone NOT NULL,
-	"create_timestamp" timestamp with time zone NOT NULL,
-	"delete_timestamp" timestamp with time zone,
-	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
-	CONSTRAINT "category_tenant_id_id_pk" PRIMARY KEY("tenant_id","id"),
-	CONSTRAINT "category_tenant_id_key_unique" UNIQUE("tenant_id","key")
-);
---> statement-breakpoint
 CREATE TABLE "notification"."log" (
 	"id" uuid DEFAULT gen_random_uuid() NOT NULL,
 	"tenant_id" uuid NOT NULL,
 	"user_id" uuid NOT NULL,
-	"category_id" uuid NOT NULL,
 	"type" text NOT NULL,
 	"priority" "notification"."notification_priority" NOT NULL,
 	"status" "notification"."notification_status" NOT NULL,
@@ -47,14 +25,15 @@ CREATE TABLE "notification"."log" (
 	"create_timestamp" timestamp with time zone NOT NULL,
 	"delete_timestamp" timestamp with time zone,
 	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
-	CONSTRAINT "log_tenant_id_id_pk" PRIMARY KEY("tenant_id","id")
+	CONSTRAINT "log_tenant_id_id_pk" PRIMARY KEY("tenant_id","id"),
+	CONSTRAINT "log_tenant_id_id_user_id_unique" UNIQUE("tenant_id","id","user_id")
 );
 --> statement-breakpoint
 CREATE TABLE "notification"."preference" (
 	"id" uuid DEFAULT gen_random_uuid() NOT NULL,
 	"tenant_id" uuid NOT NULL,
 	"user_id" uuid NOT NULL,
-	"category_id" uuid NOT NULL,
+	"type" text NOT NULL,
 	"channel" "notification"."notification_channel" NOT NULL,
 	"enabled" boolean NOT NULL,
 	"revision" integer NOT NULL,
@@ -63,7 +42,21 @@ CREATE TABLE "notification"."preference" (
 	"delete_timestamp" timestamp with time zone,
 	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
 	CONSTRAINT "preference_tenant_id_id_pk" PRIMARY KEY("tenant_id","id"),
-	CONSTRAINT "preference_tenant_id_user_id_category_id_channel_unique" UNIQUE("tenant_id","user_id","category_id","channel")
+	CONSTRAINT "preference_tenant_id_user_id_type_channel_unique" UNIQUE("tenant_id","user_id","type","channel")
+);
+--> statement-breakpoint
+CREATE TABLE "notification"."type" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"label" text NOT NULL,
+	"key" text NOT NULL,
+	"throttling" jsonb,
+	"escalations" jsonb,
+	"revision" integer NOT NULL,
+	"revision_timestamp" timestamp with time zone NOT NULL,
+	"create_timestamp" timestamp with time zone NOT NULL,
+	"delete_timestamp" timestamp with time zone,
+	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	CONSTRAINT "type_key_unique" UNIQUE("key")
 );
 --> statement-breakpoint
 CREATE TABLE "notification"."web_push_subscription" (
@@ -78,13 +71,15 @@ CREATE TABLE "notification"."web_push_subscription" (
 	"create_timestamp" timestamp with time zone NOT NULL,
 	"delete_timestamp" timestamp with time zone,
 	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL,
-	CONSTRAINT "web_push_subscription_tenant_id_id_pk" PRIMARY KEY("tenant_id","id")
+	CONSTRAINT "web_push_subscription_tenant_id_id_pk" PRIMARY KEY("tenant_id","id"),
+	CONSTRAINT "web_push_subscription_tenant_id_user_id_endpoint_unique" UNIQUE("tenant_id","user_id","endpoint")
 );
 --> statement-breakpoint
 ALTER TABLE "notification"."in_app" ADD CONSTRAINT "in_app_id_user_fkey" FOREIGN KEY ("tenant_id","user_id") REFERENCES "authentication"."user"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "notification"."in_app" ADD CONSTRAINT "in_app_id_log_fkey" FOREIGN KEY ("tenant_id","log_id") REFERENCES "notification"."log"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "notification"."in_app" ADD CONSTRAINT "in_app_tenantId_logId_userId_log_fkey" FOREIGN KEY ("tenant_id","log_id","user_id") REFERENCES "notification"."log"("tenant_id","id","user_id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "notification"."log" ADD CONSTRAINT "log_type_type_key_fk" FOREIGN KEY ("type") REFERENCES "notification"."type"("key") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "notification"."log" ADD CONSTRAINT "log_id_user_fkey" FOREIGN KEY ("tenant_id","user_id") REFERENCES "authentication"."user"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "notification"."log" ADD CONSTRAINT "log_id_category_fkey" FOREIGN KEY ("tenant_id","category_id") REFERENCES "notification"."category"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "notification"."preference" ADD CONSTRAINT "preference_type_type_key_fk" FOREIGN KEY ("type") REFERENCES "notification"."type"("key") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "notification"."preference" ADD CONSTRAINT "preference_id_user_fkey" FOREIGN KEY ("tenant_id","user_id") REFERENCES "authentication"."user"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "notification"."preference" ADD CONSTRAINT "preference_id_category_fkey" FOREIGN KEY ("tenant_id","category_id") REFERENCES "notification"."category"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "notification"."web_push_subscription" ADD CONSTRAINT "web_push_subscription_id_user_fkey" FOREIGN KEY ("tenant_id","user_id") REFERENCES "authentication"."user"("tenant_id","id") ON DELETE no action ON UPDATE no action;
+ALTER TABLE "notification"."web_push_subscription" ADD CONSTRAINT "web_push_subscription_id_user_fkey" FOREIGN KEY ("tenant_id","user_id") REFERENCES "authentication"."user"("tenant_id","id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "in_app_tenant_id_user_id_read_timestamp_archive_timestamp_idx" ON "notification"."in_app" USING btree ("tenant_id","user_id","read_timestamp","archive_timestamp");