chore(server): make owner as required response for AlbumResponseDto (#1579)

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

@@ -49,6 +49,7 @@ export class AlbumRepository implements IAlbumRepository {
       relations: {
         sharedLinks: true,
         assets: true,
+        owner: true,
       },
       where: {
         ownerId,

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

@@ -1,8 +1,8 @@
 import { AlbumService } from './album.service';
 import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { BadRequestException, NotFoundException, ForbiddenException } from '@nestjs/common';
-import { AlbumEntity } from '@app/infra';
+import { AlbumEntity, UserEntity } from '@app/infra';
-import { AlbumResponseDto, ICryptoRepository } from '@app/domain';
+import { AlbumResponseDto, ICryptoRepository, mapUser } from '@app/domain';
 import { AddAssetsResponseDto } from './response-dto/add-assets-response.dto';
 import { IAlbumRepository } from './album-repository';
 import { DownloadService } from '../../modules/download/download.service';
@@ -21,6 +21,18 @@ describe('Album service', () => {
     email: 'auth@test.com',
     isAdmin: false,
   });
+
+  const albumOwner: UserEntity = Object.freeze({
+    ...authUser,
+    firstName: 'auth',
+    lastName: 'user',
+    createdAt: 'date',
+    updatedAt: 'date',
+    profileImagePath: '',
+    shouldChangePassword: false,
+    oauthId: '',
+    tags: [],
+  });
   const albumId = 'f19ab956-4761-41ea-a5d6-bae948308d58';
   const sharedAlbumOwnerId = '2222';
   const sharedAlbumSharedAlsoWithId = '3333';
@@ -28,7 +40,8 @@ describe('Album service', () => {
 
   const _getOwnedAlbum = () => {
     const albumEntity = new AlbumEntity();
-    albumEntity.ownerId = authUser.id;
+    albumEntity.ownerId = albumOwner.id;
+    albumEntity.owner = albumOwner;
     albumEntity.id = albumId;
     albumEntity.albumName = 'name';
     albumEntity.createdAt = 'date';
@@ -42,7 +55,8 @@ describe('Album service', () => {
 
   const _getOwnedSharedAlbum = () => {
     const albumEntity = new AlbumEntity();
-    albumEntity.ownerId = authUser.id;
+    albumEntity.ownerId = albumOwner.id;
+    albumEntity.owner = albumOwner;
     albumEntity.id = albumId;
     albumEntity.albumName = 'name';
     albumEntity.createdAt = 'date';
@@ -68,6 +82,7 @@ describe('Album service', () => {
   const _getSharedWithAuthUserAlbum = () => {
     const albumEntity = new AlbumEntity();
     albumEntity.ownerId = sharedAlbumOwnerId;
+    albumEntity.owner = albumOwner;
     albumEntity.id = albumId;
     albumEntity.albumName = 'name';
     albumEntity.createdAt = 'date';
@@ -174,22 +189,22 @@ describe('Album service', () => {
   });
 
   it('gets an owned album', async () => {
-    const ownerId = authUser.id;
     const albumId = 'f19ab956-4761-41ea-a5d6-bae948308d58';
 
     const albumEntity = _getOwnedAlbum();
     albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
 
     const expectedResult: AlbumResponseDto = {
+      ownerId: albumOwner.id,
+      owner: mapUser(albumOwner),
+      id: albumId,
       albumName: 'name',
-      albumThumbnailAssetId: null,
       createdAt: 'date',
       updatedAt: 'date',
-      id: 'f19ab956-4761-41ea-a5d6-bae948308d58',
-      ownerId,
-      shared: false,
-      assets: [],
       sharedUsers: [],
+      assets: [],
+      albumThumbnailAssetId: null,
+      shared: false,
       assetCount: 0,
     };
     await expect(sut.getAlbumInfo(authUser, albumId)).resolves.toEqual(expectedResult);
@@ -473,6 +488,7 @@ describe('Album service', () => {
     const albumEntity = new AlbumEntity();
 
     albumEntity.ownerId = authUser.id;
+    albumEntity.owner = albumOwner;
     albumEntity.id = albumId;
     albumEntity.albumName = 'name';
     albumEntity.createdAt = 'date';

server/immich-openapi-specs.json

@@ -3400,7 +3400,8 @@
           "albumThumbnailAssetId",
           "shared",
           "sharedUsers",
-          "assets"
+          "assets",
+          "owner"
         ]
       },
       "SharedLinkResponseDto": {

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

@@ -13,7 +13,7 @@ export class AlbumResponseDto {
   shared!: boolean;
   sharedUsers!: UserResponseDto[];
   assets!: AssetResponseDto[];
-  owner?: UserResponseDto;
+  owner!: UserResponseDto;
   @ApiProperty({ type: 'integer' })
   assetCount!: number;
 }
@@ -35,7 +35,7 @@ export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
     updatedAt: entity.updatedAt,
     id: entity.id,
     ownerId: entity.ownerId,
-    owner: entity.owner ? mapUser(entity.owner) : undefined,
+    owner: mapUser(entity.owner),
     sharedUsers,
     shared: sharedUsers.length > 0 || entity.sharedLinks?.length > 0,
     assets: entity.assets?.map((assetAlbum) => mapAsset(assetAlbum.assetInfo)) || [],
@@ -60,7 +60,7 @@ export function mapAlbumExcludeAssetInfo(entity: AlbumEntity): AlbumResponseDto
     updatedAt: entity.updatedAt,
     id: entity.id,
     ownerId: entity.ownerId,
-    owner: entity.owner ? mapUser(entity.owner) : undefined,
+    owner: mapUser(entity.owner),
     sharedUsers,
     shared: sharedUsers.length > 0 || entity.sharedLinks?.length > 0,
     assets: [],

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

@@ -281,7 +281,7 @@ export interface AlbumResponseDto {
      * @type {UserResponseDto}
      * @memberof AlbumResponseDto
      */
-    'owner'?: UserResponseDto;
+    'owner': UserResponseDto;
 }
 /**
  * 

web/src/lib/components/shared-components/immich-thumbnail.svelte

@@ -34,6 +34,7 @@
 	let calculateVideoDurationIntervalHandler: NodeJS.Timer;
 	let videoProgress = '00:00';
 	let videoUrl: string;
+	$: isPublicShared = publicSharedKey !== '';
 
 	const loadVideoData = async (isLivePhoto: boolean) => {
 		isThumbnailVideoPlaying = false;
@@ -183,7 +184,7 @@
 			</div>
 		{/if}
 
-		{#if asset.isFavorite}
+		{#if asset.isFavorite && !isPublicShared}
 			<div class="w-full absolute bottom-2 left-2 z-10">
 				<Star size="24" color={'white'} />
 			</div>