expose ownerId in personResponse

make it possible for frontend to visualize the fact that this is a shared person f.ex with a small icon or hiding actions like merge, change name etc that will fail due to share beeing read-only.
immich-app · Feb 21, 2024 · fa04b02 · fa04b02
1 parent 81cb0a9
commit fa04b02
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 3 deletions.
diff --git a/mobile/openapi/doc/PersonResponseDto.md b/mobile/openapi/doc/PersonResponseDto.md
diff --git a/mobile/openapi/doc/PersonWithFacesResponseDto.md b/mobile/openapi/doc/PersonWithFacesResponseDto.md
diff --git a/mobile/openapi/lib/model/person_response_dto.dart b/mobile/openapi/lib/model/person_response_dto.dart
diff --git a/mobile/openapi/lib/model/person_with_faces_response_dto.dart b/mobile/openapi/lib/model/person_with_faces_response_dto.dart
diff --git a/mobile/openapi/test/person_response_dto_test.dart b/mobile/openapi/test/person_response_dto_test.dart
diff --git a/mobile/openapi/test/person_with_faces_response_dto_test.dart b/mobile/openapi/test/person_with_faces_response_dto_test.dart
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
@@ -8676,6 +8676,9 @@
           "name": {
             "type": "string"
           },
+          "ownerId": {
+            "type": "string"
+          },
           "thumbnailPath": {
             "type": "string"
           }
@@ -8685,6 +8688,7 @@
           "id",
           "isHidden",
           "name",
+          "ownerId",
           "thumbnailPath"
         ],
         "type": "object"
@@ -8745,6 +8749,9 @@
           "name": {
             "type": "string"
           },
+          "ownerId": {
+            "type": "string"
+          },
           "thumbnailPath": {
             "type": "string"
           }
@@ -8755,6 +8762,7 @@
           "id",
           "isHidden",
           "name",
+          "ownerId",
           "thumbnailPath"
         ],
         "type": "object"

diff --git a/open-api/typescript-sdk/axios-client/api.ts b/open-api/typescript-sdk/axios-client/api.ts
diff --git a/open-api/typescript-sdk/fetch-client.ts b/open-api/typescript-sdk/fetch-client.ts
diff --git a/server/src/domain/person/person.dto.ts b/server/src/domain/person/person.dto.ts
@@ -77,6 +77,7 @@ export class PersonResponseDto {
   birthDate!: Date | null;
   thumbnailPath!: string;
   isHidden!: boolean;
+  ownerId!: string;
 }
 
 export class PersonWithFacesResponseDto extends PersonResponseDto {
@@ -143,6 +144,7 @@ export function mapPerson(person: PersonEntity): PersonResponseDto {
     birthDate: person.birthDate,
     thumbnailPath: person.thumbnailPath,
     isHidden: person.isHidden,
+    ownerId: person.ownerId,
   };
 }
 

diff --git a/server/src/domain/person/person.service.spec.ts b/server/src/domain/person/person.service.spec.ts
@@ -48,6 +48,7 @@ const responseDto: PersonResponseDto = {
   birthDate: null,
   thumbnailPath: '/path/to/thumbnail.jpg',
   isHidden: false,
+  ownerId: authStub.admin.user.id,
 };
 
 const statistics = { assets: 3 };
@@ -146,6 +147,7 @@ describe(PersonService.name, () => {
             birthDate: null,
             thumbnailPath: '/path/to/thumbnail',
             isHidden: false,
+            ownerId: authStub.user1.user.id,
           },
         ],
       });
@@ -192,6 +194,7 @@ describe(PersonService.name, () => {
             birthDate: null,
             thumbnailPath: '/path/to/thumbnail.jpg',
             isHidden: true,
+            ownerId: personStub.noName.ownerId,
           },
         ],
       });
@@ -325,6 +328,7 @@ describe(PersonService.name, () => {
         birthDate: new Date('1976-06-30'),
         thumbnailPath: '/path/to/thumbnail.jpg',
         isHidden: false,
+        ownerId: personStub.noName.ownerId,
       });
       expect(personMock.getById).toHaveBeenCalledWith('person-1');
       expect(personMock.update).toHaveBeenCalledWith({ id: 'person-1', birthDate: new Date('1976-06-30') });
@@ -525,6 +529,7 @@ describe(PersonService.name, () => {
         isHidden: personStub.noName.isHidden,
         id: personStub.noName.id,
         name: personStub.noName.name,
+        ownerId: personStub.noName.ownerId,
         thumbnailPath: personStub.noName.thumbnailPath,
       });
 

diff --git a/web/src/routes/(user)/explore/+page.ts b/web/src/routes/(user)/explore/+page.ts
@@ -4,7 +4,10 @@ import type { PageLoad } from './$types';
 
 export const load = (async () => {
   await authenticate();
-  const [items, response] = await Promise.all([getExploreData(), getAllPeople({ withHidden: false, withPartners: true })]);
+  const [items, response] = await Promise.all([
+    getExploreData(),
+    getAllPeople({ withHidden: false, withPartners: true }),
+  ]);
 
   return {
     items,