feat(server, web): Include partner's photos on map (#7065)

* feat(server): Include partner's photos on map - if included in timeline

* depend on query parameter withPartners

instead of partners.inTimeline

* web: map option to include partners images

* make open-api

open-api/immich-openapi-specs.json

@@ -1397,6 +1397,14 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "name": "withPartners",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {

server/src/domain/asset/asset.service.spec.ts

@@ -286,6 +286,7 @@ describe(AssetService.name, () => {
 
   describe('getMapMarkers', () => {
     it('should get geo information of assets', async () => {
+      partnerMock.getAll.mockResolvedValue([]);
       assetMock.getMapMarkers.mockResolvedValue(
         [assetStub.withLocation].map((asset) => ({
           id: asset.id,

server/src/domain/asset/asset.service.ts

@@ -157,8 +157,16 @@ export class AssetService {
     return folder;
   }
 
-  getMapMarkers(auth: AuthDto, options: MapMarkerDto): Promise<MapMarkerResponseDto[]> {
-    return this.assetRepository.getMapMarkers(auth.user.id, options);
+  async getMapMarkers(auth: AuthDto, options: MapMarkerDto): Promise<MapMarkerResponseDto[]> {
+    const userIds: string[] = [auth.user.id];
+    if (options.withPartners) {
+      const partners = await this.partnerRepository.getAll(auth.user.id);
+      const partnersIds = partners
+        .filter((partner) => partner.sharedBy && partner.sharedWith && partner.sharedById != auth.user.id)
+        .map((partner) => partner.sharedById);
+      userIds.push(...partnersIds);
+    }
+    return this.assetRepository.getMapMarkers(userIds, options);
   }
 
   async getMemoryLane(auth: AuthDto, dto: MemoryLaneDto): Promise<MemoryLaneResponseDto[]> {

server/src/domain/asset/dto/map-marker.dto.ts

@@ -25,4 +25,10 @@ export class MapMarkerDto {
   @IsDate()
   @Type(() => Date)
   fileCreatedBefore?: Date;
+
+  @ApiProperty()
+  @Optional()
+  @IsBoolean()
+  @Transform(toBoolean)
+  withPartners?: boolean;
 }

server/src/domain/repositories/asset.repository.ts

@@ -140,7 +140,7 @@ export interface IAssetRepository {
   softDeleteAll(ids: string[]): Promise<void>;
   restoreAll(ids: string[]): Promise<void>;
   findLivePhotoMatch(options: LivePhotoSearchOptions): Promise<AssetEntity | null>;
-  getMapMarkers(ownerId: string, options?: MapMarkerSearchOptions): Promise<MapMarker[]>;
+  getMapMarkers(ownerIds: string[], options?: MapMarkerSearchOptions): Promise<MapMarker[]>;
   getStatistics(ownerId: string, options: AssetStatsOptions): Promise<AssetStats>;
   getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]>;
   getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]>;

server/src/infra/repositories/asset.repository.ts

@@ -472,7 +472,7 @@ export class AssetRepository implements IAssetRepository {
     });
   }
 
-  async getMapMarkers(ownerId: string, options: MapMarkerSearchOptions = {}): Promise<MapMarker[]> {
+  async getMapMarkers(ownerIds: string[], options: MapMarkerSearchOptions = {}): Promise<MapMarker[]> {
     const { isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore } = options;
 
     const assets = await this.repository.find({
@@ -484,7 +484,7 @@ export class AssetRepository implements IAssetRepository {
         },
       },
       where: {
-        ownerId,
+        ownerId: In([...ownerIds]),
         isVisible: true,
         isArchived,
         exifInfo: {

web/src/lib/components/map-page/map-settings-modal.svelte

@@ -33,6 +33,7 @@
       <SettingSwitch title="Allow dark mode" bind:checked={settings.allowDarkMode} />
       <SettingSwitch title="Only favorites" bind:checked={settings.onlyFavorites} />
       <SettingSwitch title="Include archived" bind:checked={settings.includeArchived} />
+      <SettingSwitch title="Include shared with me" bind:checked={settings.withPartners} />
       {#if customDateRange}
         <div in:fly={{ y: 10, duration: 200 }} class="flex flex-col gap-4">
           <div class="flex items-center justify-between gap-8">

web/src/lib/stores/preferences.store.ts

@@ -46,6 +46,7 @@ export interface MapSettings {
   allowDarkMode: boolean;
   includeArchived: boolean;
   onlyFavorites: boolean;
+  withPartners: boolean;
   relativeDate: string;
   dateAfter: string;
   dateBefore: string;
@@ -55,6 +56,7 @@ export const mapSettings = persisted<MapSettings>('map-settings', {
   allowDarkMode: true,
   includeArchived: false,
   onlyFavorites: false,
+  withPartners: false,
   relativeDate: '',
   dateAfter: '',
   dateBefore: '',

web/src/routes/(user)/map/+page.svelte

@@ -46,7 +46,7 @@
     }
     abortController = new AbortController();
 
-    const { includeArchived, onlyFavorites } = $mapSettings;
+    const { includeArchived, onlyFavorites, withPartners } = $mapSettings;
     const { fileCreatedAfter, fileCreatedBefore } = getFileCreatedDates();
 
     return await getMapMarkers(
@@ -55,6 +55,7 @@
         isFavorite: onlyFavorites || undefined,
         fileCreatedAfter: fileCreatedAfter || undefined,
         fileCreatedBefore,
+        withPartners: withPartners || undefined,
       },
       {
         signal: abortController.signal,