@tstdl/base 0.93.123 → 0.93.125

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

@@ -1,5 +1,5 @@
 {
-  "id": "90cd6144-d455-4a13-8148-ca119f8bfe79",
+  "id": "23b5cedb-d56a-4f37-b838-fc9874b72ce3",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -33,6 +33,12 @@
           "primaryKey": false,
           "notNull": true
         },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
         "read_timestamp": {
           "name": "read_timestamp",
           "type": "timestamp with time zone",
@@ -47,8 +53,23 @@
         }
       },
       "indexes": {
-        "in_app_tenant_id_user_id_log_id_idx": {
-          "name": "in_app_tenant_id_user_id_log_id_idx",
+        "in_app_timestamp_idx": {
+          "name": "in_app_timestamp_idx",
+          "columns": [
+            {
+              "expression": "timestamp",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "brin",
+          "with": {}
+        },
+        "in_app_tenant_id_user_id_read_timestamp_partial_idx": {
+          "name": "in_app_tenant_id_user_id_read_timestamp_partial_idx",
           "columns": [
             {
               "expression": "tenant_id",
@@ -62,15 +83,82 @@
               "asc": true,
               "nulls": "last"
             },
+            {
+              "expression": "read_timestamp",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"notification\".\"in_app\".\"read_timestamp\" is not null",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "in_app_tenant_id_user_id_timestamp_log_id_partial_idx": {
+          "name": "in_app_tenant_id_user_id_timestamp_log_id_partial_idx",
+          "columns": [
+            {
+              "expression": "tenant_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "timestamp",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            },
             {
               "expression": "log_id",
               "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"notification\".\"in_app\".\"read_timestamp\" is null",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "in_app_tenant_id_user_id_timestamp_log_id_idx": {
+          "name": "in_app_tenant_id_user_id_timestamp_log_id_idx",
+          "columns": [
+            {
+              "expression": "tenant_id",
+              "isExpression": false,
               "asc": true,
               "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "timestamp",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            },
+            {
+              "expression": "log_id",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
             }
           ],
           "isUnique": false,
-          "where": "\"notification\".\"in_app\".\"archive_timestamp\" is null",
           "concurrently": false,
           "method": "btree",
           "with": {}
@@ -121,6 +209,158 @@
           ]
         }
       },
+      "uniqueConstraints": {
+        "in_app_tenant_id_user_id_log_id_unique": {
+          "name": "in_app_tenant_id_user_id_log_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "tenant_id",
+            "user_id",
+            "log_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "notification.in_app_archive": {
+      "name": "in_app_archive",
+      "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
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "log_id": {
+          "name": "log_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "read_timestamp": {
+          "name": "read_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archive_timestamp": {
+          "name": "archive_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "in_app_archive_tenant_id_user_id_archive_timestamp_idx": {
+          "name": "in_app_archive_tenant_id_user_id_archive_timestamp_idx",
+          "columns": [
+            {
+              "expression": "tenant_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archive_timestamp",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "in_app_archive_tenant_id_user_id_timestamp_log_id_idx": {
+          "name": "in_app_archive_tenant_id_user_id_timestamp_log_id_idx",
+          "columns": [
+            {
+              "expression": "tenant_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "timestamp",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            },
+            {
+              "expression": "log_id",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "in_app_archive_id_user_fkey": {
+          "name": "in_app_archive_id_user_fkey",
+          "tableFrom": "in_app_archive",
+          "tableTo": "user",
+          "schemaTo": "authentication",
+          "columnsFrom": [
+            "tenant_id",
+            "user_id"
+          ],
+          "columnsTo": [
+            "tenant_id",
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "in_app_archive_tenant_id_id_pk": {
+          "name": "in_app_archive_tenant_id_id_pk",
+          "columns": [
+            "tenant_id",
+            "id"
+          ]
+        }
+      },
       "uniqueConstraints": {},
       "policies": {},
       "checkConstraints": {},
@@ -194,35 +434,7 @@
           "notNull": false
         }
       },
-      "indexes": {
-        "log_tenant_id_user_id_timestamp_idx": {
-          "name": "log_tenant_id_user_id_timestamp_idx",
-          "columns": [
-            {
-              "expression": "tenant_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "timestamp",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
+      "indexes": {},
       "foreignKeys": {
         "log_type_type_key_fk": {
           "name": "log_type_type_key_fk",
@@ -281,13 +493,13 @@
         }
       },
       "uniqueConstraints": {
-        "log_tenant_id_id_user_id_unique": {
-          "name": "log_tenant_id_id_user_id_unique",
+        "log_tenant_id_user_id_id_unique": {
+          "name": "log_tenant_id_user_id_id_unique",
           "nullsNotDistinct": false,
           "columns": [
             "tenant_id",
-            "id",
-            "user_id"
+            "user_id",
+            "id"
           ]
         }
       },

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

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1770233636064,
-      "tag": "0000_oval_rage",
+      "when": 1770754328787,
+      "tag": "0000_wise_pyro",
       "breakpoints": true
     }
   ]

package/notification/server/module.d.ts

@@ -6,6 +6,11 @@ export declare class NotificationConfiguration {
     database?: DatabaseConfig;
     defaultChannels?: NotificationChannel[];
     ancillaryService?: InjectionToken<NotificationAncillaryService<any>>;
+    /**
+     * The duration in milliseconds after which notifications should be automatically archived.
+     * Defaults to 30 days.
+     */
+    autoArchiveAfter?: number;
 }
 export declare function configureNotification({ injector, ...config }: NotificationConfiguration & {
     injector?: Injector;

package/notification/server/module.js

@@ -6,10 +6,15 @@ export class NotificationConfiguration {
     database;
     defaultChannels;
     ancillaryService;
+    /**
+     * The duration in milliseconds after which notifications should be automatically archived.
+     * Defaults to 30 days.
+     */
+    autoArchiveAfter;
 }
 export function configureNotification({ injector, ...config }) {
     const targetInjector = injector ?? Injector;
-    targetInjector.register(NotificationConfiguration, { useValue: config });
+    targetInjector.register(NotificationConfiguration, { useValue: { autoArchiveAfter: 30 * 24 * 60 * 60 * 1000, ...config } });
     if (isDefined(config.ancillaryService)) {
         targetInjector.register(NotificationAncillaryService, { useToken: config.ancillaryService });
     }

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

@@ -19,6 +19,7 @@ let InAppChannelProvider = class InAppChannelProvider extends ChannelProvider {
             tenantId: notification.tenantId,
             userId: notification.userId,
             logId: notification.id,
+            timestamp: notification.timestamp,
             readTimestamp: null,
             archiveTimestamp: null,
         });

package/notification/server/schemas.d.ts

@@ -1,4 +1,4 @@
-import { InAppNotification, NotificationLogEntity, NotificationPreference, NotificationType, WebPushSubscription } from '../models/index.js';
+import { InAppNotification, InAppNotificationArchive, NotificationLogEntity, NotificationPreference, NotificationType, WebPushSubscription } from '../models/index.js';
 export declare const notificationSchema: import("../../orm/server/index.js").DatabaseSchema<"notification">;
 export declare const notificationChannel: import("../../orm/enums.js").PgEnumFromEnumeration<{
     readonly InApp: "in-app";
@@ -19,7 +19,8 @@ export declare const notificationStatus: import("../../orm/enums.js").PgEnumFrom
     readonly Failed: "failed";
 }>;
 export declare const inAppNotification: import("../../orm/server/types.js").PgTableFromType<typeof InAppNotification, "notification">;
-export declare const notificationType: import("../../orm/server/types.js").PgTableFromType<typeof NotificationType, "notification">;
+export declare const inAppNotificationArchive: import("../../orm/server/types.js").PgTableFromType<typeof InAppNotificationArchive, "notification">;
 export declare const notificationLog: import("../../orm/server/types.js").PgTableFromType<typeof NotificationLogEntity, "notification">;
 export declare const notificationPreference: import("../../orm/server/types.js").PgTableFromType<typeof NotificationPreference, "notification">;
+export declare const notificationType: import("../../orm/server/types.js").PgTableFromType<typeof NotificationType, "notification">;
 export declare const webPushSubscription: import("../../orm/server/types.js").PgTableFromType<typeof WebPushSubscription, "notification">;

package/notification/server/schemas.js

@@ -1,11 +1,12 @@
 import { databaseSchema } from '../../orm/server/index.js';
-import { InAppNotification, NotificationChannel, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, NotificationType, WebPushSubscription } from '../models/index.js';
+import { InAppNotification, InAppNotificationArchive, NotificationChannel, NotificationLogEntity, NotificationPreference, NotificationPriority, NotificationStatus, NotificationType, WebPushSubscription } from '../models/index.js';
 export const notificationSchema = databaseSchema('notification');
 export const notificationChannel = notificationSchema.getEnum(NotificationChannel);
 export const notificationPriority = notificationSchema.getEnum(NotificationPriority);
 export const notificationStatus = notificationSchema.getEnum(NotificationStatus);
 export const inAppNotification = notificationSchema.getTable(InAppNotification);
-export const notificationType = notificationSchema.getTable(NotificationType);
+export const inAppNotificationArchive = notificationSchema.getTable(InAppNotificationArchive);
 export const notificationLog = notificationSchema.getTable(NotificationLogEntity);
 export const notificationPreference = notificationSchema.getTable(NotificationPreference);
+export const notificationType = notificationSchema.getTable(NotificationType);
 export const webPushSubscription = notificationSchema.getTable(WebPushSubscription);

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

@@ -1,7 +1,7 @@
-import { type NewEntity } from '../../../orm/index.js';
+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, NotificationPreference, type InAppNotificationView, type NotificationDefinitionMap, type NotificationLog } from '../../models/index.js';
+import { NotificationChannel, NotificationLogEntity, NotificationPreference, type InAppNotificationView, type NotificationDefinitionMap, type NotificationLog } 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;
@@ -11,22 +11,27 @@ export declare class NotificationService<Definitions extends NotificationDefinit
     listInApp(tenantId: string, userId: string, options?: {
         limit?: number;
         offset?: number;
-        after?: string;
-        includeArchived?: boolean;
+        after?: number | string;
         unreadOnly?: boolean;
     }): Promise<InAppNotificationView[]>;
+    listArchivedInApp(tenantId: string, userId: string, options?: {
+        limit?: number;
+        offset?: number;
+        after?: number | string;
+    }): Promise<InAppNotificationView[]>;
     markRead(tenantId: string, userId: string, id: string): Promise<void>;
     markAllRead(tenantId: string, userId: string): Promise<void>;
     archive(tenantId: string, userId: string, id: string): Promise<void>;
+    archiveByQuery(tenantId: string, query: Query<NotificationLogEntity>): Promise<void>;
     archiveAll(tenantId: string, userId: string): Promise<void>;
+    runAutoArchive(): Promise<void>;
     unreadCount(tenantId: string, userId: string): Promise<number>;
-    getCatchupData(tenantId: string, userId: string, lastNotificationId: string): Promise<{
+    getCatchupData(tenantId: string, userId: string, stateTimestamp: number): Promise<{
         unreadCount: number;
         missedNotifications: InAppNotificationView[];
         readIds: string[];
         archiveIds: string[];
     }>;
-    getTimestamp(tenantId: string, userId: string, inAppId: string): Promise<number>;
     getPreferences(tenantId: string, userId: string): Promise<NotificationPreference[]>;
     updatePreference(tenantId: string, userId: string, type: string, channel: NotificationChannel, enabled: boolean): Promise<void>;
     registerWebPush(tenantId: string, userId: string, endpoint: string, p256dh: Uint8Array<ArrayBuffer>, auth: Uint8Array<ArrayBuffer>): Promise<void>;