Merge branch 'main' into feat/mobile-ocr

server/test/medium/responses.ts

@@ -67,48 +67,3 @@ export const errorDto = {
     correlationId: expect.any(String),
   },
 };
-
-export const signupResponseDto = {
-  admin: {
-    avatarColor: expect.any(String),
-    id: expect.any(String),
-    name: 'Immich Admin',
-    email: 'admin@immich.cloud',
-    storageLabel: 'admin',
-    profileImagePath: '',
-    // why? lol
-    shouldChangePassword: true,
-    isAdmin: true,
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    deletedAt: null,
-    oauthId: '',
-    quotaUsageInBytes: 0,
-    quotaSizeInBytes: null,
-    status: 'active',
-    license: null,
-    profileChangedAt: expect.any(String),
-  },
-};
-
-export const loginResponseDto = {
-  admin: {
-    accessToken: expect.any(String),
-    name: 'Immich Admin',
-    isAdmin: true,
-    profileImagePath: '',
-    shouldChangePassword: true,
-    userEmail: 'admin@immich.cloud',
-    userId: expect.any(String),
-  },
-};
-export const deviceDto = {
-  current: {
-    id: expect.any(String),
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    current: true,
-    deviceOS: '',
-    deviceType: '',
-  },
-};

server/test/medium/specs/services/asset-media.service.spec.ts

@@ -52,8 +52,6 @@ describe(AssetService.name, () => {
         sut.uploadAsset(
           auth,
           {
-            deviceId: 'some-id',
-            deviceAssetId: 'some-id',
             fileModifiedAt: new Date(),
             fileCreatedAt: new Date(),
             assetData: Buffer.from('some data'),
@@ -66,7 +64,7 @@ describe(AssetService.name, () => {
       });
 
       expect(ctx.getMock(EventRepository).emit).toHaveBeenCalledWith('AssetCreate', {
-        asset: expect.objectContaining({ deviceAssetId: 'some-id' }),
+        asset: expect.objectContaining({}),
       });
     });
 
@@ -87,8 +85,6 @@ describe(AssetService.name, () => {
         sut.uploadAsset(
           auth,
           {
-            deviceId: 'some-id',
-            deviceAssetId: 'some-id',
             fileModifiedAt: new Date(),
             fileCreatedAt: new Date(),
             assetData: Buffer.from('some data'),
@@ -125,8 +121,6 @@ describe(AssetService.name, () => {
       const auth = factory.auth({ user: { id: user.id }, sharedLink });
       const file = mediumFactory.uploadFile();
       const uploadDto = {
-        deviceId: 'some-id',
-        deviceAssetId: 'some-id',
         fileModifiedAt: new Date(),
         fileCreatedAt: new Date(),
         assetData: Buffer.from('some data'),
@@ -166,8 +160,6 @@ describe(AssetService.name, () => {
 
       const auth = factory.auth({ user: { id: user.id }, sharedLink });
       const uploadDto = {
-        deviceId: 'some-id',
-        deviceAssetId: 'some-id',
         fileModifiedAt: new Date(),
         fileCreatedAt: new Date(),
         assetData: Buffer.from('some data'),
@@ -206,8 +198,6 @@ describe(AssetService.name, () => {
 
       const auth = factory.auth({ user: { id: user.id }, sharedLink });
       const uploadDto = {
-        deviceId: 'some-id',
-        deviceAssetId: 'some-id',
         fileModifiedAt: new Date(),
         fileCreatedAt: new Date(),
         assetData: Buffer.from('some data'),
@@ -248,8 +238,6 @@ describe(AssetService.name, () => {
 
       const auth = factory.auth({ user: { id: user.id }, sharedLink });
       const uploadDto = {
-        deviceId: 'some-id',
-        deviceAssetId: 'some-id',
         fileModifiedAt: new Date(),
         fileCreatedAt: new Date(),
         assetData: Buffer.from('some data'),

server/test/medium/specs/sync/sync-album-user.spec.ts

@@ -25,6 +25,14 @@ describe(SyncRequestType.AlbumUsersV1, () => {
     const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.Editor });
 
     await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          albumId: album.id,
+          role: AlbumUserRole.Owner,
+        }),
+        type: SyncEntityType.AlbumUserV1,
+      },
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -47,6 +55,14 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toEqual([
+        {
+          ack: expect.any(String),
+          data: expect.objectContaining({
+            albumId: album.id,
+            role: AlbumUserRole.Owner,
+          }),
+          type: SyncEntityType.AlbumUserV1,
+        },
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -136,6 +152,14 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toEqual([
+        {
+          ack: expect.any(String),
+          data: expect.objectContaining({
+            albumId: album.id,
+            role: AlbumUserRole.Owner,
+          }),
+          type: SyncEntityType.AlbumUserV1,
+        },
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -163,6 +187,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toEqual([
+        expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
@@ -201,6 +226,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toEqual([
+        expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.AlbumUserV1 }),
         expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
@@ -229,10 +255,11 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
     it('should backfill album users when a user shares an album with you', async () => {
       const { auth, ctx } = await setup();
+      const { user } = await ctx.newUser();
       const { user: user1 } = await ctx.newUser();
       const { user: user2 } = await ctx.newUser();
-      const { album: album1 } = await ctx.newAlbum({ ownerId: user1.id });
-      const { album: album2 } = await ctx.newAlbum({ ownerId: user1.id });
+      const { album: album1 } = await ctx.newAlbum({ ownerId: user.id });
+      const { album: album2 } = await ctx.newAlbum({ ownerId: user.id });
       // backfill album user
       await ctx.newAlbumUser({ albumId: album1.id, userId: user1.id, role: AlbumUserRole.Editor });
       await wait(2);
@@ -244,6 +271,15 @@ describe(SyncRequestType.AlbumUsersV1, () => {
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toEqual([
+        {
+          ack: expect.any(String),
+          data: expect.objectContaining({
+            albumId: album2.id,
+            role: AlbumUserRole.Owner,
+            userId: user.id,
+          }),
+          type: SyncEntityType.AlbumUserV1,
+        },
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -264,6 +300,15 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       // should backfill the album user
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
+        {
+          ack: expect.any(String),
+          data: expect.objectContaining({
+            albumId: album1.id,
+            role: AlbumUserRole.Owner,
+            userId: user.id,
+          }),
+          type: SyncEntityType.AlbumUserBackfillV1,
+        },
         {
           ack: expect.any(String),
           data: expect.objectContaining({

server/test/medium/specs/sync/sync-album.spec.ts

@@ -30,7 +30,6 @@ describe(SyncRequestType.AlbumsV1, () => {
         data: expect.objectContaining({
           id: album.id,
           name: album.albumName,
-          ownerId: album.ownerId,
         }),
         type: SyncEntityType.AlbumV1,
       },