fix: medium tests (wip)

Author: bwees

open-api/immich-openapi-specs.json

@@ -22584,12 +22584,12 @@
       },
       "SyncAssetEditDeleteV1": {
         "properties": {
-          "assetId": {
+          "editId": {
             "type": "string"
           }
         },
         "required": [
-          "assetId"
+          "editId"
         ],
         "type": "object"
       },

server/src/repositories/sync.repository.ts

@@ -520,7 +520,7 @@ class AssetEditSync extends BaseSync {
   @GenerateSql({ params: [dummyQueryOptions], stream: true })
   getUpserts(options: SyncQueryOptions) {
     return this.upsertQuery('asset_edit', options)
-      .select(columns.syncAssetEdit)
+      .select([...columns.syncAssetEdit, 'asset_edit.updateId'])
       .innerJoin('asset', 'asset.id', 'asset_edit.assetId')
       .where('asset.ownerId', '=', options.userId)
       .stream();

…igrations/1771479910447-AssetEditSync.ts …igrations/1771873813973-AssetEditSync.tsserver/src/schema/migrations/1771479910447-AssetEditSync.ts renamed to server/src/schema/migrations/1771873813973-AssetEditSync.ts server/src/schema/migrations/1771479910447-AssetEditSync.ts renamed to server/src/schema/migrations/1771873813973-AssetEditSync.ts

@@ -21,6 +21,7 @@ export async function up(db: Kysely<any>): Promise<void> {
 );`.execute(db);
   await sql`CREATE INDEX "asset_edit_audit_assetId_idx" ON "asset_edit_audit" ("assetId");`.execute(db);
   await sql`CREATE INDEX "asset_edit_audit_deletedAt_idx" ON "asset_edit_audit" ("deletedAt");`.execute(db);
+  await sql`ALTER TABLE "asset_edit" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
   await sql`ALTER TABLE "asset_edit" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
   await sql`CREATE INDEX "asset_edit_updateId_idx" ON "asset_edit" ("updateId");`.execute(db);
   await sql`CREATE OR REPLACE TRIGGER "asset_edit_audit"
@@ -29,16 +30,24 @@ export async function up(db: Kysely<any>): Promise<void> {
   FOR EACH STATEMENT
   WHEN (pg_trigger_depth() = 0)
   EXECUTE FUNCTION asset_edit_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_edit_updatedAt"
+  BEFORE UPDATE ON "asset_edit"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
   await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_asset_edit_audit', '{"type":"function","name":"asset_edit_audit","sql":"CREATE OR REPLACE FUNCTION asset_edit_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO asset_edit_audit (\\"editId\\", \\"assetId\\")\\n      SELECT \\"id\\", \\"assetId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
   await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_edit_audit', '{"type":"trigger","name":"asset_edit_audit","sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_audit\\"\\n  AFTER DELETE ON \\"asset_edit\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_edit_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_edit_updatedAt', '{"type":"trigger","name":"asset_edit_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_updatedAt\\"\\n  BEFORE UPDATE ON \\"asset_edit\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
 }
 
 export async function down(db: Kysely<any>): Promise<void> {
   await sql`DROP TRIGGER "asset_edit_audit" ON "asset_edit";`.execute(db);
+  await sql`DROP TRIGGER "asset_edit_updatedAt" ON "asset_edit";`.execute(db);
   await sql`DROP INDEX "asset_edit_updateId_idx";`.execute(db);
+  await sql`ALTER TABLE "asset_edit" DROP COLUMN "updatedAt";`.execute(db);
   await sql`ALTER TABLE "asset_edit" DROP COLUMN "updateId";`.execute(db);
   await sql`DROP TABLE "asset_edit_audit";`.execute(db);
   await sql`DROP FUNCTION asset_edit_audit;`.execute(db);
   await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_asset_edit_audit';`.execute(db);
   await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_edit_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_edit_updatedAt';`.execute(db);
 }

server/src/schema/tables/asset-edit.table.ts

@@ -6,14 +6,17 @@ import {
   Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   Unique,
+  UpdateDateColumn,
 } from '@immich/sql-tools';
-import { UpdateIdColumn } from 'src/decorators';
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetEditAction, AssetEditParameters } from 'src/dtos/editing.dto';
 import { asset_edit_audit, asset_edit_delete, asset_edit_insert } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 
 @Table('asset_edit')
+@UpdatedAtTrigger('asset_edit_updatedAt')
 @AfterInsertTrigger({ scope: 'statement', function: asset_edit_insert, referencingNewTableAs: 'inserted_edit' })
 @AfterDeleteTrigger({
   scope: 'statement',
@@ -44,6 +47,9 @@ export class AssetEditTable {
   @Column({ type: 'integer' })
   sequence!: number;
 
+  @UpdateDateColumn()
+  updatedAt!: Generated<Timestamp>;
+
   @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }

server/test/medium/specs/sync/sync-asset-edit.spec.ts

@@ -133,24 +133,19 @@ describe(SyncRequestType.AssetEditsV1, () => {
     await ctx.syncAckAll(auth, response1);
     await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
 
-    // Update the edit
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
+    // update the existing edit
+    await ctx.database
+      .updateTable('asset_edit')
+      .set({
         parameters: { x: 50, y: 60, width: 150, height: 250 },
-      },
-    ]);
+      })
+      .where('assetId', '=', asset.id)
+      .where('action', '=', AssetEditAction.Crop)
+      .execute();
 
     const response2 = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
     expect(response2).toEqual(
       expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AssetEditDeleteV1,
-        },
         {
           ack: expect.any(String),
           data: {
@@ -196,7 +191,7 @@ describe(SyncRequestType.AssetEditsV1, () => {
         {
           ack: expect.any(String),
           data: {
-            assetId: asset.id,
+            editId: asset.id,
           },
           type: SyncEntityType.AssetEditDeleteV1,
         },