feat(web): "added assets to album" activity

e2e/src/api/specs/activity.e2e-spec.ts

@@ -5,6 +5,7 @@ import {
   AssetMediaResponseDto,
   LoginResponseDto,
   ReactionType,
+  addAssetsToAlbum,
   createActivity as create,
   createAlbum,
   removeAssetFromAlbum,
@@ -158,6 +159,59 @@ describe('/activities', () => {
       expect(body.length).toBe(1);
       expect(body[0]).toEqual(reaction);
     });
+
+    it('asset activity: add 2 assets to album, get activity with both asset ids', async () => {
+      const asset1 = await utils.createAsset(admin.accessToken);
+      const asset2 = await utils.createAsset(admin.accessToken);
+
+      await addAssetsToAlbum(
+        {
+          id: album.id,
+          bulkIdsDto: { ids: [asset1.id, asset2.id] },
+        },
+        { headers: asBearerAuth(admin.accessToken) },
+      );
+
+      const { status, body } = await request(app)
+        .get('/activities')
+        .query({ albumId: album.id })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body.length).toBe(1);
+      expect(body[0].type).toBe('asset');
+      expect(body[0].assetIds).toEqual(expect.arrayContaining([asset1.id, asset2.id]));
+    });
+
+    it('asset activity: add 2 assets and remove 1 asset, get activity with remaining asset id', async () => {
+      const asset1 = await utils.createAsset(admin.accessToken);
+      const asset2 = await utils.createAsset(admin.accessToken);
+
+      await addAssetsToAlbum(
+        {
+          id: album.id,
+          bulkIdsDto: { ids: [asset1.id, asset2.id] },
+        },
+        { headers: asBearerAuth(admin.accessToken) },
+      );
+      await removeAssetFromAlbum(
+        {
+          id: album.id,
+          bulkIdsDto: {
+            ids: [asset1.id],
+          },
+        },
+        { headers: asBearerAuth(admin.accessToken) },
+      );
+
+      const { status, body } = await request(app)
+        .get('/activities')
+        .query({ albumId: album.id })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body.length).toBe(1);
+      expect(body[0].type).toBe('asset');
+      expect(body[0].assetIds).toEqual(expect.arrayContaining([asset2.id]));
+    });
   });
 
   describe('POST /activities', () => {
@@ -174,6 +228,7 @@ describe('/activities', () => {
       expect(body).toEqual({
         id: expect.any(String),
         assetId: null,
+        assetIds: null,
         createdAt: expect.any(String),
         type: 'comment',
         comment: 'This is my first comment',
@@ -190,6 +245,7 @@ describe('/activities', () => {
       expect(body).toEqual({
         id: expect.any(String),
         assetId: null,
+        assetIds: null,
         createdAt: expect.any(String),
         type: 'like',
         comment: null,
@@ -235,6 +291,7 @@ describe('/activities', () => {
       expect(body).toEqual({
         id: expect.any(String),
         assetId: asset.id,
+        assetIds: null,
         createdAt: expect.any(String),
         type: 'comment',
         comment: 'This is my first comment',
@@ -251,6 +308,7 @@ describe('/activities', () => {
       expect(body).toEqual({
         id: expect.any(String),
         assetId: asset.id,
+        assetIds: null,
         createdAt: expect.any(String),
         type: 'like',
         comment: null,

open-api/immich-openapi-specs.json

@@ -9977,6 +9977,12 @@
             "format": "uuid",
             "type": "string"
           },
+          "assetIds": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
           "comment": {
             "type": "string"
           },
@@ -10000,6 +10006,13 @@
             "nullable": true,
             "type": "string"
           },
+          "assetIds": {
+            "items": {
+              "type": "string"
+            },
+            "nullable": true,
+            "type": "array"
+          },
           "comment": {
             "nullable": true,
             "type": "string"
@@ -10024,6 +10037,7 @@
         },
         "required": [
           "assetId",
+          "assetIds",
           "createdAt",
           "id",
           "type",
@@ -13687,7 +13701,8 @@
       "ReactionType": {
         "enum": [
           "comment",
-          "like"
+          "like",
+          "asset"
         ],
         "type": "string"
       },

open-api/typescript-sdk/src/fetch-client.ts

@@ -24,6 +24,7 @@ export type UserResponseDto = {
 };
 export type ActivityResponseDto = {
     assetId: string | null;
+    assetIds: string[] | null;
     comment?: string | null;
     createdAt: string;
     id: string;
@@ -33,6 +34,7 @@ export type ActivityResponseDto = {
 export type ActivityCreateDto = {
     albumId: string;
     assetId?: string;
+    assetIds?: string[];
     comment?: string;
     "type": ReactionType;
 };
@@ -4626,7 +4628,8 @@ export enum ReactionLevel {
 }
 export enum ReactionType {
     Comment = "comment",
-    Like = "like"
+    Like = "like",
+    Asset = "asset"
 }
 export enum UserAvatarColor {
     Primary = "primary",

server/src/database.ts

@@ -63,6 +63,7 @@ export type Activity = {
   userId: string;
   user: User;
   assetId: string | null;
+  assetIds: string[] | null;
   comment: string | null;
   isLiked: boolean;
   updateId: string;

server/src/dtos/activity.dto.ts

@@ -7,6 +7,7 @@ import { ValidateEnum, ValidateUUID } from 'src/validation';
 export enum ReactionType {
   COMMENT = 'comment',
   LIKE = 'like',
+  ASSET = 'asset',
 }
 
 export enum ReactionLevel {
@@ -23,6 +24,7 @@ export class ActivityResponseDto {
   type!: ReactionType;
   user!: UserResponseDto;
   assetId!: string | null;
+  assetIds!: string[] | null;
   comment?: string | null;
 }
 
@@ -63,15 +65,18 @@ export class ActivityCreateDto extends ActivityDto {
   @IsNotEmpty()
   @IsString()
   comment?: string;
+
+  assetIds?: string[] | undefined;
 }
 
 export const mapActivity = (activity: Activity): ActivityResponseDto => {
   return {
     id: activity.id,
     assetId: activity.assetId,
+    assetIds: activity.assetIds,
     createdAt: activity.createdAt,
     comment: activity.comment,
-    type: activity.isLiked ? ReactionType.LIKE : ReactionType.COMMENT,
+    type: activity.assetIds ? ReactionType.ASSET : activity.isLiked ? ReactionType.LIKE : ReactionType.COMMENT,
     user: mapUser(activity.user),
   };
 };

server/src/queries/activity.repository.sql

@@ -65,6 +65,7 @@ select
   count(*) filter (
     where
       "activity"."isLiked" = $1
+      and "activity"."assetIds" is null
   ) as "comments",
   count(*) filter (
     where