Merge branch 'main' of https://github.com/immich-app/immich into chore/library-init-micro

server/src/domain/search/dto/search.dto.ts

@@ -122,6 +122,9 @@ class BaseSearchDto {
 
   @QueryBoolean({ optional: true })
   isNotInAlbum?: boolean;
+
+  @Optional()
+  personIds?: string[];
 }
 
 export class MetadataSearchDto extends BaseSearchDto {
@@ -173,9 +176,6 @@ export class MetadataSearchDto extends BaseSearchDto {
   @Optional()
   @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
   order?: AssetOrder;
-
-  @Optional()
-  personIds?: string[];
 }
 
 export class SmartSearchDto extends BaseSearchDto {

server/src/immich/api-v1/asset/asset.service.ts

@@ -341,7 +341,6 @@ export class AssetService {
       fileCreatedAt: dto.fileCreatedAt,
       fileModifiedAt: dto.fileModifiedAt,
       localDateTime: dto.fileCreatedAt,
-      deletedAt: null,
 
       type: mimeTypes.assetType(file.originalPath),
       isFavorite: dto.isFavorite,
@@ -349,17 +348,9 @@ export class AssetService {
       duration: dto.duration || null,
       isVisible: dto.isVisible ?? true,
       livePhotoVideo: livePhotoAssetId === null ? null : ({ id: livePhotoAssetId } as AssetEntity),
-      resizePath: null,
-      webpPath: null,
-      thumbhash: null,
-      encodedVideoPath: null,
-      tags: [],
-      sharedLinks: [],
       originalFileName: parse(file.originalName).name,
-      faces: [],
       sidecarPath: sidecarPath || null,
       isReadOnly: dto.isReadOnly ?? false,
-      isExternal: dto.isExternal ?? false,
       isOffline: dto.isOffline ?? false,
     });
 

server/src/immich/api-v1/asset/dto/create-asset.dto.ts

@@ -3,7 +3,10 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Transform, Type } from 'class-transformer';
 import { IsBoolean, IsDate, IsNotEmpty, IsString } from 'class-validator';
 
-export class CreateAssetBase {
+export class CreateAssetDto {
+  @ValidateUUID({ optional: true })
+  libraryId?: string;
+
   @IsNotEmpty()
   @IsString()
   deviceAssetId!: string;
@@ -22,6 +25,10 @@ export class CreateAssetBase {
   @Type(() => Date)
   fileModifiedAt!: Date;
 
+  @Optional()
+  @IsString()
+  duration?: string;
+
   @Optional()
   @IsBoolean()
   @Transform(toBoolean)
@@ -37,28 +44,16 @@ export class CreateAssetBase {
   @Transform(toBoolean)
   isVisible?: boolean;
 
-  @Optional()
-  @IsString()
-  duration?: string;
-
-  @Optional()
-  @IsBoolean()
-  isExternal?: boolean;
-
   @Optional()
   @IsBoolean()
+  @Transform(toBoolean)
   isOffline?: boolean;
-}
 
-export class CreateAssetDto extends CreateAssetBase {
   @Optional()
   @IsBoolean()
   @Transform(toBoolean)
   isReadOnly?: boolean;
 
-  @ValidateUUID({ optional: true })
-  libraryId?: string;
-
   // The properties below are added to correctly generate the API docs
   // and client SDKs. Validation should be handled in the controller.
   @ApiProperty({ type: 'string', format: 'binary' })

server/src/immich/controllers/library.controller.ts

@@ -10,7 +10,7 @@ import {
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
 } from '@app/domain';
-import { Body, Controller, Delete, Get, HttpCode, Param, Post, Put, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { AdminRoute, Auth, Authenticated } from '../app.guard';
 import { UseValidation } from '../app.utils';
@@ -55,6 +55,7 @@ export class LibraryController {
   }
 
   @Delete(':id')
+  @HttpCode(HttpStatus.NO_CONTENT)
   deleteLibrary(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
@@ -65,11 +66,13 @@ export class LibraryController {
   }
 
   @Post(':id/scan')
+  @HttpCode(HttpStatus.NO_CONTENT)
   scanLibrary(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: ScanLibraryDto) {
     return this.service.queueScan(auth, id, dto);
   }
 
   @Post(':id/removeOffline')
+  @HttpCode(HttpStatus.NO_CONTENT)
   removeOfflineFiles(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto) {
     return this.service.queueRemoveOffline(auth, id);
   }

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

@@ -22,7 +22,7 @@ import {
 import { ImmichLogger } from '@app/infra/logger';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, SelectQueryBuilder } from 'typeorm';
 import { vectorExt } from '../database.config';
 import { DummyValue, GenerateSql } from '../infra.util';
 import { asVector, isValidInteger, paginatedBuilder, searchAssetBuilder } from '../infra.utils';
@@ -81,6 +81,14 @@ export class SearchRepository implements ISearchRepository {
     });
   }
 
+  private createPersonFilter(builder: SelectQueryBuilder<AssetFaceEntity>, personIds: string[]) {
+    return builder
+      .select(`${builder.alias}."assetId"`)
+      .where(`${builder.alias}."personId" IN (:...personIds)`, { personIds })
+      .groupBy(`${builder.alias}."assetId"`)
+      .having(`COUNT(DISTINCT ${builder.alias}."personId") = :personCount`, { personCount: personIds.length });
+  }
+
   @GenerateSql({
     params: [
       { page: 1, size: 100 },
@@ -96,12 +104,21 @@ export class SearchRepository implements ISearchRepository {
   })
   async searchSmart(
     pagination: SearchPaginationOptions,
-    { embedding, userIds, ...options }: SmartSearchOptions,
+    { embedding, userIds, personIds, ...options }: SmartSearchOptions,
   ): Paginated<AssetEntity> {
     let results: PaginationResult<AssetEntity> = { items: [], hasNextPage: false };
 
     await this.assetRepository.manager.transaction(async (manager) => {
       let builder = manager.createQueryBuilder(AssetEntity, 'asset');
+
+      if (personIds?.length) {
+        const assetFaceBuilder = manager.createQueryBuilder(AssetFaceEntity, 'asset_face');
+        const cte = this.createPersonFilter(assetFaceBuilder, personIds);
+        builder
+          .addCommonTableExpression(cte, 'asset_face_ids')
+          .innerJoin('asset_face_ids', 'a', 'a."assetId" = asset.id');
+      }
+
       builder = searchAssetBuilder(builder, options);
       builder
         .innerJoin('asset.smartSearch', 'search')