helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(server): allow library id to be null in metadata search (#10512)

Browse source 
* fix: allow library id to be null in metadata search

* chore: open api
This commit is contained in:
Daniel Dietzler 2024-06-21 01:02:05 +02:00 • committed by GitHub
parent 0fda67543d
commit 5e9a7b17d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/dtos/search.dto.ts
View file

@ -9,8 +9,8 @@ import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
class BaseSearchDto {
@ValidateUUID({ optional: true })
libraryId?: string;
@ValidateUUID({ optional: true, nullable: true })
libraryId?: string | null;
@IsString()
@IsNotEmpty()

2
server/src/interfaces/search.interface.ts
View file

@ -45,7 +45,7 @@ export interface SearchAssetIDOptions {
export interface SearchUserIdOptions {
deviceId?: string;
libraryId?: string;
libraryId?: string | null;
userIds?: string[];
}

5
server/src/utils/database.ts
View file

@ -52,6 +52,11 @@ export function searchAssetBuilder(
}
const id = _.pick(options, ['checksum', 'deviceAssetId', 'deviceId', 'id', 'libraryId']);
if (id.libraryId === null) {
id.libraryId = IsNull() as unknown as string;
}
builder.andWhere(_.omitBy(id, _.isUndefined));
if (options.userIds) {

6
server/src/validation.ts
View file

@ -80,13 +80,13 @@ export function Optional({ nullable, ...validationOptions }: OptionalOptions = {
return ValidateIf((object: any, v: any) => v !== undefined, validationOptions);
}
type UUIDOptions = { optional?: boolean; each?: boolean };
type UUIDOptions = { optional?: boolean; each?: boolean; nullable?: boolean };
export const ValidateUUID = (options?: UUIDOptions) => {
const { optional, each } = { optional: false, each: false, ...options };
const { optional, each, nullable } = { optional: false, each: false, nullable: false, ...options };
return applyDecorators(
IsUUID('4', { each }),
ApiProperty({ format: 'uuid' }),
optional ? Optional() : IsNotEmpty(),
optional ? Optional({ nullable }) : IsNotEmpty(),
each ? IsArray() : IsString(),
);
};