Merge branch 'main' of https://github.com/immich-app/immich into feat/sidecar-asset-files

server/src/controllers/asset.controller.spec.ts

@@ -57,6 +57,28 @@ describe(AssetController.name, () => {
     });
   });
 
+  describe('PUT /assets/copy', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get(`/assets/copy`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require target and source id', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).put('/assets/copy').send({});
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        factory.responses.badRequest(expect.arrayContaining(['sourceId must be a UUID', 'targetId must be a UUID'])),
+      );
+    });
+
+    it('should work', async () => {
+      const { status } = await request(ctx.getHttpServer())
+        .put('/assets/copy')
+        .send({ sourceId: factory.uuid(), targetId: factory.uuid() });
+      expect(status).toBe(204);
+    });
+  });
+
   describe('PUT /assets/:id', () => {
     it('should be an authenticated route', async () => {
       await request(ctx.getHttpServer()).get(`/assets/123`);

server/src/controllers/asset.controller.ts

@@ -81,6 +81,13 @@ export class AssetController {
     return this.service.get(auth, id) as Promise<AssetResponseDto>;
   }
 
+  @Put('copy')
+  @Authenticated({ permission: Permission.AssetCopy })
+  @HttpCode(HttpStatus.NO_CONTENT)
+  copyAsset(@Auth() auth: AuthDto, @Body() dto: AssetCopyDto): Promise<void> {
+    return this.service.copy(auth, dto);
+  }
+
   @Put(':id')
   @Authenticated({ permission: Permission.AssetUpdate })
   updateAsset(
@@ -91,13 +98,6 @@ export class AssetController {
     return this.service.update(auth, id, dto);
   }
 
-  @Put('copy')
-  @Authenticated({ permission: Permission.AssetCopy })
-  @HttpCode(HttpStatus.NO_CONTENT)
-  copyAsset(@Auth() auth: AuthDto, @Body() dto: AssetCopyDto): Promise<void> {
-    return this.service.copy(auth, dto);
-  }
-
   @Get(':id/metadata')
   @Authenticated({ permission: Permission.AssetRead })
   getAssetMetadata(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<AssetMetadataResponseDto[]> {

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

@@ -179,7 +179,6 @@ describe(AssetService.name, () => {
       const { sut, ctx } = setup();
       const storageRepo = ctx.getMock(StorageRepository);
       const jobRepo = ctx.getMock(JobRepository);
-      const assetRepo = ctx.getMock(AssetRepository);
 
       storageRepo.copyFile.mockResolvedValue();
       jobRepo.queue.mockResolvedValue();
@@ -207,12 +206,6 @@ describe(AssetService.name, () => {
 
       expect(storageRepo.copyFile).toHaveBeenCalledWith('/path/to/my/sidecar.xmp', `${newAsset.originalPath}.xmp`);
 
-      expect(assetRepo.upsertFile).toHaveBeenCalledWith({
-        assetId: newAsset.id,
-        path: `${newAsset.originalPath}.xmp`,
-        type: AssetFileType.Sidecar,
-      });
-
       expect(jobRepo.queue).toHaveBeenCalledWith({
         name: JobName.AssetExtractMetadata,
         data: { id: newAsset.id },