From 181a7e115f365ee82f31287f4e6002000f7b971e Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Mon, 30 Jun 2025 15:26:41 -0400 Subject: [PATCH] feat: sync stacks (#19629) --- mobile/openapi/README.md | 2 + mobile/openapi/lib/api.dart | 2 + mobile/openapi/lib/api_client.dart | 4 + .../openapi/lib/model/sync_entity_type.dart | 6 + .../openapi/lib/model/sync_request_type.dart | 3 + .../lib/model/sync_stack_delete_v1.dart | 99 +++++++++++++ mobile/openapi/lib/model/sync_stack_v1.dart | 131 ++++++++++++++++++ open-api/immich-openapi-specs.json | 45 +++++- open-api/typescript-sdk/src/fetch-client.ts | 5 +- server/src/dtos/sync.dto.ts | 16 +++ server/src/enum.ts | 4 + server/src/queries/sync.repository.sql | 28 ++++ server/src/repositories/stack.repository.ts | 17 +-- server/src/repositories/sync.repository.ts | 30 +++- server/src/schema/functions.ts | 14 ++ server/src/schema/index.ts | 5 + .../1751304834247-StackSyncChanges.ts | 43 ++++++ server/src/schema/tables/album-asset.table.ts | 1 - server/src/schema/tables/album-user.table.ts | 1 - server/src/schema/tables/album.table.ts | 1 - server/src/schema/tables/asset.table.ts | 1 - server/src/schema/tables/index.ts | 35 ----- .../src/schema/tables/memory-asset.table.ts | 1 - server/src/schema/tables/memory.table.ts | 1 - server/src/schema/tables/partner.table.ts | 1 - server/src/schema/tables/stack-audit.table.ts | 17 +++ server/src/schema/tables/stack.table.ts | 29 +++- server/src/schema/tables/user.table.ts | 1 - server/src/services/stack.service.ts | 2 +- server/src/services/sync.service.ts | 16 +++ .../decorators/trigger-function.decorator.ts | 6 +- server/test/medium.factory.ts | 16 +++ .../specs/services/audit.database.spec.ts | 16 ++- .../test/medium/specs/sync/sync-stack.spec.ts | 107 ++++++++++++++ .../sql-tools/trigger-after-delete.stub.ts | 2 +- 35 files changed, 646 insertions(+), 62 deletions(-) create mode 100644 mobile/openapi/lib/model/sync_stack_delete_v1.dart create mode 100644 mobile/openapi/lib/model/sync_stack_v1.dart create mode 100644 server/src/schema/migrations/1751304834247-StackSyncChanges.ts delete mode 100644 server/src/schema/tables/index.ts create mode 100644 server/src/schema/tables/stack-audit.table.ts create mode 100644 server/test/medium/specs/sync/sync-stack.spec.ts diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index d9607ef2ec..1beaec0ae6 100644 --- a/mobile/openapi/README.md +++ b/mobile/openapi/README.md @@ -482,6 +482,8 @@ Class | Method | HTTP request | Description - [SyncPartnerDeleteV1](doc//SyncPartnerDeleteV1.md) - [SyncPartnerV1](doc//SyncPartnerV1.md) - [SyncRequestType](doc//SyncRequestType.md) + - [SyncStackDeleteV1](doc//SyncStackDeleteV1.md) + - [SyncStackV1](doc//SyncStackV1.md) - [SyncStreamDto](doc//SyncStreamDto.md) - [SyncUserDeleteV1](doc//SyncUserDeleteV1.md) - [SyncUserV1](doc//SyncUserV1.md) diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart index 67f75fba38..3998961720 100644 --- a/mobile/openapi/lib/api.dart +++ b/mobile/openapi/lib/api.dart @@ -265,6 +265,8 @@ part 'model/sync_memory_v1.dart'; part 'model/sync_partner_delete_v1.dart'; part 'model/sync_partner_v1.dart'; part 'model/sync_request_type.dart'; +part 'model/sync_stack_delete_v1.dart'; +part 'model/sync_stack_v1.dart'; part 'model/sync_stream_dto.dart'; part 'model/sync_user_delete_v1.dart'; part 'model/sync_user_v1.dart'; diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart index d0f7837bc9..0edc2638bc 100644 --- a/mobile/openapi/lib/api_client.dart +++ b/mobile/openapi/lib/api_client.dart @@ -586,6 +586,10 @@ class ApiClient { return SyncPartnerV1.fromJson(value); case 'SyncRequestType': return SyncRequestTypeTypeTransformer().decode(value); + case 'SyncStackDeleteV1': + return SyncStackDeleteV1.fromJson(value); + case 'SyncStackV1': + return SyncStackV1.fromJson(value); case 'SyncStreamDto': return SyncStreamDto.fromJson(value); case 'SyncUserDeleteV1': diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart index fb530240ed..7c28ae6265 100644 --- a/mobile/openapi/lib/model/sync_entity_type.dart +++ b/mobile/openapi/lib/model/sync_entity_type.dart @@ -51,6 +51,8 @@ class SyncEntityType { static const memoryDeleteV1 = SyncEntityType._(r'MemoryDeleteV1'); static const memoryToAssetV1 = SyncEntityType._(r'MemoryToAssetV1'); static const memoryToAssetDeleteV1 = SyncEntityType._(r'MemoryToAssetDeleteV1'); + static const stackV1 = SyncEntityType._(r'StackV1'); + static const stackDeleteV1 = SyncEntityType._(r'StackDeleteV1'); static const syncAckV1 = SyncEntityType._(r'SyncAckV1'); /// List of all possible values in this [enum][SyncEntityType]. @@ -83,6 +85,8 @@ class SyncEntityType { memoryDeleteV1, memoryToAssetV1, memoryToAssetDeleteV1, + stackV1, + stackDeleteV1, syncAckV1, ]; @@ -150,6 +154,8 @@ class SyncEntityTypeTypeTransformer { case r'MemoryDeleteV1': return SyncEntityType.memoryDeleteV1; case r'MemoryToAssetV1': return SyncEntityType.memoryToAssetV1; case r'MemoryToAssetDeleteV1': return SyncEntityType.memoryToAssetDeleteV1; + case r'StackV1': return SyncEntityType.stackV1; + case r'StackDeleteV1': return SyncEntityType.stackDeleteV1; case r'SyncAckV1': return SyncEntityType.syncAckV1; default: if (!allowNull) { diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart index 21b71dbc5b..e30a509b99 100644 --- a/mobile/openapi/lib/model/sync_request_type.dart +++ b/mobile/openapi/lib/model/sync_request_type.dart @@ -36,6 +36,7 @@ class SyncRequestType { static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1'); static const memoriesV1 = SyncRequestType._(r'MemoriesV1'); static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1'); + static const stacksV1 = SyncRequestType._(r'StacksV1'); /// List of all possible values in this [enum][SyncRequestType]. static const values = [ @@ -52,6 +53,7 @@ class SyncRequestType { albumAssetExifsV1, memoriesV1, memoryToAssetsV1, + stacksV1, ]; static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value); @@ -103,6 +105,7 @@ class SyncRequestTypeTypeTransformer { case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1; case r'MemoriesV1': return SyncRequestType.memoriesV1; case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1; + case r'StacksV1': return SyncRequestType.stacksV1; default: if (!allowNull) { throw ArgumentError('Unknown enum value to decode: $data'); diff --git a/mobile/openapi/lib/model/sync_stack_delete_v1.dart b/mobile/openapi/lib/model/sync_stack_delete_v1.dart new file mode 100644 index 0000000000..22c6d99a52 --- /dev/null +++ b/mobile/openapi/lib/model/sync_stack_delete_v1.dart @@ -0,0 +1,99 @@ +// +// AUTO-GENERATED FILE, DO NOT MODIFY! +// +// @dart=2.18 + +// ignore_for_file: unused_element, unused_import +// ignore_for_file: always_put_required_named_parameters_first +// ignore_for_file: constant_identifier_names +// ignore_for_file: lines_longer_than_80_chars + +part of openapi.api; + +class SyncStackDeleteV1 { + /// Returns a new [SyncStackDeleteV1] instance. + SyncStackDeleteV1({ + required this.stackId, + }); + + String stackId; + + @override + bool operator ==(Object other) => identical(this, other) || other is SyncStackDeleteV1 && + other.stackId == stackId; + + @override + int get hashCode => + // ignore: unnecessary_parenthesis + (stackId.hashCode); + + @override + String toString() => 'SyncStackDeleteV1[stackId=$stackId]'; + + Map toJson() { + final json = {}; + json[r'stackId'] = this.stackId; + return json; + } + + /// Returns a new [SyncStackDeleteV1] instance and imports its values from + /// [value] if it's a [Map], null otherwise. + // ignore: prefer_constructors_over_static_methods + static SyncStackDeleteV1? fromJson(dynamic value) { + upgradeDto(value, "SyncStackDeleteV1"); + if (value is Map) { + final json = value.cast(); + + return SyncStackDeleteV1( + stackId: mapValueOfType(json, r'stackId')!, + ); + } + return null; + } + + static List listFromJson(dynamic json, {bool growable = false,}) { + final result = []; + if (json is List && json.isNotEmpty) { + for (final row in json) { + final value = SyncStackDeleteV1.fromJson(row); + if (value != null) { + result.add(value); + } + } + } + return result.toList(growable: growable); + } + + static Map mapFromJson(dynamic json) { + final map = {}; + if (json is Map && json.isNotEmpty) { + json = json.cast(); // ignore: parameter_assignments + for (final entry in json.entries) { + final value = SyncStackDeleteV1.fromJson(entry.value); + if (value != null) { + map[entry.key] = value; + } + } + } + return map; + } + + // maps a json object with a list of SyncStackDeleteV1-objects as value to a dart map + static Map> mapListFromJson(dynamic json, {bool growable = false,}) { + final map = >{}; + if (json is Map && json.isNotEmpty) { + // ignore: parameter_assignments + json = json.cast(); + for (final entry in json.entries) { + map[entry.key] = SyncStackDeleteV1.listFromJson(entry.value, growable: growable,); + } + } + return map; + } + + /// The list of required keys that must be present in a JSON. + static const requiredKeys = { + 'stackId', + }; +} + diff --git a/mobile/openapi/lib/model/sync_stack_v1.dart b/mobile/openapi/lib/model/sync_stack_v1.dart new file mode 100644 index 0000000000..c65affe8c0 --- /dev/null +++ b/mobile/openapi/lib/model/sync_stack_v1.dart @@ -0,0 +1,131 @@ +// +// AUTO-GENERATED FILE, DO NOT MODIFY! +// +// @dart=2.18 + +// ignore_for_file: unused_element, unused_import +// ignore_for_file: always_put_required_named_parameters_first +// ignore_for_file: constant_identifier_names +// ignore_for_file: lines_longer_than_80_chars + +part of openapi.api; + +class SyncStackV1 { + /// Returns a new [SyncStackV1] instance. + SyncStackV1({ + required this.createdAt, + required this.id, + required this.ownerId, + required this.primaryAssetId, + required this.updatedAt, + }); + + DateTime createdAt; + + String id; + + String ownerId; + + String primaryAssetId; + + DateTime updatedAt; + + @override + bool operator ==(Object other) => identical(this, other) || other is SyncStackV1 && + other.createdAt == createdAt && + other.id == id && + other.ownerId == ownerId && + other.primaryAssetId == primaryAssetId && + other.updatedAt == updatedAt; + + @override + int get hashCode => + // ignore: unnecessary_parenthesis + (createdAt.hashCode) + + (id.hashCode) + + (ownerId.hashCode) + + (primaryAssetId.hashCode) + + (updatedAt.hashCode); + + @override + String toString() => 'SyncStackV1[createdAt=$createdAt, id=$id, ownerId=$ownerId, primaryAssetId=$primaryAssetId, updatedAt=$updatedAt]'; + + Map toJson() { + final json = {}; + json[r'createdAt'] = this.createdAt.toUtc().toIso8601String(); + json[r'id'] = this.id; + json[r'ownerId'] = this.ownerId; + json[r'primaryAssetId'] = this.primaryAssetId; + json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String(); + return json; + } + + /// Returns a new [SyncStackV1] instance and imports its values from + /// [value] if it's a [Map], null otherwise. + // ignore: prefer_constructors_over_static_methods + static SyncStackV1? fromJson(dynamic value) { + upgradeDto(value, "SyncStackV1"); + if (value is Map) { + final json = value.cast(); + + return SyncStackV1( + createdAt: mapDateTime(json, r'createdAt', r'')!, + id: mapValueOfType(json, r'id')!, + ownerId: mapValueOfType(json, r'ownerId')!, + primaryAssetId: mapValueOfType(json, r'primaryAssetId')!, + updatedAt: mapDateTime(json, r'updatedAt', r'')!, + ); + } + return null; + } + + static List listFromJson(dynamic json, {bool growable = false,}) { + final result = []; + if (json is List && json.isNotEmpty) { + for (final row in json) { + final value = SyncStackV1.fromJson(row); + if (value != null) { + result.add(value); + } + } + } + return result.toList(growable: growable); + } + + static Map mapFromJson(dynamic json) { + final map = {}; + if (json is Map && json.isNotEmpty) { + json = json.cast(); // ignore: parameter_assignments + for (final entry in json.entries) { + final value = SyncStackV1.fromJson(entry.value); + if (value != null) { + map[entry.key] = value; + } + } + } + return map; + } + + // maps a json object with a list of SyncStackV1-objects as value to a dart map + static Map> mapListFromJson(dynamic json, {bool growable = false,}) { + final map = >{}; + if (json is Map && json.isNotEmpty) { + // ignore: parameter_assignments + json = json.cast(); + for (final entry in json.entries) { + map[entry.key] = SyncStackV1.listFromJson(entry.value, growable: growable,); + } + } + return map; + } + + /// The list of required keys that must be present in a JSON. + static const requiredKeys = { + 'createdAt', + 'id', + 'ownerId', + 'primaryAssetId', + 'updatedAt', + }; +} + diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index 5859331614..eda16498ad 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -13820,6 +13820,8 @@ "MemoryDeleteV1", "MemoryToAssetV1", "MemoryToAssetDeleteV1", + "StackV1", + "StackDeleteV1", "SyncAckV1" ], "type": "string" @@ -13983,10 +13985,51 @@ "AlbumAssetsV1", "AlbumAssetExifsV1", "MemoriesV1", - "MemoryToAssetsV1" + "MemoryToAssetsV1", + "StacksV1" ], "type": "string" }, + "SyncStackDeleteV1": { + "properties": { + "stackId": { + "type": "string" + } + }, + "required": [ + "stackId" + ], + "type": "object" + }, + "SyncStackV1": { + "properties": { + "createdAt": { + "format": "date-time", + "type": "string" + }, + "id": { + "type": "string" + }, + "ownerId": { + "type": "string" + }, + "primaryAssetId": { + "type": "string" + }, + "updatedAt": { + "format": "date-time", + "type": "string" + } + }, + "required": [ + "createdAt", + "id", + "ownerId", + "primaryAssetId", + "updatedAt" + ], + "type": "object" + }, "SyncStreamDto": { "properties": { "types": { diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts index a7016df710..5b98e094c2 100644 --- a/open-api/typescript-sdk/src/fetch-client.ts +++ b/open-api/typescript-sdk/src/fetch-client.ts @@ -4089,6 +4089,8 @@ export enum SyncEntityType { MemoryDeleteV1 = "MemoryDeleteV1", MemoryToAssetV1 = "MemoryToAssetV1", MemoryToAssetDeleteV1 = "MemoryToAssetDeleteV1", + StackV1 = "StackV1", + StackDeleteV1 = "StackDeleteV1", SyncAckV1 = "SyncAckV1" } export enum SyncRequestType { @@ -4104,7 +4106,8 @@ export enum SyncRequestType { AlbumAssetsV1 = "AlbumAssetsV1", AlbumAssetExifsV1 = "AlbumAssetExifsV1", MemoriesV1 = "MemoriesV1", - MemoryToAssetsV1 = "MemoryToAssetsV1" + MemoryToAssetsV1 = "MemoryToAssetsV1", + StacksV1 = "StacksV1" } export enum TranscodeHWAccel { Nvenc = "nvenc", diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts index 77f0578c36..c972983a1f 100644 --- a/server/src/dtos/sync.dto.ts +++ b/server/src/dtos/sync.dto.ts @@ -219,6 +219,20 @@ export class SyncMemoryAssetDeleteV1 { assetId!: string; } +@ExtraModel() +export class SyncStackV1 { + id!: string; + createdAt!: Date; + updatedAt!: Date; + primaryAssetId!: string; + ownerId!: string; +} + +@ExtraModel() +export class SyncStackDeleteV1 { + stackId!: string; +} + @ExtraModel() export class SyncAckV1 {} @@ -251,6 +265,8 @@ export type SyncItem = { [SyncEntityType.MemoryDeleteV1]: SyncMemoryDeleteV1; [SyncEntityType.MemoryToAssetV1]: SyncMemoryAssetV1; [SyncEntityType.MemoryToAssetDeleteV1]: SyncMemoryAssetDeleteV1; + [SyncEntityType.StackV1]: SyncStackV1; + [SyncEntityType.StackDeleteV1]: SyncStackDeleteV1; [SyncEntityType.SyncAckV1]: SyncAckV1; }; diff --git a/server/src/enum.ts b/server/src/enum.ts index 4a89baa6bd..706b5c876f 100644 --- a/server/src/enum.ts +++ b/server/src/enum.ts @@ -586,6 +586,7 @@ export enum SyncRequestType { AlbumAssetExifsV1 = 'AlbumAssetExifsV1', MemoriesV1 = 'MemoriesV1', MemoryToAssetsV1 = 'MemoryToAssetsV1', + StacksV1 = 'StacksV1', } export enum SyncEntityType { @@ -627,6 +628,9 @@ export enum SyncEntityType { MemoryToAssetV1 = 'MemoryToAssetV1', MemoryToAssetDeleteV1 = 'MemoryToAssetDeleteV1', + StackV1 = 'StackV1', + StackDeleteV1 = 'StackDeleteV1', + SyncAckV1 = 'SyncAckV1', } diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql index bbd327ff69..42c386a372 100644 --- a/server/src/queries/sync.repository.sql +++ b/server/src/queries/sync.repository.sql @@ -689,6 +689,34 @@ where order by "updateId" asc +-- SyncRepository.stack.getDeletes +select + "id", + "stackId" +from + "stacks_audit" +where + "userId" = $1 + and "deletedAt" < now() - interval '1 millisecond' +order by + "id" asc + +-- SyncRepository.stack.getUpserts +select + "id", + "createdAt", + "updatedAt", + "primaryAssetId", + "ownerId", + "updateId" +from + "asset_stack" +where + "ownerId" = $1 + and "updatedAt" < now() - interval '1 millisecond' +order by + "updateId" asc + -- SyncRepository.user.getDeletes select "id", diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts index b7ee46c671..c049a19373 100644 --- a/server/src/repositories/stack.repository.ts +++ b/server/src/repositories/stack.repository.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { ExpressionBuilder, Kysely, Updateable } from 'kysely'; +import { ExpressionBuilder, Insertable, Kysely, Updateable } from 'kysely'; import { jsonArrayFrom } from 'kysely/helpers/postgres'; import { InjectKysely } from 'nestjs-kysely'; import { columns } from 'src/database'; @@ -55,12 +55,12 @@ export class StackRepository { .execute(); } - async create(entity: { ownerId: string; assetIds: string[] }) { + async create(entity: Omit, 'primaryAssetId'>, assetIds: string[]) { return this.db.transaction().execute(async (tx) => { const stacks = await tx .selectFrom('asset_stack') .where('asset_stack.ownerId', '=', entity.ownerId) - .where('asset_stack.primaryAssetId', 'in', entity.assetIds) + .where('asset_stack.primaryAssetId', 'in', assetIds) .select('asset_stack.id') .select((eb) => jsonArrayFrom( @@ -73,13 +73,13 @@ export class StackRepository { ) .execute(); - const assetIds = new Set(entity.assetIds); + const uniqueIds = new Set(assetIds); // children for (const stack of stacks) { if (stack.assets && stack.assets.length > 0) { for (const asset of stack.assets) { - assetIds.add(asset.id); + uniqueIds.add(asset.id); } } } @@ -97,10 +97,7 @@ export class StackRepository { const newRecord = await tx .insertInto('asset_stack') - .values({ - ownerId: entity.ownerId, - primaryAssetId: entity.assetIds[0], - }) + .values({ ...entity, primaryAssetId: assetIds[0] }) .returning('id') .executeTakeFirstOrThrow(); @@ -110,7 +107,7 @@ export class StackRepository { stackId: newRecord.id, updatedAt: new Date(), }) - .where('id', 'in', [...assetIds]) + .where('id', 'in', [...uniqueIds]) .execute(); return tx diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts index 73a1aca749..593847b426 100644 --- a/server/src/repositories/sync.repository.ts +++ b/server/src/repositories/sync.repository.ts @@ -14,7 +14,8 @@ type AuditTables = | 'album_users_audit' | 'album_assets_audit' | 'memories_audit' - | 'memory_assets_audit'; + | 'memory_assets_audit' + | 'stacks_audit'; type UpsertTables = | 'users' | 'partners' @@ -23,7 +24,8 @@ type UpsertTables = | 'albums' | 'albums_shared_users_users' | 'memories' - | 'memories_assets_assets'; + | 'memories_assets_assets' + | 'asset_stack'; @Injectable() export class SyncRepository { @@ -39,6 +41,7 @@ export class SyncRepository { partner: PartnerSync; partnerAsset: PartnerAssetsSync; partnerAssetExif: PartnerAssetExifsSync; + stack: StackSync; user: UserSync; constructor(@InjectKysely() private db: Kysely) { @@ -54,6 +57,7 @@ export class SyncRepository { this.partner = new PartnerSync(this.db); this.partnerAsset = new PartnerAssetsSync(this.db); this.partnerAssetExif = new PartnerAssetExifsSync(this.db); + this.stack = new StackSync(this.db); this.user = new UserSync(this.db); } } @@ -533,6 +537,28 @@ class PartnerAssetExifsSync extends BaseSync { } } +class StackSync extends BaseSync { + @GenerateSql({ params: [DummyValue.UUID], stream: true }) + getDeletes(userId: string, ack?: SyncAck) { + return this.db + .selectFrom('stacks_audit') + .select(['id', 'stackId']) + .where('userId', '=', userId) + .$call((qb) => this.auditTableFilters(qb, ack)) + .stream(); + } + + @GenerateSql({ params: [DummyValue.UUID], stream: true }) + getUpserts(userId: string, ack?: SyncAck) { + return this.db + .selectFrom('asset_stack') + .select(['id', 'createdAt', 'updatedAt', 'primaryAssetId', 'ownerId', 'updateId']) + .where('ownerId', '=', userId) + .$call((qb) => this.upsertTableFilters(qb, ack)) + .stream(); + } +} + class UserSync extends BaseSync { @GenerateSql({ params: [], stream: true }) getDeletes(ack?: SyncAck) { diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts index 279eb62a24..d4c97e1966 100644 --- a/server/src/schema/functions.ts +++ b/server/src/schema/functions.ts @@ -204,3 +204,17 @@ export const memory_assets_delete_audit = registerFunction({ END`, synchronize: false, }); + +export const stacks_delete_audit = registerFunction({ + name: 'stacks_delete_audit', + returnType: 'TRIGGER', + language: 'PLPGSQL', + body: ` + BEGIN + INSERT INTO stacks_audit ("stackId", "userId") + SELECT "id", "ownerId" + FROM OLD; + RETURN NULL; + END`, + synchronize: false, +}); diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts index a8508b2c4b..6512ccc225 100644 --- a/server/src/schema/index.ts +++ b/server/src/schema/index.ts @@ -11,6 +11,7 @@ import { memories_delete_audit, memory_assets_delete_audit, partners_delete_audit, + stacks_delete_audit, updated_at, users_delete_audit, } from 'src/schema/functions'; @@ -46,6 +47,7 @@ import { SessionTable } from 'src/schema/tables/session.table'; import { SharedLinkAssetTable } from 'src/schema/tables/shared-link-asset.table'; import { SharedLinkTable } from 'src/schema/tables/shared-link.table'; import { SmartSearchTable } from 'src/schema/tables/smart-search.table'; +import { StackAuditTable } from 'src/schema/tables/stack-audit.table'; import { StackTable } from 'src/schema/tables/stack.table'; import { SessionSyncCheckpointTable } from 'src/schema/tables/sync-checkpoint.table'; import { SystemMetadataTable } from 'src/schema/tables/system-metadata.table'; @@ -95,6 +97,7 @@ export class ImmichDatabase { SharedLinkTable, SmartSearchTable, StackTable, + StackAuditTable, SessionSyncCheckpointTable, SystemMetadataTable, TagTable, @@ -120,6 +123,7 @@ export class ImmichDatabase { album_users_delete_audit, memories_delete_audit, memory_assets_delete_audit, + stacks_delete_audit, ]; enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum]; @@ -167,6 +171,7 @@ export interface DB { shared_link__asset: SharedLinkAssetTable; shared_links: SharedLinkTable; smart_search: SmartSearchTable; + stacks_audit: StackAuditTable; system_metadata: SystemMetadataTable; tag_asset: TagAssetTable; tags: TagTable; diff --git a/server/src/schema/migrations/1751304834247-StackSyncChanges.ts b/server/src/schema/migrations/1751304834247-StackSyncChanges.ts new file mode 100644 index 0000000000..83744988b9 --- /dev/null +++ b/server/src/schema/migrations/1751304834247-StackSyncChanges.ts @@ -0,0 +1,43 @@ +import { Kysely, sql } from 'kysely'; + +export async function up(db: Kysely): Promise { + await sql`CREATE TABLE "stacks_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "stackId" uuid NOT NULL, "userId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db); + await sql`ALTER TABLE "asset_stack" ADD "createdAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db); + await sql`ALTER TABLE "asset_stack" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db); + await sql`ALTER TABLE "asset_stack" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db); + await sql`ALTER TABLE "stacks_audit" ADD CONSTRAINT "PK_dbe4ec648fa032e8973297de07e" PRIMARY KEY ("id");`.execute(db); + await sql`CREATE INDEX "IDX_stacks_audit_deleted_at" ON "stacks_audit" ("deletedAt")`.execute(db); + await sql`CREATE OR REPLACE FUNCTION stacks_delete_audit() + RETURNS TRIGGER + LANGUAGE PLPGSQL + AS $$ + BEGIN + INSERT INTO stacks_audit ("stackId", "userId") + SELECT "id", "ownerId" + FROM OLD; + RETURN NULL; + END + $$;`.execute(db); + await sql`CREATE OR REPLACE TRIGGER "stacks_delete_audit" + AFTER DELETE ON "asset_stack" + REFERENCING OLD TABLE AS "old" + FOR EACH STATEMENT + WHEN (pg_trigger_depth() = 0) + EXECUTE FUNCTION stacks_delete_audit();`.execute(db); + await sql`CREATE OR REPLACE TRIGGER "stacks_updated_at" + BEFORE UPDATE ON "asset_stack" + FOR EACH ROW + EXECUTE FUNCTION updated_at();`.execute(db); +} + +export async function down(db: Kysely): Promise { + await sql`DROP TRIGGER "stacks_delete_audit" ON "asset_stack";`.execute(db); + await sql`DROP TRIGGER "stacks_updated_at" ON "asset_stack";`.execute(db); + await sql`DROP INDEX "IDX_stacks_audit_deleted_at";`.execute(db); + await sql`ALTER TABLE "stacks_audit" DROP CONSTRAINT "PK_dbe4ec648fa032e8973297de07e";`.execute(db); + await sql`ALTER TABLE "asset_stack" DROP COLUMN "createdAt";`.execute(db); + await sql`ALTER TABLE "asset_stack" DROP COLUMN "updatedAt";`.execute(db); + await sql`ALTER TABLE "asset_stack" DROP COLUMN "updateId";`.execute(db); + await sql`DROP TABLE "stacks_audit";`.execute(db); + await sql`DROP FUNCTION stacks_delete_audit;`.execute(db); +} diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts index f0841edc44..9b97db7ea0 100644 --- a/server/src/schema/tables/album-asset.table.ts +++ b/server/src/schema/tables/album-asset.table.ts @@ -15,7 +15,6 @@ import { @Table({ name: 'albums_assets_assets', primaryConstraintName: 'PK_c67bc36fa845fb7b18e0e398180' }) @UpdatedAtTrigger('album_assets_updated_at') @AfterDeleteTrigger({ - name: 'album_assets_delete_audit', scope: 'statement', function: album_assets_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts index 65e3db7185..e8ed720eef 100644 --- a/server/src/schema/tables/album-user.table.ts +++ b/server/src/schema/tables/album-user.table.ts @@ -28,7 +28,6 @@ import { function: album_user_after_insert, }) @AfterDeleteTrigger({ - name: 'album_users_delete_audit', scope: 'statement', function: album_users_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/album.table.ts b/server/src/schema/tables/album.table.ts index 509b7d2cec..e4cad8f469 100644 --- a/server/src/schema/tables/album.table.ts +++ b/server/src/schema/tables/album.table.ts @@ -19,7 +19,6 @@ import { @Table({ name: 'albums', primaryConstraintName: 'PK_7f71c7b5bc7c87b8f94c9a93a00' }) @UpdatedAtTrigger('albums_updated_at') @AfterDeleteTrigger({ - name: 'albums_delete_audit', scope: 'statement', function: albums_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts index 0a8120e656..fcbb0aec76 100644 --- a/server/src/schema/tables/asset.table.ts +++ b/server/src/schema/tables/asset.table.ts @@ -23,7 +23,6 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database'; @Table('assets') @UpdatedAtTrigger('assets_updated_at') @AfterDeleteTrigger({ - name: 'assets_delete_audit', scope: 'statement', function: assets_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/index.ts b/server/src/schema/tables/index.ts deleted file mode 100644 index 67b36ab351..0000000000 --- a/server/src/schema/tables/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -import 'src/schema/tables/activity.table'; -import 'src/schema/tables/album-asset.table'; -import 'src/schema/tables/album-user.table'; -import 'src/schema/tables/album.table'; -import 'src/schema/tables/api-key.table'; -import 'src/schema/tables/asset-audit.table'; -import 'src/schema/tables/asset-face.table'; -import 'src/schema/tables/asset-files.table'; -import 'src/schema/tables/asset-job-status.table'; -import 'src/schema/tables/asset.table'; -import 'src/schema/tables/audit.table'; -import 'src/schema/tables/exif.table'; -import 'src/schema/tables/face-search.table'; -import 'src/schema/tables/geodata-places.table'; -import 'src/schema/tables/library.table'; -import 'src/schema/tables/memory-asset.table'; -import 'src/schema/tables/memory.table'; -import 'src/schema/tables/move.table'; -import 'src/schema/tables/natural-earth-countries.table'; -import 'src/schema/tables/partner-audit.table'; -import 'src/schema/tables/partner.table'; -import 'src/schema/tables/person.table'; -import 'src/schema/tables/session.table'; -import 'src/schema/tables/shared-link-asset.table'; -import 'src/schema/tables/shared-link.table'; -import 'src/schema/tables/smart-search.table'; -import 'src/schema/tables/stack.table'; -import 'src/schema/tables/sync-checkpoint.table'; -import 'src/schema/tables/system-metadata.table'; -import 'src/schema/tables/tag-asset.table'; -import 'src/schema/tables/tag-closure.table'; -import 'src/schema/tables/user-audit.table'; -import 'src/schema/tables/user-metadata.table'; -import 'src/schema/tables/user.table'; -import 'src/schema/tables/version-history.table'; diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts index c8ef9297be..7ccdcdc13d 100644 --- a/server/src/schema/tables/memory-asset.table.ts +++ b/server/src/schema/tables/memory-asset.table.ts @@ -15,7 +15,6 @@ import { @Table('memories_assets_assets') @UpdatedAtTrigger('memory_assets_updated_at') @AfterDeleteTrigger({ - name: 'memory_assets_delete_audit', scope: 'statement', function: memory_assets_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/memory.table.ts b/server/src/schema/tables/memory.table.ts index 8345eacbed..30aef7e0a4 100644 --- a/server/src/schema/tables/memory.table.ts +++ b/server/src/schema/tables/memory.table.ts @@ -18,7 +18,6 @@ import { @Table('memories') @UpdatedAtTrigger('memories_updated_at') @AfterDeleteTrigger({ - name: 'memories_delete_audit', scope: 'statement', function: memories_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/partner.table.ts b/server/src/schema/tables/partner.table.ts index a973f02320..dd5024832f 100644 --- a/server/src/schema/tables/partner.table.ts +++ b/server/src/schema/tables/partner.table.ts @@ -15,7 +15,6 @@ import { @Table('partners') @UpdatedAtTrigger('partners_updated_at') @AfterDeleteTrigger({ - name: 'partners_delete_audit', scope: 'statement', function: partners_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/schema/tables/stack-audit.table.ts b/server/src/schema/tables/stack-audit.table.ts new file mode 100644 index 0000000000..01b628d081 --- /dev/null +++ b/server/src/schema/tables/stack-audit.table.ts @@ -0,0 +1,17 @@ +import { PrimaryGeneratedUuidV7Column } from 'src/decorators'; +import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools'; + +@Table('stacks_audit') +export class StackAuditTable { + @PrimaryGeneratedUuidV7Column() + id!: Generated; + + @Column({ type: 'uuid' }) + stackId!: string; + + @Column({ type: 'uuid' }) + userId!: string; + + @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_stacks_audit_deleted_at' }) + deletedAt!: Generated; +} diff --git a/server/src/schema/tables/stack.table.ts b/server/src/schema/tables/stack.table.ts index 78700d82f9..fa206f24f2 100644 --- a/server/src/schema/tables/stack.table.ts +++ b/server/src/schema/tables/stack.table.ts @@ -1,12 +1,39 @@ +import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators'; +import { stacks_delete_audit } from 'src/schema/functions'; import { AssetTable } from 'src/schema/tables/asset.table'; import { UserTable } from 'src/schema/tables/user.table'; -import { ForeignKeyColumn, Generated, PrimaryGeneratedColumn, Table } from 'src/sql-tools'; +import { + AfterDeleteTrigger, + CreateDateColumn, + ForeignKeyColumn, + Generated, + PrimaryGeneratedColumn, + Table, + Timestamp, + UpdateDateColumn, +} from 'src/sql-tools'; @Table('asset_stack') +@UpdatedAtTrigger('stacks_updated_at') +@AfterDeleteTrigger({ + scope: 'statement', + function: stacks_delete_audit, + referencingOldTableAs: 'old', + when: 'pg_trigger_depth() = 0', +}) export class StackTable { @PrimaryGeneratedColumn() id!: Generated; + @CreateDateColumn() + createdAt!: Generated; + + @UpdateDateColumn() + updatedAt!: Generated; + + @UpdateIdColumn() + updateId!: Generated; + //TODO: Add constraint to ensure primary asset exists in the assets array @ForeignKeyColumn(() => AssetTable, { nullable: false, unique: true }) primaryAssetId!: string; diff --git a/server/src/schema/tables/user.table.ts b/server/src/schema/tables/user.table.ts index c4b32f571a..76b60521ac 100644 --- a/server/src/schema/tables/user.table.ts +++ b/server/src/schema/tables/user.table.ts @@ -18,7 +18,6 @@ import { @Table('users') @UpdatedAtTrigger('users_updated_at') @AfterDeleteTrigger({ - name: 'users_delete_audit', scope: 'statement', function: users_delete_audit, referencingOldTableAs: 'old', diff --git a/server/src/services/stack.service.ts b/server/src/services/stack.service.ts index 29413109c5..831755fefb 100644 --- a/server/src/services/stack.service.ts +++ b/server/src/services/stack.service.ts @@ -19,7 +19,7 @@ export class StackService extends BaseService { async create(auth: AuthDto, dto: StackCreateDto): Promise { await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds }); - const stack = await this.stackRepository.create({ ownerId: auth.user.id, assetIds: dto.assetIds }); + const stack = await this.stackRepository.create({ ownerId: auth.user.id }, dto.assetIds); await this.eventRepository.emit('stack.create', { stackId: stack.id, userId: auth.user.id }); diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts index bd3ce0da47..58cb294312 100644 --- a/server/src/services/sync.service.ts +++ b/server/src/services/sync.service.ts @@ -57,6 +57,7 @@ export const SYNC_TYPES_ORDER = [ SyncRequestType.UsersV1, SyncRequestType.PartnersV1, SyncRequestType.AssetsV1, + SyncRequestType.StacksV1, SyncRequestType.PartnerAssetsV1, SyncRequestType.AlbumAssetsV1, SyncRequestType.AlbumsV1, @@ -137,6 +138,7 @@ export class SyncService extends BaseService { [SyncRequestType.AlbumAssetExifsV1]: () => this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId), [SyncRequestType.MemoriesV1]: () => this.syncMemoriesV1(response, checkpointMap, auth), [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth), + [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth), }; for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) { @@ -510,6 +512,20 @@ export class SyncService extends BaseService { } } + private async syncStackV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) { + const deleteType = SyncEntityType.StackDeleteV1; + const deletes = this.syncRepository.stack.getDeletes(auth.user.id, checkpointMap[deleteType]); + for await (const { id, ...data } of deletes) { + send(response, { type: deleteType, ids: [id], data }); + } + + const upsertType = SyncEntityType.StackV1; + const upserts = this.syncRepository.stack.getUpserts(auth.user.id, checkpointMap[upsertType]); + for await (const { updateId, ...data } of upserts) { + send(response, { type: upsertType, ids: [updateId], data }); + } + } + private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) { const { type, sessionId, createId } = item; await this.syncCheckpointRepository.upsertAll([ diff --git a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts b/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts index 68ea286474..cb2fa36800 100644 --- a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts +++ b/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts @@ -3,4 +3,8 @@ import { DatabaseFunction } from 'src/sql-tools/types'; export type TriggerFunctionOptions = Omit & { function: DatabaseFunction }; export const TriggerFunction = (options: TriggerFunctionOptions) => - Trigger({ ...options, functionName: options.function.name }); + Trigger({ + name: options.function.name, + ...options, + functionName: options.function.name, + }); diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts index 6d1a75502b..44182602cd 100644 --- a/server/test/medium.factory.ts +++ b/server/test/medium.factory.ts @@ -25,6 +25,7 @@ import { PartnerRepository } from 'src/repositories/partner.repository'; import { PersonRepository } from 'src/repositories/person.repository'; import { SearchRepository } from 'src/repositories/search.repository'; import { SessionRepository } from 'src/repositories/session.repository'; +import { StackRepository } from 'src/repositories/stack.repository'; import { StorageRepository } from 'src/repositories/storage.repository'; import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository'; import { SyncRepository } from 'src/repositories/sync.repository'; @@ -40,6 +41,7 @@ import { FaceSearchTable } from 'src/schema/tables/face-search.table'; import { MemoryTable } from 'src/schema/tables/memory.table'; import { PersonTable } from 'src/schema/tables/person.table'; import { SessionTable } from 'src/schema/tables/session.table'; +import { StackTable } from 'src/schema/tables/stack.table'; import { UserTable } from 'src/schema/tables/user.table'; import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service'; import { SyncService } from 'src/services/sync.service'; @@ -133,6 +135,19 @@ export class MediumTestContext { return { partner, result }; } + async newStack(dto: Omit, 'primaryAssetId'>, assetIds: string[]) { + const date = factory.date(); + const stack = { + id: factory.uuid(), + createdAt: date, + updatedAt: date, + ...dto, + }; + + const result = await this.get(StackRepository).create(stack, assetIds); + return { stack: { ...stack, primaryAssetId: assetIds[0] }, result }; + } + async newAsset(dto: Partial> = {}) { const asset = mediumFactory.assetInsert(dto); const result = await this.get(AssetRepository).create(asset); @@ -252,6 +267,7 @@ const newRealRepository = (key: ClassConstructor, db: Kysely): T => { case PersonRepository: case SearchRepository: case SessionRepository: + case StackRepository: case SyncRepository: case SyncCheckpointRepository: case SystemMetadataRepository: diff --git a/server/test/medium/specs/services/audit.database.spec.ts b/server/test/medium/specs/services/audit.database.spec.ts index 377736408c..8ca68cdb4a 100644 --- a/server/test/medium/specs/services/audit.database.spec.ts +++ b/server/test/medium/specs/services/audit.database.spec.ts @@ -1,7 +1,7 @@ import { LoggingRepository } from 'src/repositories/logging.repository'; import { PartnerRepository } from 'src/repositories/partner.repository'; import { UserRepository } from 'src/repositories/user.repository'; -import { partners_delete_audit } from 'src/schema/functions'; +import { partners_delete_audit, stacks_delete_audit } from 'src/schema/functions'; import { BaseService } from 'src/services/base.service'; import { MediumTestContext } from 'test/medium.factory'; import { getKyselyDB } from 'test/utils'; @@ -31,6 +31,20 @@ describe('audit', () => { }); }); + describe(stacks_delete_audit.name, () => { + it('should not cascade user deletes to stacks_audit', async () => { + const userRepo = ctx.get(UserRepository); + const { user } = await ctx.newUser(); + const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id }); + const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id }); + await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]); + await userRepo.delete(user, true); + await expect( + ctx.database.selectFrom('stacks_audit').select(['id']).where('userId', '=', user.id).execute(), + ).resolves.toHaveLength(0); + }); + }); + describe('assets_audit', () => { it('should not cascade user deletes to assets_audit', async () => { const userRepo = ctx.get(UserRepository); diff --git a/server/test/medium/specs/sync/sync-stack.spec.ts b/server/test/medium/specs/sync/sync-stack.spec.ts new file mode 100644 index 0000000000..1696172911 --- /dev/null +++ b/server/test/medium/specs/sync/sync-stack.spec.ts @@ -0,0 +1,107 @@ +import { Kysely } from 'kysely'; +import { SyncEntityType, SyncRequestType } from 'src/enum'; +import { StackRepository } from 'src/repositories/stack.repository'; +import { DB } from 'src/schema'; +import { SyncTestContext } from 'test/medium.factory'; +import { getKyselyDB } from 'test/utils'; + +let defaultDatabase: Kysely; + +const setup = async (db?: Kysely) => { + const ctx = new SyncTestContext(db || defaultDatabase); + const { auth, user, session } = await ctx.newSyncAuthUser(); + return { auth, user, session, ctx }; +}; + +beforeAll(async () => { + defaultDatabase = await getKyselyDB(); +}); + +describe(SyncEntityType.StackV1, () => { + it('should detect and sync the first stack', async () => { + const { auth, user, ctx } = await setup(); + const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id }); + const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id }); + const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]); + + const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]); + expect(response).toHaveLength(1); + expect(response).toEqual([ + { + ack: expect.stringContaining('StackV1'), + data: { + id: stack.id, + createdAt: (stack.createdAt as Date).toISOString(), + updatedAt: (stack.updatedAt as Date).toISOString(), + primaryAssetId: stack.primaryAssetId, + ownerId: stack.ownerId, + }, + type: 'StackV1', + }, + ]); + + await ctx.syncAckAll(auth, response); + await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]); + }); + + it('should detect and sync a deleted stack', async () => { + const { auth, user, ctx } = await setup(); + const stackRepo = ctx.get(StackRepository); + const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id }); + const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id }); + const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]); + await stackRepo.delete(stack.id); + + const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]); + expect(response).toHaveLength(1); + expect(response).toEqual([ + { + ack: expect.stringContaining('StackDeleteV1'), + data: { stackId: stack.id }, + type: 'StackDeleteV1', + }, + ]); + + await ctx.syncAckAll(auth, response); + await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]); + }); + + it('should sync a stack and then an update to that same stack', async () => { + const { auth, user, ctx } = await setup(); + const stackRepo = ctx.get(StackRepository); + const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id }); + const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id }); + const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]); + + const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]); + expect(response).toHaveLength(1); + await ctx.syncAckAll(auth, response); + + await stackRepo.update(stack.id, { primaryAssetId: asset2.id }); + const newResponse = await ctx.syncStream(auth, [SyncRequestType.StacksV1]); + expect(newResponse).toHaveLength(1); + expect(newResponse).toEqual([ + { + ack: expect.stringContaining('StackV1'), + data: expect.objectContaining({ id: stack.id, primaryAssetId: asset2.id }), + type: 'StackV1', + }, + ]); + + await ctx.syncAckAll(auth, newResponse); + await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]); + }); + + it('should not sync a stack or stack delete for an unrelated user', async () => { + const { auth, ctx } = await setup(); + const stackRepo = ctx.get(StackRepository); + const { user: user2 } = await ctx.newUser(); + const { asset: asset1 } = await ctx.newAsset({ ownerId: user2.id }); + const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id }); + const { stack } = await ctx.newStack({ ownerId: user2.id }, [asset1.id, asset2.id]); + + await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]); + await stackRepo.delete(stack.id); + await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]); + }); +}); diff --git a/server/test/sql-tools/trigger-after-delete.stub.ts b/server/test/sql-tools/trigger-after-delete.stub.ts index 903fe2179e..1eb063c968 100644 --- a/server/test/sql-tools/trigger-after-delete.stub.ts +++ b/server/test/sql-tools/trigger-after-delete.stub.ts @@ -14,7 +14,7 @@ const test_fn = registerFunction({ }) export class Table1 {} -export const description = 'should create a trigger '; +export const description = 'should create a trigger'; export const schema: DatabaseSchema = { name: 'postgres', schemaName: 'public',