From 984feafb90c0f3e09117d581ef6a409d56b227d8 Mon Sep 17 00:00:00 2001
From: Tom Vincent <github@tlvince.com>
Date: Mon, 15 Jan 2024 16:19:41 +0000
Subject: [PATCH] fix(server): extract image description (#6344)

---
 server/e2e/jobs/specs/formats.e2e-spec.ts           | 2 ++
 server/src/domain/metadata/metadata.service.spec.ts | 2 ++
 server/src/domain/metadata/metadata.service.ts      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/server/e2e/jobs/specs/formats.e2e-spec.ts b/server/e2e/jobs/specs/formats.e2e-spec.ts
index 5fdeebc943..eb7f623c97 100644
--- a/server/e2e/jobs/specs/formats.e2e-spec.ts
+++ b/server/e2e/jobs/specs/formats.e2e-spec.ts
@@ -39,6 +39,7 @@ describe(`Supported file formats (e2e)`, () => {
         make: 'SONY',
         model: 'DSLR-A550',
         orientation: null,
+        description: 'SONY DSC',
       },
     },
     {
@@ -64,6 +65,7 @@ describe(`Supported file formats (e2e)`, () => {
         make: 'SONY',
         model: 'DSLR-A550',
         orientation: null,
+        description: 'SONY DSC',
       },
     },
     {
diff --git a/server/src/domain/metadata/metadata.service.spec.ts b/server/src/domain/metadata/metadata.service.spec.ts
index 94bdce2562..e9b054be6d 100644
--- a/server/src/domain/metadata/metadata.service.spec.ts
+++ b/server/src/domain/metadata/metadata.service.spec.ts
@@ -411,6 +411,7 @@ describe(MetadataService.name, () => {
         DateTimeOriginal: new Date('1970-01-01').toISOString(),
         ExposureTime: '100ms',
         FocalLength: 20,
+        ImageDescription: 'test description',
         ISO: 100,
         LensModel: 'test lens',
         MediaGroupUUID: 'livePhoto',
@@ -432,6 +433,7 @@ describe(MetadataService.name, () => {
         bitsPerSample: expect.any(Number),
         colorspace: tags.ColorSpace,
         dateTimeOriginal: new Date('1970-01-01'),
+        description: tags.ImageDescription,
         exifImageHeight: null,
         exifImageWidth: null,
         exposureTime: tags.ExposureTime,
diff --git a/server/src/domain/metadata/metadata.service.ts b/server/src/domain/metadata/metadata.service.ts
index fa892d42f5..a70594f3c4 100644
--- a/server/src/domain/metadata/metadata.service.ts
+++ b/server/src/domain/metadata/metadata.service.ts
@@ -456,6 +456,7 @@ export class MetadataService {
       bitsPerSample: this.getBitsPerSample(tags),
       colorspace: tags.ColorSpace ?? null,
       dateTimeOriginal: this.getDateTimeOriginal(tags) ?? asset.fileCreatedAt,
+      description: (tags.ImageDescription || tags.Description) ?? '',
       exifImageHeight: validate(tags.ImageHeight),
       exifImageWidth: validate(tags.ImageWidth),
       exposureTime: tags.ExposureTime ?? null,