refactor(server): shared links (#2632)

* refactor: rename share => shared-link

* refactor: shared link crud methods

* chore: open api

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

@@ -10,13 +10,19 @@ import { AddAssetsResponseDto } from './response-dto/add-assets-response.dto';
 import { AddAssetsDto } from './dto/add-assets.dto';
 import { DownloadService } from '../../modules/download/download.service';
 import { DownloadDto } from '../asset/dto/download-library.dto';
-import { ShareCore, ISharedLinkRepository, mapSharedLink, SharedLinkResponseDto, ICryptoRepository } from '@app/domain';
+import {
+  SharedLinkCore,
+  ISharedLinkRepository,
+  mapSharedLink,
+  SharedLinkResponseDto,
+  ICryptoRepository,
+} from '@app/domain';
 import { CreateAlbumShareLinkDto } from './dto/create-album-shared-link.dto';
 
 @Injectable()
 export class AlbumService {
   readonly logger = new Logger(AlbumService.name);
-  private shareCore: ShareCore;
+  private shareCore: SharedLinkCore;
 
   constructor(
     @Inject(IAlbumRepository) private albumRepository: IAlbumRepository,
@@ -25,7 +31,7 @@ export class AlbumService {
     @Inject(ICryptoRepository) cryptoRepository: ICryptoRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
   ) {
-    this.shareCore = new ShareCore(sharedLinkRepository, cryptoRepository);
+    this.shareCore = new SharedLinkCore(sharedLinkRepository, cryptoRepository);
   }
 
   private async _getAlbum({

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

@@ -229,7 +229,7 @@ describe('AssetService', () => {
 
       expect(assetRepositoryMock.getById).toHaveBeenCalledWith(asset1.id);
       expect(sharedLinkRepositoryMock.get).toHaveBeenCalledWith(authDto.id, authDto.sharedLinkId);
-      expect(sharedLinkRepositoryMock.save).not.toHaveBeenCalled();
+      expect(sharedLinkRepositoryMock.update).not.toHaveBeenCalled();
     });
 
     it('should add assets to a shared link', async () => {
@@ -241,13 +241,13 @@ describe('AssetService', () => {
       assetRepositoryMock.getById.mockResolvedValue(asset1);
       sharedLinkRepositoryMock.get.mockResolvedValue(sharedLinkStub.valid);
       sharedLinkRepositoryMock.hasAssetAccess.mockResolvedValue(true);
-      sharedLinkRepositoryMock.save.mockResolvedValue(sharedLinkStub.valid);
+      sharedLinkRepositoryMock.update.mockResolvedValue(sharedLinkStub.valid);
 
       await expect(sut.addAssetsToSharedLink(authDto, dto)).resolves.toEqual(sharedLinkResponseStub.valid);
 
       expect(assetRepositoryMock.getById).toHaveBeenCalledWith(asset1.id);
       expect(sharedLinkRepositoryMock.get).toHaveBeenCalledWith(authDto.id, authDto.sharedLinkId);
-      expect(sharedLinkRepositoryMock.save).toHaveBeenCalled();
+      expect(sharedLinkRepositoryMock.update).toHaveBeenCalled();
     });
 
     it('should remove assets from a shared link', async () => {
@@ -259,13 +259,13 @@ describe('AssetService', () => {
       assetRepositoryMock.getById.mockResolvedValue(asset1);
       sharedLinkRepositoryMock.get.mockResolvedValue(sharedLinkStub.valid);
       sharedLinkRepositoryMock.hasAssetAccess.mockResolvedValue(true);
-      sharedLinkRepositoryMock.save.mockResolvedValue(sharedLinkStub.valid);
+      sharedLinkRepositoryMock.update.mockResolvedValue(sharedLinkStub.valid);
 
       await expect(sut.removeAssetsFromSharedLink(authDto, dto)).resolves.toEqual(sharedLinkResponseStub.valid);
 
       expect(assetRepositoryMock.getById).toHaveBeenCalledWith(asset1.id);
       expect(sharedLinkRepositoryMock.get).toHaveBeenCalledWith(authDto.id, authDto.sharedLinkId);
-      expect(sharedLinkRepositoryMock.save).toHaveBeenCalled();
+      expect(sharedLinkRepositoryMock.update).toHaveBeenCalled();
     });
   });
 

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

@@ -54,7 +54,7 @@ import { ICryptoRepository, IJobRepository } from '@app/domain';
 import { DownloadService } from '../../modules/download/download.service';
 import { DownloadDto } from './dto/download-library.dto';
 import { IAlbumRepository } from '../album/album-repository';
-import { ShareCore } from '@app/domain';
+import { SharedLinkCore } from '@app/domain';
 import { IPartnerRepository } from '@app/domain';
 import { ISharedLinkRepository } from '@app/domain';
 import { DownloadFilesDto } from './dto/download-files.dto';
@@ -80,7 +80,7 @@ interface ServableFile {
 @Injectable()
 export class AssetService {
   readonly logger = new Logger(AssetService.name);
-  private shareCore: ShareCore;
+  private shareCore: SharedLinkCore;
   private assetCore: AssetCore;
   private partnerCore: PartnerCore;
 
@@ -97,7 +97,7 @@ export class AssetService {
     @Inject(IPartnerRepository) private partnerRepository: IPartnerRepository,
   ) {
     this.assetCore = new AssetCore(_assetRepository, jobRepository);
-    this.shareCore = new ShareCore(sharedLinkRepository, cryptoRepository);
+    this.shareCore = new SharedLinkCore(sharedLinkRepository, cryptoRepository);
     this.partnerCore = new PartnerCore(partnerRepository);
   }
 

server/apps/immich/src/controllers/shared-link.controller.ts

@@ -1,4 +1,4 @@
-import { AuthUserDto, EditSharedLinkDto, SharedLinkResponseDto, ShareService } from '@app/domain';
+import { AuthUserDto, EditSharedLinkDto, SharedLinkResponseDto, SharedLinkService } from '@app/domain';
 import { Body, Controller, Delete, Get, Param, Patch } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { GetAuthUser } from '../decorators/auth-user.decorator';
@@ -11,7 +11,7 @@ import { UUIDParamDto } from './dto/uuid-param.dto';
 @Authenticated()
 @UseValidation()
 export class SharedLinkController {
-  constructor(private readonly service: ShareService) {}
+  constructor(private readonly service: SharedLinkService) {}
 
   @Get()
   getAllSharedLinks(@GetAuthUser() authUser: AuthUserDto): Promise<SharedLinkResponseDto[]> {
@@ -29,20 +29,20 @@ export class SharedLinkController {
     @GetAuthUser() authUser: AuthUserDto,
     @Param() { id }: UUIDParamDto,
   ): Promise<SharedLinkResponseDto> {
-    return this.service.getById(authUser, id, true);
+    return this.service.get(authUser, id);
+  }
+
+  @Patch(':id')
+  updateSharedLink(
+    @GetAuthUser() authUser: AuthUserDto,
+    @Param() { id }: UUIDParamDto,
+    @Body() dto: EditSharedLinkDto,
+  ): Promise<SharedLinkResponseDto> {
+    return this.service.update(authUser, id, dto);
   }
 
   @Delete(':id')
   removeSharedLink(@GetAuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(authUser, id);
   }
-
-  @Patch(':id')
-  editSharedLink(
-    @GetAuthUser() authUser: AuthUserDto,
-    @Param() { id }: UUIDParamDto,
-    @Body() dto: EditSharedLinkDto,
-  ): Promise<SharedLinkResponseDto> {
-    return this.service.edit(authUser, id, dto);
-  }
 }