diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES index ae72e70d5..69172bd97 100644 --- a/mobile/openapi/.openapi-generator/FILES +++ b/mobile/openapi/.openapi-generator/FILES @@ -70,6 +70,7 @@ doc/DownloadInfoDto.md doc/DownloadResponseDto.md doc/DuplicateApi.md doc/DuplicateDetectionConfig.md +doc/DuplicateResponseDto.md doc/EntityType.md doc/ExifResponseDto.md doc/FaceApi.md @@ -312,6 +313,7 @@ lib/model/download_archive_info.dart lib/model/download_info_dto.dart lib/model/download_response_dto.dart lib/model/duplicate_detection_config.dart +lib/model/duplicate_response_dto.dart lib/model/entity_type.dart lib/model/exif_response_dto.dart lib/model/face_dto.dart @@ -507,6 +509,7 @@ test/download_info_dto_test.dart test/download_response_dto_test.dart test/duplicate_api_test.dart test/duplicate_detection_config_test.dart +test/duplicate_response_dto_test.dart test/entity_type_test.dart test/exif_response_dto_test.dart test/face_api_test.dart diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index 3cce4635c..048d5b00a 100644 Binary files a/mobile/openapi/README.md and b/mobile/openapi/README.md differ diff --git a/mobile/openapi/doc/AssetResponseDto.md b/mobile/openapi/doc/AssetResponseDto.md index 98290b374..41a628bd5 100644 Binary files a/mobile/openapi/doc/AssetResponseDto.md and b/mobile/openapi/doc/AssetResponseDto.md differ diff --git a/mobile/openapi/doc/DuplicateApi.md b/mobile/openapi/doc/DuplicateApi.md index 4dfbe55d3..cdf279b69 100644 Binary files a/mobile/openapi/doc/DuplicateApi.md and b/mobile/openapi/doc/DuplicateApi.md differ diff --git a/mobile/openapi/doc/DuplicateResponseDto.md b/mobile/openapi/doc/DuplicateResponseDto.md new file mode 100644 index 000000000..f98256999 Binary files /dev/null and b/mobile/openapi/doc/DuplicateResponseDto.md differ diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart index 69be2f8a9..110c4f757 100644 Binary files a/mobile/openapi/lib/api.dart and b/mobile/openapi/lib/api.dart differ diff --git a/mobile/openapi/lib/api/duplicate_api.dart b/mobile/openapi/lib/api/duplicate_api.dart index 2833d091e..ef71108b8 100644 Binary files a/mobile/openapi/lib/api/duplicate_api.dart and b/mobile/openapi/lib/api/duplicate_api.dart differ diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart index 537d63db3..6256d0c48 100644 Binary files a/mobile/openapi/lib/api_client.dart and b/mobile/openapi/lib/api_client.dart differ diff --git a/mobile/openapi/lib/model/asset_response_dto.dart b/mobile/openapi/lib/model/asset_response_dto.dart index 86dec6392..8802bb03a 100644 Binary files a/mobile/openapi/lib/model/asset_response_dto.dart and b/mobile/openapi/lib/model/asset_response_dto.dart differ diff --git a/mobile/openapi/lib/model/duplicate_response_dto.dart b/mobile/openapi/lib/model/duplicate_response_dto.dart new file mode 100644 index 000000000..b93ecfe5f Binary files /dev/null and b/mobile/openapi/lib/model/duplicate_response_dto.dart differ diff --git a/mobile/openapi/test/asset_response_dto_test.dart b/mobile/openapi/test/asset_response_dto_test.dart index 6e927e601..e666a3bb7 100644 Binary files a/mobile/openapi/test/asset_response_dto_test.dart and b/mobile/openapi/test/asset_response_dto_test.dart differ diff --git a/mobile/openapi/test/duplicate_api_test.dart b/mobile/openapi/test/duplicate_api_test.dart index 8e22a5253..50a090bc3 100644 Binary files a/mobile/openapi/test/duplicate_api_test.dart and b/mobile/openapi/test/duplicate_api_test.dart differ diff --git a/mobile/openapi/test/duplicate_response_dto_test.dart b/mobile/openapi/test/duplicate_response_dto_test.dart new file mode 100644 index 000000000..a531c133c Binary files /dev/null and b/mobile/openapi/test/duplicate_response_dto_test.dart differ diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index 7fbf5f830..8fc5378ed 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -2231,7 +2231,7 @@ "application/json": { "schema": { "items": { - "$ref": "#/components/schemas/AssetResponseDto" + "$ref": "#/components/schemas/DuplicateResponseDto" }, "type": "array" } @@ -7318,6 +7318,10 @@ "deviceId": { "type": "string" }, + "duplicateId": { + "nullable": true, + "type": "string" + }, "duration": { "type": "string" }, @@ -7930,6 +7934,24 @@ ], "type": "object" }, + "DuplicateResponseDto": { + "properties": { + "assets": { + "items": { + "$ref": "#/components/schemas/AssetResponseDto" + }, + "type": "array" + }, + "duplicateId": { + "type": "string" + } + }, + "required": [ + "assets", + "duplicateId" + ], + "type": "object" + }, "EntityType": { "enum": [ "ASSET", diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts index 92396c360..f0af90a8d 100644 --- a/open-api/typescript-sdk/src/fetch-client.ts +++ b/open-api/typescript-sdk/src/fetch-client.ts @@ -115,6 +115,7 @@ export type AssetResponseDto = { checksum: string; deviceAssetId: string; deviceId: string; + duplicateId?: string | null; duration: string; exifInfo?: ExifResponseDto; fileCreatedAt: string; @@ -372,6 +373,10 @@ export type DownloadResponseDto = { archives: DownloadArchiveInfo[]; totalSize: number; }; +export type DuplicateResponseDto = { + assets: AssetResponseDto[]; + duplicateId: string; +}; export type PersonResponseDto = { birthDate: string | null; id: string; @@ -1698,7 +1703,7 @@ export function getDownloadInfo({ key, downloadInfoDto }: { export function getAssetDuplicates(opts?: Oazapfts.RequestOpts) { return oazapfts.ok(oazapfts.fetchJson<{ status: 200; - data: AssetResponseDto[]; + data: DuplicateResponseDto[]; }>("/duplicates", { ...opts }));