From bb5236ae65bb94160c4f6fd5db2237854b175463 Mon Sep 17 00:00:00 2001 From: Alex <alex.tran1502@gmail.com> Date: Tue, 20 Feb 2024 20:44:34 -0600 Subject: [PATCH] fix(server): not in album filter with context search (#7275) --- mobile/openapi/doc/SmartSearchDto.md | Bin 1859 -> 1904 bytes .../openapi/lib/model/smart_search_dto.dart | Bin 23646 -> 24379 bytes .../openapi/test/smart_search_dto_test.dart | Bin 3635 -> 3742 bytes open-api/immich-openapi-specs.json | 3 +++ open-api/typescript-sdk/axios-client/api.ts | 6 ++++++ open-api/typescript-sdk/fetch-client.ts | Bin 74452 -> 74480 bytes server/src/domain/search/dto/search.dto.ts | 6 +++--- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mobile/openapi/doc/SmartSearchDto.md b/mobile/openapi/doc/SmartSearchDto.md index 5d34143df208c03bb6d16087c3cebd68a1e43c1b..fd9bc35490479c0d7f18aeb9e12c0e073b75e081 100644 GIT binary patch delta 27 jcmX@i_knN28YV8k{1VSR$DE|n+{q6Zl{c?pn$7|Mng$A_ delta 12 UcmeyscbIR(8m7%RnWnP<047}pR{#J2 diff --git a/mobile/openapi/lib/model/smart_search_dto.dart b/mobile/openapi/lib/model/smart_search_dto.dart index b82a3345fbec819f297de08e7ef1e438f05db056..269a07102020fff93b3973be0b94ebd19b1f7963 100644 GIT binary patch delta 256 zcmcb&gK_sh#tnW<Tz>f_o_UTrNu{})9hrIrk@=1MS&W;{3fIU=ArvXt+A3rgBlw#w z4Q*Lf5qyw*UTIE_g1v%)f)%RLL^B&!34~Hx6%>PJTIaDN**<xrt)vpN0`*u0TZNL0 k%wj!c(a8s$6p(d2bX3^P?!1%_S?pt=A`*A=yubro0Erk}8vp<R delta 44 zcmV+{0Mq}wz5(920kBR2vt<H*5wlnod>ym?GA#wOWjH4Vv#3342eY9?r4F-+RI&<| C4iTpS diff --git a/mobile/openapi/test/smart_search_dto_test.dart b/mobile/openapi/test/smart_search_dto_test.dart index 858c7769c81578dff06ccbffb127af5c63f41793..84a85cf208c927facbd9a93b56372961e7b757a9 100644 GIT binary patch delta 44 rcmdliGf#HIbyhCF{1VSR$DE|n+{uFMiaeRcNCJsWx|=VsCUXD)Xi^WI delta 12 TcmbOyyIE$#b=J*JY%v@FA%z5X diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index 6870e140ca..790fe8e8ec 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -9435,6 +9435,9 @@ "isMotion": { "type": "boolean" }, + "isNotInAlbum": { + "type": "boolean" + }, "isOffline": { "type": "boolean" }, diff --git a/open-api/typescript-sdk/axios-client/api.ts b/open-api/typescript-sdk/axios-client/api.ts index 622820c752..e57a95a127 100644 --- a/open-api/typescript-sdk/axios-client/api.ts +++ b/open-api/typescript-sdk/axios-client/api.ts @@ -3880,6 +3880,12 @@ export interface SmartSearchDto { * @memberof SmartSearchDto */ 'isMotion'?: boolean; + /** + * + * @type {boolean} + * @memberof SmartSearchDto + */ + 'isNotInAlbum'?: boolean; /** * * @type {boolean} diff --git a/open-api/typescript-sdk/fetch-client.ts b/open-api/typescript-sdk/fetch-client.ts index 9b3a359863e598a3d0dd59b7c430178cc1aa7f6a..2c14eb4faece5123d7cf2bd2eddf54d59cc04e01 100644 GIT binary patch delta 18 acmca|l;y)wmJNJ%lNGG?ZeDMv`UC(}@d%~> delta 22 ecmexxl;z4%mJNJ%lWnXPPS&>;-h9ta=m`LJxe3w$ diff --git a/server/src/domain/search/dto/search.dto.ts b/server/src/domain/search/dto/search.dto.ts index 5aa73433d9..519e39fd2e 100644 --- a/server/src/domain/search/dto/search.dto.ts +++ b/server/src/domain/search/dto/search.dto.ts @@ -118,6 +118,9 @@ class BaseSearchDto { @Type(() => Number) @Optional() size?: number; + + @QueryBoolean({ optional: true }) + isNotInAlbum?: boolean; } export class MetadataSearchDto extends BaseSearchDto { @@ -170,9 +173,6 @@ export class MetadataSearchDto extends BaseSearchDto { @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder }) order?: AssetOrder; - @QueryBoolean({ optional: true }) - isNotInAlbum?: boolean; - @Optional() personIds?: string[]; }