infra(server)!: fix typeorm asset entity relations (#1782)

* fix: add correct relations to asset typeorm entity

* fix: add missing createdAt column to asset entity

* ci: run check to make sure generated API is up-to-date

* ci: cancel workflows that aren't for the latest commit in a branch

* chore: add fvm config for flutter

server/libs/infra/src/db/entities/asset.entity.ts

@@ -1,9 +1,12 @@
 import {
   Column,
+  CreateDateColumn,
   Entity,
   Index,
+  JoinColumn,
   JoinTable,
   ManyToMany,
+  ManyToOne,
   OneToOne,
   PrimaryGeneratedColumn,
   Unique,
@@ -13,9 +16,10 @@ import { ExifEntity } from './exif.entity';
 import { SharedLinkEntity } from './shared-link.entity';
 import { SmartInfoEntity } from './smart-info.entity';
 import { TagEntity } from './tag.entity';
+import { UserEntity } from './user.entity';
 
 @Entity('assets')
-@Unique('UQ_userid_checksum', ['userId', 'checksum'])
+@Unique('UQ_userid_checksum', ['owner', 'checksum'])
 export class AssetEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -23,8 +27,11 @@ export class AssetEntity {
   @Column()
   deviceAssetId!: string;
 
+  @ManyToOne(() => UserEntity, { eager: true, onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
+  owner!: UserEntity;
+
   @Column()
-  userId!: string;
+  ownerId!: string;
 
   @Column()
   deviceId!: string;
@@ -44,15 +51,18 @@ export class AssetEntity {
   @Column({ type: 'varchar', nullable: true, default: '' })
   encodedVideoPath!: string | null;
 
-  @Column({ type: 'timestamptz' })
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt!: string;
 
-  @Column({ type: 'timestamptz' })
-  modifiedAt!: string;
-
   @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt!: string;
 
+  @Column({ type: 'timestamptz' })
+  fileCreatedAt!: string;
+
+  @Column({ type: 'timestamptz' })
+  fileModifiedAt!: string;
+
   @Column({ type: 'boolean', default: false })
   isFavorite!: boolean;
 
@@ -69,7 +79,11 @@ export class AssetEntity {
   @Column({ type: 'boolean', default: true })
   isVisible!: boolean;
 
-  @Column({ type: 'uuid', nullable: true })
+  @OneToOne(() => AssetEntity, { nullable: true, onUpdate: 'CASCADE', onDelete: 'SET NULL' })
+  @JoinColumn()
+  livePhotoVideo!: AssetEntity | null;
+
+  @Column({ nullable: true })
   livePhotoVideoId!: string | null;
 
   @OneToOne(() => ExifEntity, (exifEntity) => exifEntity.asset)
@@ -78,12 +92,11 @@ export class AssetEntity {
   @OneToOne(() => SmartInfoEntity, (smartInfoEntity) => smartInfoEntity.asset)
   smartInfo?: SmartInfoEntity;
 
-  // https://github.com/typeorm/typeorm/blob/master/docs/many-to-many-relations.md
-  @ManyToMany(() => TagEntity, (tag) => tag.assets, { cascade: true })
+  @ManyToMany(() => TagEntity, (tag) => tag.assets, { cascade: true, eager: true })
   @JoinTable({ name: 'tag_asset' })
   tags!: TagEntity[];
 
-  @ManyToMany(() => SharedLinkEntity, (link) => link.assets, { cascade: true })
+  @ManyToMany(() => SharedLinkEntity, (link) => link.assets, { cascade: true, eager: true })
   @JoinTable({ name: 'shared_link__asset' })
   sharedLinks!: SharedLinkEntity[];
 }

server/libs/infra/src/db/migrations/1676680127415-FixAssetRelations.ts

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class FixAssetRelations1676680127415 implements MigrationInterface {
+    name = 'FixAssetRelations1676680127415'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "modifiedAt" TO "fileModifiedAt"`);
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "createdAt" TO "fileCreatedAt"`);
+
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "userId" TO "ownerId"`);
+        await queryRunner.query(`ALTER TABLE assets ALTER COLUMN "ownerId" TYPE uuid USING "ownerId"::uuid;`);
+
+        await queryRunner.query(`ALTER TABLE "assets" ADD CONSTRAINT "UQ_16294b83fa8c0149719a1f631ef" UNIQUE ("livePhotoVideoId")`);
+        await queryRunner.query(`ALTER TABLE "assets" ADD CONSTRAINT "FK_2c5ac0d6fb58b238fd2068de67d" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "assets" ADD CONSTRAINT "FK_16294b83fa8c0149719a1f631ef" FOREIGN KEY ("livePhotoVideoId") REFERENCES "assets"("id") ON DELETE SET NULL ON UPDATE CASCADE`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "assets" DROP CONSTRAINT "FK_16294b83fa8c0149719a1f631ef"`);
+        await queryRunner.query(`ALTER TABLE "assets" DROP CONSTRAINT "FK_2c5ac0d6fb58b238fd2068de67d"`);
+        await queryRunner.query(`ALTER TABLE "assets" DROP CONSTRAINT "UQ_16294b83fa8c0149719a1f631ef"`);
+
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "fileCreatedAt" TO "createdAt"`);
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "fileModifiedAt" TO "modifiedAt"`);
+
+        await queryRunner.query(`ALTER TABLE "assets" RENAME COLUMN "ownerId" TO "userId"`);
+        await queryRunner.query(`ALTER TABLE assets ALTER COLUMN "userId" TYPE varchar`);
+    }
+
+}

server/libs/infra/src/db/migrations/1676721296440-AssetCreatedAtField.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AssetCreatedAtField1676721296440 implements MigrationInterface {
+    name = 'AssetCreatedAtField1676721296440'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "assets" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "assets" DROP COLUMN "createdAt"`);
+    }
+
+}

server/libs/infra/src/db/repository/shared-link.repository.ts

@@ -31,11 +31,11 @@ export class SharedLinkRepository implements ISharedLinkRepository {
       order: {
         createdAt: 'DESC',
         assets: {
-          createdAt: 'ASC',
+          fileCreatedAt: 'ASC',
         },
         album: {
           assets: {
-            createdAt: 'ASC',
+            fileCreatedAt: 'ASC',
           },
         },
       },