High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: remove assets from shared link (#22935)
Jorge Montejoa23dfff6cf8a
diff --git a/server/src/repositories/index.ts b/server/src/repositories/index.tsindex a01b46f3bd..d2e1aa08c8 100644--- a/server/src/repositories/index.ts+++ b/server/src/repositories/index.ts@@ -31,6 +31,7 @@ import { ProcessRepository } from 'src/repositories/process.repository';import { SearchRepository } from 'src/repositories/search.repository';import { ServerInfoRepository } from 'src/repositories/server-info.repository';import { SessionRepository } from 'src/repositories/session.repository';+import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';import { SharedLinkRepository } from 'src/repositories/shared-link.repository';import { StackRepository } from 'src/repositories/stack.repository';import { StorageRepository } from 'src/repositories/storage.repository';@@ -79,6 +80,7 @@ export const repositories = [SessionRepository,ServerInfoRepository,SharedLinkRepository,+ SharedLinkAssetRepository,StackRepository,StorageRepository,SyncRepository,diff --git a/server/src/repositories/shared-link-asset.repository.ts b/server/src/repositories/shared-link-asset.repository.tsnew file mode 100644index 0000000000..45085c4a8d--- /dev/null+++ b/server/src/repositories/shared-link-asset.repository.ts@@ -0,0 +1,18 @@+import { Kysely } from 'kysely';+import { InjectKysely } from 'nestjs-kysely';+import { DB } from 'src/schema';++export class SharedLinkAssetRepository {+ constructor(@InjectKysely() private db: Kysely<DB>) {}++ async remove(sharedLinkId: string, assetsId: string[]) {+ const deleted = await this.db+ .deleteFrom('shared_link_asset')+ .where('shared_link_asset.sharedLinksId', '=', sharedLinkId)+ .where('shared_link_asset.assetsId', 'in', assetsId)+ .returning('assetsId')+ .execute();++ return deleted.map((row) => row.assetsId);+ }+}diff --git a/server/src/services/base.service.ts b/server/src/services/base.service.tsindex 6b85c3ec6c..5a2dd42c3c 100644--- a/server/src/services/base.service.ts+++ b/server/src/services/base.service.ts@@ -38,6 +38,7 @@ import { ProcessRepository } from 'src/repositories/process.repository';import { SearchRepository } from 'src/repositories/search.repository';import { ServerInfoRepository } from 'src/repositories/server-info.repository';import { SessionRepository } from 'src/repositories/session.repository';+import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';import { SharedLinkRepository } from 'src/repositories/shared-link.repository';import { StackRepository } from 'src/repositories/stack.repository';import { StorageRepository } from 'src/repositories/storage.repository';@@ -89,6 +90,7 @@ export const BASE_SERVICE_DEPENDENCIES = [ServerInfoRepository,SessionRepository,SharedLinkRepository,+ SharedLinkAssetRepository,StackRepository,StorageRepository,SyncRepository,@@ -141,6 +143,7 @@ export class BaseService {protected serverInfoRepository: ServerInfoRepository,protected sessionRepository: SessionRepository,protected sharedLinkRepository: SharedLinkRepository,+ protected sharedLinkAssetRepository: SharedLinkAssetRepository,protected stackRepository: StackRepository,protected storageRepository: StorageRepository,protected syncRepository: SyncRepository,diff --git a/server/src/services/shared-link.service.spec.ts b/server/src/services/shared-link.service.spec.tsindex 9483cdddff..062214b975 100644--- a/server/src/services/shared-link.service.spec.ts+++ b/server/src/services/shared-link.service.spec.ts@@ -300,6 +300,7 @@ describe(SharedLinkService.name, () => {mocks.sharedLink.get.mockResolvedValue(_.cloneDeep(sharedLinkStub.individual));mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.individual);mocks.sharedLink.update.mockResolvedValue(sharedLinkStub.individual);+ mocks.sharedLinkAsset.remove.mockResolvedValue([assetStub.image.id]);await expect(sut.removeAssets(authStub.admin, 'link-1', { assetIds: [assetStub.image.id, 'asset-2'] }),@@ -308,6 +309,7 @@ describe(SharedLinkService.name, () => {{ assetId: 'asset-2', success: false, error: AssetIdErrorReason.NOT_FOUND },]);+ expect(mocks.sharedLinkAsset.remove).toHaveBeenCalledWith('link-1', [assetStub.image.id, 'asset-2']);expect(mocks.sharedLink.update).toHaveBeenCalledWith({ ...sharedLinkStub.individual, assets: [] });});});diff --git a/server/src/services/shared-link.service.ts b/server/src/services/shared-link.service.tsindex 096739d056..3c1a6083e9 100644--- a/server/src/services/shared-link.service.ts+++ b/server/src/services/shared-link.service.ts@@ -175,10 +175,12 @@ export class SharedLinkService extends BaseService {throw new BadRequestException('Invalid shared link type');}+ const removedAssetIds = await this.sharedLinkAssetRepository.remove(id, dto.assetIds);+const results: AssetIdsResponseDto[] = [];for (const assetId of dto.assetIds) {- const hasAsset = sharedLink.assets.find((asset) => asset.id === assetId);- if (!hasAsset) {+ const wasRemoved = removedAssetIds.find((id) => id === assetId);+ if (!wasRemoved) {results.push({ assetId, success: false, error: AssetIdErrorReason.NOT_FOUND });continue;}diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.tsindex f802e3113e..3f021f3eb7 100644--- a/server/test/medium.factory.ts+++ b/server/test/medium.factory.ts@@ -33,6 +33,7 @@ import { PartnerRepository } from 'src/repositories/partner.repository';import { PersonRepository } from 'src/repositories/person.repository';import { SearchRepository } from 'src/repositories/search.repository';import { SessionRepository } from 'src/repositories/session.repository';+import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';import { SharedLinkRepository } from 'src/repositories/shared-link.repository';import { StackRepository } from 'src/repositories/stack.repository';import { StorageRepository } from 'src/repositories/storage.repository';@@ -311,6 +312,7 @@ const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {case SearchRepository:case SessionRepository:case SharedLinkRepository:+ case SharedLinkAssetRepository:case StackRepository:case SyncRepository:case SyncCheckpointRepository:diff --git a/server/test/medium/specs/services/shared-link.service.spec.ts b/server/test/medium/specs/services/shared-link.service.spec.tsindex 88e7e86df5..acc51374d1 100644--- a/server/test/medium/specs/services/shared-link.service.spec.ts+++ b/server/test/medium/specs/services/shared-link.service.spec.ts@@ -4,6 +4,7 @@ import { SharedLinkType } from 'src/enum';import { AccessRepository } from 'src/repositories/access.repository';import { DatabaseRepository } from 'src/repositories/database.repository';import { LoggingRepository } from 'src/repositories/logging.repository';+import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';import { SharedLinkRepository } from 'src/repositories/shared-link.repository';import { StorageRepository } from 'src/repositories/storage.repository';import { DB } from 'src/schema';@@ -17,7 +18,7 @@ let defaultDatabase: Kysely<DB>;const setup = (db?: Kysely<DB>) => {return newMediumService(SharedLinkService, {database: db || defaultDatabase,- real: [AccessRepository, DatabaseRepository, SharedLinkRepository],+ real: [AccessRepository, DatabaseRepository, SharedLinkRepository, SharedLinkAssetRepository],mock: [LoggingRepository, StorageRepository],});};@@ -62,4 +63,65 @@ describe(SharedLinkService.name, () => {});});});++ it('should share individually assets', async () => {+ const { sut, ctx } = setup();++ const { user } = await ctx.newUser();++ const assets = await Promise.all([+ ctx.newAsset({ ownerId: user.id }),+ ctx.newAsset({ ownerId: user.id }),+ ctx.newAsset({ ownerId: user.id }),+ ]);++ for (const { asset } of assets) {+ await ctx.newExif({ assetId: asset.id, make: 'Canon' });+ }++ const sharedLinkRepo = ctx.get(SharedLinkRepository);++ const sharedLink = await sharedLinkRepo.create({+ key: randomBytes(16),+ id: factory.uuid(),+ userId: user.id,+ allowUpload: false,+ type: SharedLinkType.Individual,+ assetIds: assets.map(({ asset }) => asset.id),+ });++ await expect(sut.getMine({ user, sharedLink }, {})).resolves.toMatchObject({+ assets: assets.map(({ asset }) => expect.objectContaining({ id: asset.id })),+ });+ });++ it('should remove individually shared asset', async () => {+ const { sut, ctx } = setup();++ const { user } = await ctx.newUser();+ const auth = factory.auth({ user });+ const { asset } = await ctx.newAsset({ ownerId: user.id });+ await ctx.newExif({ assetId: asset.id, make: 'Canon' });++ const sharedLinkRepo = ctx.get(SharedLinkRepository);++ const sharedLink = await sharedLinkRepo.create({+ key: randomBytes(16),+ id: factory.uuid(),+ userId: user.id,+ allowUpload: false,+ type: SharedLinkType.Individual,+ assetIds: [asset.id],+ });++ await expect(sut.getMine({ user, sharedLink }, {})).resolves.toMatchObject({+ assets: [expect.objectContaining({ id: asset.id })],+ });++ await sut.removeAssets(auth, sharedLink.id, {+ assetIds: [asset.id],+ });++ await expect(sut.getMine({ user, sharedLink }, {})).resolves.toHaveProperty('assets', []);+ });});diff --git a/server/test/utils.ts b/server/test/utils.tsindex c23341d64c..bae9163b80 100644--- a/server/test/utils.ts+++ b/server/test/utils.ts@@ -47,6 +47,7 @@ import { ProcessRepository } from 'src/repositories/process.repository';import { SearchRepository } from 'src/repositories/search.repository';import { ServerInfoRepository } from 'src/repositories/server-info.repository';import { SessionRepository } from 'src/repositories/session.repository';+import { SharedLinkAssetRepository } from 'src/repositories/shared-link-asset.repository';import { SharedLinkRepository } from 'src/repositories/shared-link.repository';import { StackRepository } from 'src/repositories/stack.repository';import { StorageRepository } from 'src/repositories/storage.repository';@@ -236,6 +237,7 @@ export type ServiceOverrides = {serverInfo: ServerInfoRepository;session: SessionRepository;sharedLink: SharedLinkRepository;+ sharedLinkAsset: SharedLinkAssetRepository;stack: StackRepository;storage: StorageRepository;sync: SyncRepository;@@ -307,6 +309,7 @@ export const newTestService = <T extends BaseService>(serverInfo: automock(ServerInfoRepository, { args: [, loggerMock], strict: false }),session: automock(SessionRepository),sharedLink: automock(SharedLinkRepository),+ sharedLinkAsset: automock(SharedLinkAssetRepository),stack: automock(StackRepository),storage: newStorageRepositoryMock(),sync: automock(SyncRepository),@@ -357,6 +360,7 @@ export const newTestService = <T extends BaseService>(overrides.serverInfo || (mocks.serverInfo as As<ServerInfoRepository>),overrides.session || (mocks.session as As<SessionRepository>),overrides.sharedLink || (mocks.sharedLink as As<SharedLinkRepository>),+ overrides.sharedLinkAsset || (mocks.sharedLinkAsset as As<SharedLinkAssetRepository>),overrides.stack || (mocks.stack as As<StackRepository>),overrides.storage || (mocks.storage as As<StorageRepository>),overrides.sync || (mocks.sync as As<SyncRepository>),