@tstdl/base 0.93.99 → 0.93.101

package/notification/server/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "270350fd-bfb6-488b-8b07-1e4e937e4f19",
+  "id": "8f352123-edd8-491f-a4ad-008d09531722",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -33,51 +33,54 @@
           "primaryKey": false,
           "notNull": true
         },
-        "read_at": {
-          "name": "read_at",
+        "read_timestamp": {
+          "name": "read_timestamp",
           "type": "timestamp with time zone",
           "primaryKey": false,
           "notNull": false
         },
-        "archived_at": {
-          "name": "archived_at",
+        "archive_timestamp": {
+          "name": "archive_timestamp",
           "type": "timestamp with time zone",
           "primaryKey": false,
           "notNull": false
-        },
-        "revision": {
-          "name": "revision",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "revision_timestamp": {
-          "name": "revision_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "create_timestamp": {
-          "name": "create_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "delete_timestamp": {
-          "name": "delete_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "attributes": {
-          "name": "attributes",
-          "type": "jsonb",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{}'::jsonb"
         }
       },
-      "indexes": {},
+      "indexes": {
+        "in_app_tenant_id_user_id_read_timestamp_archive_timestamp_idx": {
+          "name": "in_app_tenant_id_user_id_read_timestamp_archive_timestamp_idx",
+          "columns": [
+            {
+              "expression": "tenant_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "read_timestamp",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archive_timestamp",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
       "foreignKeys": {
         "in_app_id_user_fkey": {
           "name": "in_app_id_user_fkey",
@@ -95,18 +98,20 @@
           "onDelete": "no action",
           "onUpdate": "no action"
         },
-        "in_app_id_log_fkey": {
-          "name": "in_app_id_log_fkey",
+        "in_app_tenantId_logId_userId_log_fkey": {
+          "name": "in_app_tenantId_logId_userId_log_fkey",
           "tableFrom": "in_app",
           "tableTo": "log",
           "schemaTo": "notification",
           "columnsFrom": [
             "tenant_id",
-            "log_id"
+            "log_id",
+            "user_id"
           ],
           "columnsTo": [
             "tenant_id",
-            "id"
+            "id",
+            "user_id"
           ],
           "onDelete": "no action",
           "onUpdate": "no action"
@@ -126,104 +131,6 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "notification.category": {
-      "name": "category",
-      "schema": "notification",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "uuid",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "gen_random_uuid()"
-        },
-        "tenant_id": {
-          "name": "tenant_id",
-          "type": "uuid",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "label": {
-          "name": "label",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "throttling": {
-          "name": "throttling",
-          "type": "jsonb",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "escalations": {
-          "name": "escalations",
-          "type": "jsonb",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "revision": {
-          "name": "revision",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "revision_timestamp": {
-          "name": "revision_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "create_timestamp": {
-          "name": "create_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "delete_timestamp": {
-          "name": "delete_timestamp",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "attributes": {
-          "name": "attributes",
-          "type": "jsonb",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{}'::jsonb"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "category_tenant_id_id_pk": {
-          "name": "category_tenant_id_id_pk",
-          "columns": [
-            "tenant_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "category_tenant_id_key_unique": {
-          "name": "category_tenant_id_key_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "tenant_id",
-            "key"
-          ]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "notification.log": {
       "name": "log",
       "schema": "notification",
@@ -247,12 +154,6 @@
           "primaryKey": false,
           "notNull": true
         },
-        "category_id": {
-          "name": "category_id",
-          "type": "uuid",
-          "primaryKey": false,
-          "notNull": true
-        },
         "type": {
           "name": "type",
           "type": "text",
@@ -319,30 +220,28 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "log_id_user_fkey": {
-          "name": "log_id_user_fkey",
+        "log_type_type_key_fk": {
+          "name": "log_type_type_key_fk",
           "tableFrom": "log",
-          "tableTo": "user",
-          "schemaTo": "authentication",
+          "tableTo": "type",
+          "schemaTo": "notification",
           "columnsFrom": [
-            "tenant_id",
-            "user_id"
+            "type"
           ],
           "columnsTo": [
-            "tenant_id",
-            "id"
+            "key"
           ],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
-        "log_id_category_fkey": {
-          "name": "log_id_category_fkey",
+        "log_id_user_fkey": {
+          "name": "log_id_user_fkey",
           "tableFrom": "log",
-          "tableTo": "category",
-          "schemaTo": "notification",
+          "tableTo": "user",
+          "schemaTo": "authentication",
           "columnsFrom": [
             "tenant_id",
-            "category_id"
+            "user_id"
           ],
           "columnsTo": [
             "tenant_id",
@@ -361,7 +260,17 @@
           ]
         }
       },
-      "uniqueConstraints": {},
+      "uniqueConstraints": {
+        "log_tenant_id_id_user_id_unique": {
+          "name": "log_tenant_id_id_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "tenant_id",
+            "id",
+            "user_id"
+          ]
+        }
+      },
       "policies": {},
       "checkConstraints": {},
       "isRLSEnabled": false
@@ -389,9 +298,9 @@
           "primaryKey": false,
           "notNull": true
         },
-        "category_id": {
-          "name": "category_id",
-          "type": "uuid",
+        "type": {
+          "name": "type",
+          "type": "text",
           "primaryKey": false,
           "notNull": true
         },
@@ -442,30 +351,28 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "preference_id_user_fkey": {
-          "name": "preference_id_user_fkey",
+        "preference_type_type_key_fk": {
+          "name": "preference_type_type_key_fk",
           "tableFrom": "preference",
-          "tableTo": "user",
-          "schemaTo": "authentication",
+          "tableTo": "type",
+          "schemaTo": "notification",
           "columnsFrom": [
-            "tenant_id",
-            "user_id"
+            "type"
           ],
           "columnsTo": [
-            "tenant_id",
-            "id"
+            "key"
           ],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
-        "preference_id_category_fkey": {
-          "name": "preference_id_category_fkey",
+        "preference_id_user_fkey": {
+          "name": "preference_id_user_fkey",
           "tableFrom": "preference",
-          "tableTo": "category",
-          "schemaTo": "notification",
+          "tableTo": "user",
+          "schemaTo": "authentication",
           "columnsFrom": [
             "tenant_id",
-            "category_id"
+            "user_id"
           ],
           "columnsTo": [
             "tenant_id",
@@ -485,13 +392,13 @@
         }
       },
       "uniqueConstraints": {
-        "preference_tenant_id_user_id_category_id_channel_unique": {
-          "name": "preference_tenant_id_user_id_category_id_channel_unique",
+        "preference_tenant_id_user_id_type_channel_unique": {
+          "name": "preference_tenant_id_user_id_type_channel_unique",
           "nullsNotDistinct": false,
           "columns": [
             "tenant_id",
             "user_id",
-            "category_id",
+            "type",
             "channel"
           ]
         }
@@ -500,6 +407,89 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
+    "notification.type": {
+      "name": "type",
+      "schema": "notification",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "throttling": {
+          "name": "throttling",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "escalations": {
+          "name": "escalations",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revision": {
+          "name": "revision",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "revision_timestamp": {
+          "name": "revision_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "create_timestamp": {
+          "name": "create_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "delete_timestamp": {
+          "name": "delete_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attributes": {
+          "name": "attributes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "type_key_unique": {
+          "name": "type_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "notification.web_push_subscription": {
       "name": "web_push_subscription",
       "schema": "notification",
@@ -601,7 +591,17 @@
           ]
         }
       },
-      "uniqueConstraints": {},
+      "uniqueConstraints": {
+        "web_push_subscription_tenant_id_user_id_endpoint_unique": {
+          "name": "web_push_subscription_tenant_id_user_id_endpoint_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "tenant_id",
+            "user_id",
+            "endpoint"
+          ]
+        }
+      },
       "policies": {},
       "checkConstraints": {},
       "isRLSEnabled": false

package/notification/server/drizzle/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1769475703872,
-      "tag": "0000_glorious_randall",
+      "when": 1769546272361,
+      "tag": "0000_shiny_the_anarchist",
       "breakpoints": true
     }
   ]

package/notification/server/module.d.ts

@@ -1,7 +1,9 @@
 import { Injector } from '../../injector/index.js';
 import { type DatabaseConfig } from '../../orm/server/index.js';
+import type { NotificationChannel } from '../models/index.js';
 export declare class NotificationConfiguration {
     database?: DatabaseConfig;
+    defaultChannels?: NotificationChannel[];
 }
 export declare function configureNotification({ injector, ...config }: NotificationConfiguration & {
     injector?: Injector;

package/notification/server/module.js

@@ -2,6 +2,7 @@ import { inject, Injector } from '../../injector/index.js';
 import { Database, migrate } from '../../orm/server/index.js';
 export class NotificationConfiguration {
     database;
+    defaultChannels;
 }
 export function configureNotification({ injector, ...config }) {
     const targetInjector = injector ?? Injector;

package/notification/server/providers/channel-provider.d.ts

@@ -1,4 +1,5 @@
-import { NotificationLog } from '../../models/notification-log.model.js';
-export interface ChannelProvider {
-    send(notification: NotificationLog): Promise<void>;
+import type { Transaction } from '../../../orm/server/index.js';
+import type { NotificationLog } from '../../models/notification-log.model.js';
+export declare abstract class ChannelProvider {
+    abstract send(notification: NotificationLog, tx?: Transaction): Promise<void>;
 }

package/notification/server/providers/channel-provider.js

@@ -1 +1,2 @@
-import { NotificationLog } from '../../models/notification-log.model.js';
+export class ChannelProvider {
+}

package/notification/server/providers/email-channel-provider.d.ts

@@ -1,6 +1,6 @@
-import { NotificationLog } from '../../models/index.js';
-import type { ChannelProvider } from './channel-provider.js';
-export declare class EmailChannelProvider implements ChannelProvider {
+import type { NotificationLog } from '../../models/index.js';
+import { ChannelProvider } from './channel-provider.js';
+export declare class EmailChannelProvider extends ChannelProvider {
     #private;
     send(notification: NotificationLog): Promise<void>;
 }

package/notification/server/providers/email-channel-provider.js

@@ -4,19 +4,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { inject } from '../../../injector/index.js';
+import { SubjectService } from '../../../authentication/server/subject.service.js';
+import { inject, Singleton } from '../../../injector/index.js';
 import { MailService } from '../../../mail/mail.service.js';
-import { User } from '../../../authentication/models/user.model.js';
-import { injectRepository } from '../../../orm/server/index.js';
-import { NotificationLog } from '../../models/index.js';
-import { NotificationSingleton } from '../services/singleton.js';
 import { NotificationTemplateService } from '../services/notification-template.service.js';
-let EmailChannelProvider = class EmailChannelProvider {
+import { ChannelProvider } from './channel-provider.js';
+let EmailChannelProvider = class EmailChannelProvider extends ChannelProvider {
     #mailService = inject(MailService);
-    #userRepository = injectRepository(User);
+    #subjectService = inject(SubjectService);
     #templateService = inject(NotificationTemplateService);
     async send(notification) {
-        const user = await this.#userRepository.loadByQuery({ tenantId: notification.tenantId, id: notification.userId });
+        const user = await this.#subjectService.getUser(notification.tenantId, notification.userId);
         const content = await this.#templateService.render(notification, 'en'); // TODO: get user language
         await this.#mailService.send({
             to: user.email,
@@ -29,6 +27,6 @@ let EmailChannelProvider = class EmailChannelProvider {
     }
 };
 EmailChannelProvider = __decorate([
-    NotificationSingleton()
+    Singleton()
 ], EmailChannelProvider);
 export { EmailChannelProvider };

package/notification/server/providers/in-app-channel-provider.d.ts

@@ -1,7 +1,7 @@
-import { Transactional } from '../../../orm/server/index.js';
-import { NotificationLog } from '../../models/index.js';
-import type { ChannelProvider } from './channel-provider.js';
-export declare class InAppChannelProvider extends Transactional implements ChannelProvider {
+import { type Transaction } from '../../../orm/server/index.js';
+import { type NotificationLog } from '../../models/index.js';
+import { ChannelProvider } from './channel-provider.js';
+export declare class InAppChannelProvider extends ChannelProvider {
     #private;
-    send(notification: NotificationLog): Promise<void>;
+    send(notification: NotificationLog, tx?: Transaction): Promise<void>;
 }

package/notification/server/providers/in-app-channel-provider.js

@@ -4,28 +4,27 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { inject } from '../../../injector/index.js';
-import { injectRepository, Transactional } from '../../../orm/server/index.js';
-import { InAppNotification, NotificationLog } from '../../models/index.js';
-import { NotificationSingleton } from '../services/singleton.js';
+import { inject, Singleton } from '../../../injector/index.js';
+import { injectRepository } from '../../../orm/server/index.js';
+import { InAppNotification, toInAppNotificationView } from '../../models/index.js';
 import { NotificationSseService } from '../services/notification-sse.service.js';
-let InAppChannelProvider = class InAppChannelProvider extends Transactional {
+import { ChannelProvider } from './channel-provider.js';
+let InAppChannelProvider = class InAppChannelProvider extends ChannelProvider {
     #inAppRepository = injectRepository(InAppNotification);
     #sseService = inject(NotificationSseService);
-    async send(notification) {
-        const inApp = await this.transaction(async (tx) => {
-            return await this.#inAppRepository.withTransaction(tx).insert({
-                tenantId: notification.tenantId,
-                userId: notification.userId,
-                logId: notification.id,
-                readAt: null,
-                archivedAt: null,
-            });
+    async send(notification, tx) {
+        const inApp = await this.#inAppRepository.withOptionalTransaction(tx).insert({
+            tenantId: notification.tenantId,
+            userId: notification.userId,
+            logId: notification.id,
+            readTimestamp: null,
+            archiveTimestamp: null,
         });
-        await this.#sseService.send({ ...inApp, log: notification });
+        const inAppNotificationView = toInAppNotificationView(inApp, notification);
+        await this.#sseService.send(inAppNotificationView);
     }
 };
 InAppChannelProvider = __decorate([
-    NotificationSingleton()
+    Singleton()
 ], InAppChannelProvider);
 export { InAppChannelProvider };

package/notification/server/providers/index.d.ts

@@ -1,4 +1,4 @@
+export * from './channel-provider.js';
 export * from './email-channel-provider.js';
 export * from './in-app-channel-provider.js';
 export * from './web-push-channel-provider.js';
-export * from './channel-provider.js';

package/notification/server/providers/index.js

@@ -1,4 +1,4 @@
+export * from './channel-provider.js';
 export * from './email-channel-provider.js';
 export * from './in-app-channel-provider.js';
 export * from './web-push-channel-provider.js';
-export * from './channel-provider.js';

package/notification/server/providers/web-push-channel-provider.d.ts

@@ -1,6 +1,7 @@
-import { NotificationLog } from '../../models/index.js';
-import type { ChannelProvider } from './channel-provider.js';
-export declare class WebPushChannelProvider implements ChannelProvider {
+import { type Transaction } from '../../../orm/server/index.js';
+import { type NotificationLog } from '../../models/index.js';
+import { ChannelProvider } from './channel-provider.js';
+export declare class WebPushChannelProvider extends ChannelProvider {
     #private;
-    send(notification: NotificationLog): Promise<void>;
+    send(notification: NotificationLog, tx?: Transaction): Promise<void>;
 }