diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES index 4e109c14d..263687549 100644 --- a/mobile/openapi/.openapi-generator/FILES +++ b/mobile/openapi/.openapi-generator/FILES @@ -103,6 +103,7 @@ doc/OAuthApi.md doc/OAuthAuthorizeResponseDto.md doc/OAuthCallbackDto.md doc/OAuthConfigDto.md +doc/OnThisDayDto.md doc/PartnerApi.md doc/PartnerResponseDto.md doc/PathEntityType.md @@ -318,6 +319,7 @@ lib/model/model_type.dart lib/model/o_auth_authorize_response_dto.dart lib/model/o_auth_callback_dto.dart lib/model/o_auth_config_dto.dart +lib/model/on_this_day_dto.dart lib/model/partner_response_dto.dart lib/model/path_entity_type.dart lib/model/path_type.dart @@ -504,6 +506,7 @@ test/o_auth_api_test.dart test/o_auth_authorize_response_dto_test.dart test/o_auth_callback_dto_test.dart test/o_auth_config_dto_test.dart +test/on_this_day_dto_test.dart test/partner_api_test.dart test/partner_response_dto_test.dart test/path_entity_type_test.dart diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index fede2901c..a64183077 100644 --- a/mobile/openapi/README.md +++ b/mobile/openapi/README.md @@ -311,6 +311,7 @@ Class | Method | HTTP request | Description - [OAuthAuthorizeResponseDto](doc//OAuthAuthorizeResponseDto.md) - [OAuthCallbackDto](doc//OAuthCallbackDto.md) - [OAuthConfigDto](doc//OAuthConfigDto.md) + - [OnThisDayDto](doc//OnThisDayDto.md) - [PartnerResponseDto](doc//PartnerResponseDto.md) - [PathEntityType](doc//PathEntityType.md) - [PathType](doc//PathType.md) diff --git a/mobile/openapi/doc/MemoryCreateDto.md b/mobile/openapi/doc/MemoryCreateDto.md index 5bcbd54f4..e0b0ef5a5 100644 --- a/mobile/openapi/doc/MemoryCreateDto.md +++ b/mobile/openapi/doc/MemoryCreateDto.md @@ -9,7 +9,7 @@ import 'package:openapi/api.dart'; Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **assetIds** | **List** | | [optional] [default to const []] -**data** | [**Object**](.md) | | +**data** | [**OnThisDayDto**](OnThisDayDto.md) | | **isSaved** | **bool** | | [optional] **memoryAt** | [**DateTime**](DateTime.md) | | **seenAt** | [**DateTime**](DateTime.md) | | [optional] diff --git a/mobile/openapi/doc/MemoryResponseDto.md b/mobile/openapi/doc/MemoryResponseDto.md index ef379be04..59a836311 100644 --- a/mobile/openapi/doc/MemoryResponseDto.md +++ b/mobile/openapi/doc/MemoryResponseDto.md @@ -10,7 +10,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **assets** | [**List**](AssetResponseDto.md) | | [default to const []] **createdAt** | [**DateTime**](DateTime.md) | | -**data** | [**Object**](.md) | | +**data** | [**OnThisDayDto**](OnThisDayDto.md) | | **deletedAt** | [**DateTime**](DateTime.md) | | [optional] **id** | **String** | | **isSaved** | **bool** | | diff --git a/mobile/openapi/doc/OnThisDayDto.md b/mobile/openapi/doc/OnThisDayDto.md new file mode 100644 index 000000000..178b4482b --- /dev/null +++ b/mobile/openapi/doc/OnThisDayDto.md @@ -0,0 +1,15 @@ +# openapi.model.OnThisDayDto + +## Load the model package +```dart +import 'package:openapi/api.dart'; +``` + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**year** | **num** | | + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart index 7d8ab5288..ae458f5de 100644 --- a/mobile/openapi/lib/api.dart +++ b/mobile/openapi/lib/api.dart @@ -140,6 +140,7 @@ part 'model/model_type.dart'; part 'model/o_auth_authorize_response_dto.dart'; part 'model/o_auth_callback_dto.dart'; part 'model/o_auth_config_dto.dart'; +part 'model/on_this_day_dto.dart'; part 'model/partner_response_dto.dart'; part 'model/path_entity_type.dart'; part 'model/path_type.dart'; diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart index 8784ad641..757f47568 100644 --- a/mobile/openapi/lib/api_client.dart +++ b/mobile/openapi/lib/api_client.dart @@ -358,6 +358,8 @@ class ApiClient { return OAuthCallbackDto.fromJson(value); case 'OAuthConfigDto': return OAuthConfigDto.fromJson(value); + case 'OnThisDayDto': + return OnThisDayDto.fromJson(value); case 'PartnerResponseDto': return PartnerResponseDto.fromJson(value); case 'PathEntityType': diff --git a/mobile/openapi/lib/model/memory_create_dto.dart b/mobile/openapi/lib/model/memory_create_dto.dart index 5d08a631c..c48a07c5f 100644 --- a/mobile/openapi/lib/model/memory_create_dto.dart +++ b/mobile/openapi/lib/model/memory_create_dto.dart @@ -23,7 +23,7 @@ class MemoryCreateDto { List assetIds; - Object data; + OnThisDayDto data; /// /// Please note: This property should have been non-nullable! Since the specification file @@ -97,7 +97,7 @@ class MemoryCreateDto { assetIds: json[r'assetIds'] is Iterable ? (json[r'assetIds'] as Iterable).cast().toList(growable: false) : const [], - data: mapValueOfType(json, r'data')!, + data: OnThisDayDto.fromJson(json[r'data'])!, isSaved: mapValueOfType(json, r'isSaved'), memoryAt: mapDateTime(json, r'memoryAt', r'')!, seenAt: mapDateTime(json, r'seenAt', r''), diff --git a/mobile/openapi/lib/model/memory_response_dto.dart b/mobile/openapi/lib/model/memory_response_dto.dart index 918099458..8671e3c64 100644 --- a/mobile/openapi/lib/model/memory_response_dto.dart +++ b/mobile/openapi/lib/model/memory_response_dto.dart @@ -30,7 +30,7 @@ class MemoryResponseDto { DateTime createdAt; - Object data; + OnThisDayDto data; /// /// Please note: This property should have been non-nullable! Since the specification file @@ -126,7 +126,7 @@ class MemoryResponseDto { return MemoryResponseDto( assets: AssetResponseDto.listFromJson(json[r'assets']), createdAt: mapDateTime(json, r'createdAt', r'')!, - data: mapValueOfType(json, r'data')!, + data: OnThisDayDto.fromJson(json[r'data'])!, deletedAt: mapDateTime(json, r'deletedAt', r''), id: mapValueOfType(json, r'id')!, isSaved: mapValueOfType(json, r'isSaved')!, diff --git a/mobile/openapi/lib/model/on_this_day_dto.dart b/mobile/openapi/lib/model/on_this_day_dto.dart new file mode 100644 index 000000000..ef1471dfb --- /dev/null +++ b/mobile/openapi/lib/model/on_this_day_dto.dart @@ -0,0 +1,98 @@ +// +// AUTO-GENERATED FILE, DO NOT MODIFY! +// +// @dart=2.12 + +// ignore_for_file: unused_element, unused_import +// ignore_for_file: always_put_required_named_parameters_first +// ignore_for_file: constant_identifier_names +// ignore_for_file: lines_longer_than_80_chars + +part of openapi.api; + +class OnThisDayDto { + /// Returns a new [OnThisDayDto] instance. + OnThisDayDto({ + required this.year, + }); + + num year; + + @override + bool operator ==(Object other) => identical(this, other) || other is OnThisDayDto && + other.year == year; + + @override + int get hashCode => + // ignore: unnecessary_parenthesis + (year.hashCode); + + @override + String toString() => 'OnThisDayDto[year=$year]'; + + Map toJson() { + final json = {}; + json[r'year'] = this.year; + return json; + } + + /// Returns a new [OnThisDayDto] instance and imports its values from + /// [value] if it's a [Map], null otherwise. + // ignore: prefer_constructors_over_static_methods + static OnThisDayDto? fromJson(dynamic value) { + if (value is Map) { + final json = value.cast(); + + return OnThisDayDto( + year: num.parse('${json[r'year']}'), + ); + } + return null; + } + + static List listFromJson(dynamic json, {bool growable = false,}) { + final result = []; + if (json is List && json.isNotEmpty) { + for (final row in json) { + final value = OnThisDayDto.fromJson(row); + if (value != null) { + result.add(value); + } + } + } + return result.toList(growable: growable); + } + + static Map mapFromJson(dynamic json) { + final map = {}; + if (json is Map && json.isNotEmpty) { + json = json.cast(); // ignore: parameter_assignments + for (final entry in json.entries) { + final value = OnThisDayDto.fromJson(entry.value); + if (value != null) { + map[entry.key] = value; + } + } + } + return map; + } + + // maps a json object with a list of OnThisDayDto-objects as value to a dart map + static Map> mapListFromJson(dynamic json, {bool growable = false,}) { + final map = >{}; + if (json is Map && json.isNotEmpty) { + // ignore: parameter_assignments + json = json.cast(); + for (final entry in json.entries) { + map[entry.key] = OnThisDayDto.listFromJson(entry.value, growable: growable,); + } + } + return map; + } + + /// The list of required keys that must be present in a JSON. + static const requiredKeys = { + 'year', + }; +} + diff --git a/mobile/openapi/test/memory_create_dto_test.dart b/mobile/openapi/test/memory_create_dto_test.dart index f2909bd46..bfb6f09e1 100644 --- a/mobile/openapi/test/memory_create_dto_test.dart +++ b/mobile/openapi/test/memory_create_dto_test.dart @@ -21,7 +21,7 @@ void main() { // TODO }); - // Object data + // OnThisDayDto data test('to test the property `data`', () async { // TODO }); diff --git a/mobile/openapi/test/memory_response_dto_test.dart b/mobile/openapi/test/memory_response_dto_test.dart index da25bbb6e..90b2e7834 100644 --- a/mobile/openapi/test/memory_response_dto_test.dart +++ b/mobile/openapi/test/memory_response_dto_test.dart @@ -26,7 +26,7 @@ void main() { // TODO }); - // Object data + // OnThisDayDto data test('to test the property `data`', () async { // TODO }); diff --git a/mobile/openapi/test/on_this_day_dto_test.dart b/mobile/openapi/test/on_this_day_dto_test.dart new file mode 100644 index 000000000..71379f8bb --- /dev/null +++ b/mobile/openapi/test/on_this_day_dto_test.dart @@ -0,0 +1,27 @@ +// +// AUTO-GENERATED FILE, DO NOT MODIFY! +// +// @dart=2.12 + +// ignore_for_file: unused_element, unused_import +// ignore_for_file: always_put_required_named_parameters_first +// ignore_for_file: constant_identifier_names +// ignore_for_file: lines_longer_than_80_chars + +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for OnThisDayDto +void main() { + // final instance = OnThisDayDto(); + + group('test OnThisDayDto', () { + // num year + test('to test the property `year`', () async { + // TODO + }); + + + }); + +} diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index da7bad8f0..70e797f52 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -8769,7 +8769,7 @@ "type": "array" }, "data": { - "type": "object" + "$ref": "#/components/schemas/OnThisDayDto" }, "isSaved": { "type": "boolean" @@ -8829,7 +8829,7 @@ "type": "string" }, "data": { - "type": "object" + "$ref": "#/components/schemas/OnThisDayDto" }, "deletedAt": { "format": "date-time", @@ -9110,6 +9110,17 @@ ], "type": "object" }, + "OnThisDayDto": { + "properties": { + "year": { + "type": "number" + } + }, + "required": [ + "year" + ], + "type": "object" + }, "PartnerResponseDto": { "properties": { "avatarColor": { diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts index 1584a79cf..bed1380d9 100644 --- a/open-api/typescript-sdk/src/fetch-client.ts +++ b/open-api/typescript-sdk/src/fetch-client.ts @@ -494,10 +494,13 @@ export type ValidateLibraryImportPathResponseDto = { export type ValidateLibraryResponseDto = { importPaths?: ValidateLibraryImportPathResponseDto[]; }; +export type OnThisDayDto = { + year: number; +}; export type MemoryResponseDto = { assets: AssetResponseDto[]; createdAt: string; - data: object; + data: OnThisDayDto; deletedAt?: string; id: string; isSaved: boolean; @@ -509,7 +512,7 @@ export type MemoryResponseDto = { }; export type MemoryCreateDto = { assetIds?: string[]; - data: object; + data: OnThisDayDto; isSaved?: boolean; memoryAt: string; seenAt?: string;