feat(server): add updatedAt to Asset, Album and User (#1566)

* feat: add updatedAt info to DTO and generate api

* chore: remove unsued file

* chore: Add update statement to add/remove asset/user to album

* fix: test

server/apps/immich/src/api-v1/album/album-repository.ts

@@ -213,18 +213,27 @@ export class AlbumRepository implements IAlbumRepository {
   }
 
   async get(albumId: string): Promise<AlbumEntity | undefined> {
-    const query = this.albumRepository.createQueryBuilder('album');
+    const album = await this.albumRepository.findOne({
-
+      where: { id: albumId },
-    const album = await query
+      relations: {
-      .where('album.id = :albumId', { albumId })
+        sharedUsers: {
-      .leftJoinAndSelect('album.sharedUsers', 'sharedUser')
+          userInfo: true,
-      .leftJoinAndSelect('sharedUser.userInfo', 'userInfo')
+        },
-      .leftJoinAndSelect('album.assets', 'assets')
+        assets: {
-      .leftJoinAndSelect('assets.assetInfo', 'assetInfo')
+          assetInfo: {
-      .leftJoinAndSelect('assetInfo.exifInfo', 'exifInfo')
+            exifInfo: true,
-      .leftJoinAndSelect('album.sharedLinks', 'sharedLinks')
+          },
-      .orderBy('"assetInfo"."createdAt"::timestamptz', 'ASC')
+        },
-      .getOne();
+        sharedLinks: true,
+      },
+      order: {
+        assets: {
+          assetInfo: {
+            createdAt: 'ASC',
+          },
+        },
+      },
+    });
 
     if (!album) {
       return;
@@ -249,11 +258,14 @@ export class AlbumRepository implements IAlbumRepository {
     }
 
     await this.userAlbumRepository.save([...newRecords]);
+    await this.albumRepository.update({ id: album.id }, { updatedAt: new Date().toISOString() });
+
     return this.get(album.id) as Promise<AlbumEntity>; // There is an album for sure
   }
 
   async removeUser(album: AlbumEntity, userId: string): Promise<void> {
     await this.userAlbumRepository.delete({ albumId: album.id, sharedUserId: userId });
+    await this.albumRepository.update({ id: album.id }, { updatedAt: new Date().toISOString() });
   }
 
   async removeAssets(album: AlbumEntity, removeAssetsDto: RemoveAssetsDto): Promise<number> {
@@ -262,6 +274,8 @@ export class AlbumRepository implements IAlbumRepository {
       assetId: In(removeAssetsDto.assetIds),
     });
 
+    await this.albumRepository.update({ id: album.id }, { updatedAt: new Date().toISOString() });
+
     return res.affected || 0;
   }
 
@@ -290,6 +304,8 @@ export class AlbumRepository implements IAlbumRepository {
 
     await this.assetAlbumRepository.save([...newRecords]);
 
+    await this.albumRepository.update({ id: album.id }, { updatedAt: new Date().toISOString() });
+
     return {
       successfullyAdded: newRecords.length,
       alreadyInAlbum: alreadyExisting,

server/apps/immich/src/api-v1/album/album.service.spec.ts

@@ -32,6 +32,7 @@ describe('Album service', () => {
     albumEntity.id = albumId;
     albumEntity.albumName = 'name';
     albumEntity.createdAt = 'date';
+    albumEntity.updatedAt = 'date';
     albumEntity.sharedUsers = [];
     albumEntity.assets = [];
     albumEntity.albumThumbnailAssetId = null;
@@ -183,6 +184,7 @@ describe('Album service', () => {
       albumName: 'name',
       albumThumbnailAssetId: null,
       createdAt: 'date',
+      updatedAt: 'date',
       id: 'f19ab956-4761-41ea-a5d6-bae948308d58',
       ownerId,
       shared: false,

server/apps/immich/src/api-v1/asset/asset.core.ts

@@ -27,6 +27,7 @@ export class AssetCore {
 
       createdAt: timeUtils.checkValidTimestamp(dto.createdAt) ? dto.createdAt : new Date().toISOString(),
       modifiedAt: timeUtils.checkValidTimestamp(dto.modifiedAt) ? dto.modifiedAt : new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
 
       deviceAssetId: dto.deviceAssetId,
       deviceId: dto.deviceId,

server/apps/immich/src/api-v1/tag/tag.service.spec.ts

@@ -23,6 +23,7 @@ describe('TagService', () => {
     shouldChangePassword: true,
     createdAt: '2022-12-02T19:29:23.603Z',
     deletedAt: undefined,
+    updatedAt: '2022-12-02T19:29:23.603Z',
     tags: [],
     oauthId: 'oauth-id-1',
   });

server/immich-openapi-specs.json

@@ -3291,6 +3291,9 @@
           "modifiedAt": {
             "type": "string"
           },
+          "updatedAt": {
+            "type": "string"
+          },
           "isFavorite": {
             "type": "boolean"
           },
@@ -3336,6 +3339,7 @@
           "resizePath",
           "createdAt",
           "modifiedAt",
+          "updatedAt",
           "isFavorite",
           "mimeType",
           "duration",
@@ -3361,6 +3365,9 @@
           "createdAt": {
             "type": "string"
           },
+          "updatedAt": {
+            "type": "string"
+          },
           "albumThumbnailAssetId": {
             "type": "string",
             "nullable": true
@@ -3387,6 +3394,7 @@
           "ownerId",
           "albumName",
           "createdAt",
+          "updatedAt",
           "albumThumbnailAssetId",
           "shared",
           "sharedUsers",

server/libs/domain/src/album/response-dto/album-response.dto.ts

@@ -8,6 +8,7 @@ export class AlbumResponseDto {
   ownerId!: string;
   albumName!: string;
   createdAt!: string;
+  updatedAt!: string;
   albumThumbnailAssetId!: string | null;
   shared!: boolean;
   sharedUsers!: UserResponseDto[];
@@ -30,6 +31,7 @@ export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
     albumName: entity.albumName,
     albumThumbnailAssetId: entity.albumThumbnailAssetId,
     createdAt: entity.createdAt,
+    updatedAt: entity.updatedAt,
     id: entity.id,
     ownerId: entity.ownerId,
     sharedUsers,
@@ -52,6 +54,7 @@ export function mapAlbumExcludeAssetInfo(entity: AlbumEntity): AlbumResponseDto
     albumName: entity.albumName,
     albumThumbnailAssetId: entity.albumThumbnailAssetId,
     createdAt: entity.createdAt,
+    updatedAt: entity.updatedAt,
     id: entity.id,
     ownerId: entity.ownerId,
     sharedUsers,

server/libs/domain/src/asset/response-dto/asset-response.dto.ts

@@ -16,6 +16,7 @@ export class AssetResponseDto {
   resizePath!: string | null;
   createdAt!: string;
   modifiedAt!: string;
+  updatedAt!: string;
   isFavorite!: boolean;
   mimeType!: string | null;
   duration!: string;
@@ -38,6 +39,7 @@ export function mapAsset(entity: AssetEntity): AssetResponseDto {
     resizePath: entity.resizePath,
     createdAt: entity.createdAt,
     modifiedAt: entity.modifiedAt,
+    updatedAt: entity.updatedAt,
     isFavorite: entity.isFavorite,
     mimeType: entity.mimeType,
     webpPath: entity.webpPath,
@@ -61,6 +63,7 @@ export function mapAssetWithoutExif(entity: AssetEntity): AssetResponseDto {
     resizePath: entity.resizePath,
     createdAt: entity.createdAt,
     modifiedAt: entity.modifiedAt,
+    updatedAt: entity.updatedAt,
     isFavorite: entity.isFavorite,
     mimeType: entity.mimeType,
     webpPath: entity.webpPath,

server/libs/domain/src/user/user.service.spec.ts

@@ -31,6 +31,7 @@ const adminUser: UserEntity = Object.freeze({
   shouldChangePassword: false,
   profileImagePath: '',
   createdAt: '2021-01-01',
+  updatedAt: '2021-01-01',
   tags: [],
 });
 
@@ -45,6 +46,7 @@ const immichUser: UserEntity = Object.freeze({
   shouldChangePassword: false,
   profileImagePath: '',
   createdAt: '2021-01-01',
+  updatedAt: '2021-01-01',
   tags: [],
 });
 
@@ -59,6 +61,7 @@ const updatedImmichUser: UserEntity = Object.freeze({
   shouldChangePassword: true,
   profileImagePath: '',
   createdAt: '2021-01-01',
+  updatedAt: '2021-01-01',
   tags: [],
 });
 

server/libs/domain/test/fixtures.ts

@@ -48,6 +48,7 @@ const assetResponse: AssetResponseDto = {
   resizePath: '',
   createdAt: today.toISOString(),
   modifiedAt: today.toISOString(),
+  updatedAt: today.toISOString(),
   isFavorite: false,
   mimeType: 'image/jpeg',
   smartInfo: {
@@ -67,6 +68,7 @@ const albumResponse: AlbumResponseDto = {
   albumName: 'Test Album',
   albumThumbnailAssetId: null,
   createdAt: today.toISOString(),
+  updatedAt: today.toISOString(),
   id: 'album-123',
   ownerId: 'admin_id',
   sharedUsers: [],
@@ -126,6 +128,7 @@ export const userEntityStub = {
     shouldChangePassword: false,
     profileImagePath: '',
     createdAt: '2021-01-01',
+    updatedAt: '2021-01-01',
     tags: [],
   }),
   user1: Object.freeze<UserEntity>({
@@ -137,6 +140,7 @@ export const userEntityStub = {
     shouldChangePassword: false,
     profileImagePath: '',
     createdAt: '2021-01-01',
+    updatedAt: '2021-01-01',
     tags: [],
   }),
 };
@@ -329,6 +333,7 @@ export const sharedLinkStub = {
       ownerId: authStub.admin.id,
       albumName: 'Test Album',
       createdAt: today.toISOString(),
+      updatedAt: today.toISOString(),
       albumThumbnailAssetId: null,
       sharedUsers: [],
       sharedLinks: [],
@@ -348,6 +353,7 @@ export const sharedLinkStub = {
             resizePath: '',
             createdAt: today.toISOString(),
             modifiedAt: today.toISOString(),
+            updatedAt: today.toISOString(),
             isFavorite: false,
             mimeType: 'image/jpeg',
             smartInfo: {

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

@@ -1,4 +1,4 @@
-import { Column, CreateDateColumn, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, CreateDateColumn, Entity, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
 import { AssetAlbumEntity } from './asset-album.entity';
 import { SharedLinkEntity } from './shared-link.entity';
 import { UserAlbumEntity } from './user-album.entity';
@@ -17,6 +17,9 @@ export class AlbumEntity {
   @CreateDateColumn({ type: 'timestamptz' })
   createdAt!: string;
 
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt!: string;
+
   @Column({ comment: 'Asset ID to be used as thumbnail', type: 'varchar', nullable: true })
   albumThumbnailAssetId!: string | null;
 

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

@@ -1,4 +1,14 @@
-import { Column, Entity, Index, JoinTable, ManyToMany, OneToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import {
+  Column,
+  Entity,
+  Index,
+  JoinTable,
+  ManyToMany,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  Unique,
+  UpdateDateColumn,
+} from 'typeorm';
 import { ExifEntity } from './exif.entity';
 import { SharedLinkEntity } from './shared-link.entity';
 import { SmartInfoEntity } from './smart-info.entity';
@@ -40,6 +50,9 @@ export class AssetEntity {
   @Column({ type: 'timestamptz' })
   modifiedAt!: string;
 
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt!: string;
+
   @Column({ type: 'boolean', default: false })
   isFavorite!: boolean;
 

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

@@ -1,4 +1,12 @@
-import { Column, CreateDateColumn, DeleteDateColumn, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+import {
+  Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
 import { TagEntity } from './tag.entity';
 
 @Entity('users')
@@ -36,6 +44,9 @@ export class UserEntity {
   @DeleteDateColumn()
   deletedAt?: Date;
 
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt!: string;
+
   @OneToMany(() => TagEntity, (tag) => tag.user)
   tags!: TagEntity[];
 }

server/libs/infra/src/db/migrations/1675667878312-AddUpdatedAtColumnToAlbumsUsersAssets.ts

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

web/src/api/open-api/api.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.43.1
+ * The version of the OpenAPI document: 1.45.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -246,6 +246,12 @@ export interface AlbumResponseDto {
      * @memberof AlbumResponseDto
      */
     'createdAt': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof AlbumResponseDto
+     */
+    'updatedAt': string;
     /**
      * 
      * @type {string}
@@ -462,6 +468,12 @@ export interface AssetResponseDto {
      * @memberof AssetResponseDto
      */
     'modifiedAt': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof AssetResponseDto
+     */
+    'updatedAt': string;
     /**
      * 
      * @type {boolean}

web/src/api/open-api/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.43.1
+ * The version of the OpenAPI document: 1.45.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

web/src/api/open-api/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.43.1
+ * The version of the OpenAPI document: 1.45.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

web/src/api/open-api/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.43.1
+ * The version of the OpenAPI document: 1.45.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

web/src/api/open-api/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.43.1
+ * The version of the OpenAPI document: 1.45.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).