Adapt web client to consume new server response format

2025-04-29 13:45:40 +00:00
parent 077703adcc
commit bc5d4b45a6
17 changed files with 367 additions and 60 deletions
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -145,8 +145,15 @@ Class | Method | HTTP request | Description
 *MemoriesApi* | [**removeMemoryAssets**](doc//MemoriesApi.md#removememoryassets) | **DELETE** /memories/{id}/assets | 
 *MemoriesApi* | [**searchMemories**](doc//MemoriesApi.md#searchmemories) | **GET** /memories | 
 *MemoriesApi* | [**updateMemory**](doc//MemoriesApi.md#updatememory) | **PUT** /memories/{id} | 
-*NotificationsAdminApi* | [**getNotificationTemplateAdmin**](doc//NotificationsAdminApi.md#getnotificationtemplateadmin) | **POST** /notifications/admin/templates/{name} | 
-*NotificationsAdminApi* | [**sendTestEmailAdmin**](doc//NotificationsAdminApi.md#sendtestemailadmin) | **POST** /notifications/admin/test-email | 
+*NotificationsApi* | [**deleteNotification**](doc//NotificationsApi.md#deletenotification) | **DELETE** /notifications/{id} | 
+*NotificationsApi* | [**deleteNotifications**](doc//NotificationsApi.md#deletenotifications) | **DELETE** /notifications | 
+*NotificationsApi* | [**getNotification**](doc//NotificationsApi.md#getnotification) | **GET** /notifications/{id} | 
+*NotificationsApi* | [**getNotifications**](doc//NotificationsApi.md#getnotifications) | **GET** /notifications | 
+*NotificationsApi* | [**updateNotification**](doc//NotificationsApi.md#updatenotification) | **PUT** /notifications/{id} | 
+*NotificationsApi* | [**updateNotifications**](doc//NotificationsApi.md#updatenotifications) | **PUT** /notifications | 
+*NotificationsAdminApi* | [**createNotification**](doc//NotificationsAdminApi.md#createnotification) | **POST** /admin/notifications | 
+*NotificationsAdminApi* | [**getNotificationTemplateAdmin**](doc//NotificationsAdminApi.md#getnotificationtemplateadmin) | **POST** /admin/notifications/templates/{name} | 
+*NotificationsAdminApi* | [**sendTestEmailAdmin**](doc//NotificationsAdminApi.md#sendtestemailadmin) | **POST** /admin/notifications/test-email | 
 *OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | 
 *OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | 
 *OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
@@ -300,7 +307,6 @@ Class | Method | HTTP request | Description
 - [AssetStatsResponseDto](doc//AssetStatsResponseDto.md)
 - [AssetTypeEnum](doc//AssetTypeEnum.md)
 - [AudioCodec](doc//AudioCodec.md)
- - [AvatarResponse](doc//AvatarResponse.md)
 - [AvatarUpdate](doc//AvatarUpdate.md)
 - [BulkIdResponseDto](doc//BulkIdResponseDto.md)
 - [BulkIdsDto](doc//BulkIdsDto.md)
@@ -361,6 +367,13 @@ Class | Method | HTTP request | Description
 - [MemoryUpdateDto](doc//MemoryUpdateDto.md)
 - [MergePersonDto](doc//MergePersonDto.md)
 - [MetadataSearchDto](doc//MetadataSearchDto.md)
+ - [NotificationCreateDto](doc//NotificationCreateDto.md)
+ - [NotificationDeleteAllDto](doc//NotificationDeleteAllDto.md)
+ - [NotificationDto](doc//NotificationDto.md)
+ - [NotificationLevel](doc//NotificationLevel.md)
+ - [NotificationType](doc//NotificationType.md)
+ - [NotificationUpdateAllDto](doc//NotificationUpdateAllDto.md)
+ - [NotificationUpdateDto](doc//NotificationUpdateDto.md)
 - [OAuthAuthorizeResponseDto](doc//OAuthAuthorizeResponseDto.md)
 - [OAuthCallbackDto](doc//OAuthCallbackDto.md)
 - [OAuthConfigDto](doc//OAuthConfigDto.md)
@@ -475,8 +488,12 @@ Class | Method | HTTP request | Description
 - [TemplateDto](doc//TemplateDto.md)
 - [TemplateResponseDto](doc//TemplateResponseDto.md)
 - [TestEmailResponseDto](doc//TestEmailResponseDto.md)
+ - [TimeBucketAssetResponseDto](doc//TimeBucketAssetResponseDto.md)
+ - [TimeBucketAssetResponseDtoDurationInner](doc//TimeBucketAssetResponseDtoDurationInner.md)
 - [TimeBucketResponseDto](doc//TimeBucketResponseDto.md)
- - [TimeBucketSize](doc//TimeBucketSize.md)
+ - [TimeBucketsResponseDto](doc//TimeBucketsResponseDto.md)
+ - [TimelineAssetDescriptionDto](doc//TimelineAssetDescriptionDto.md)
+ - [TimelineStackResponseDto](doc//TimelineStackResponseDto.md)
 - [ToneMapping](doc//ToneMapping.md)
 - [TranscodeHWAccel](doc//TranscodeHWAccel.md)
 - [TranscodePolicy](doc//TranscodePolicy.md)
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -44,6 +44,7 @@ part 'api/jobs_api.dart';
 part 'api/libraries_api.dart';
 part 'api/map_api.dart';
 part 'api/memories_api.dart';
+part 'api/notifications_api.dart';
 part 'api/notifications_admin_api.dart';
 part 'api/o_auth_api.dart';
 part 'api/partners_api.dart';
@@ -107,7 +108,6 @@ part 'model/asset_stack_response_dto.dart';
 part 'model/asset_stats_response_dto.dart';
 part 'model/asset_type_enum.dart';
 part 'model/audio_codec.dart';
-part 'model/avatar_response.dart';
 part 'model/avatar_update.dart';
 part 'model/bulk_id_response_dto.dart';
 part 'model/bulk_ids_dto.dart';
@@ -168,6 +168,13 @@ part 'model/memory_type.dart';
 part 'model/memory_update_dto.dart';
 part 'model/merge_person_dto.dart';
 part 'model/metadata_search_dto.dart';
+part 'model/notification_create_dto.dart';
+part 'model/notification_delete_all_dto.dart';
+part 'model/notification_dto.dart';
+part 'model/notification_level.dart';
+part 'model/notification_type.dart';
+part 'model/notification_update_all_dto.dart';
+part 'model/notification_update_dto.dart';
 part 'model/o_auth_authorize_response_dto.dart';
 part 'model/o_auth_callback_dto.dart';
 part 'model/o_auth_config_dto.dart';
@@ -282,8 +289,12 @@ part 'model/tags_update.dart';
 part 'model/template_dto.dart';
 part 'model/template_response_dto.dart';
 part 'model/test_email_response_dto.dart';
+part 'model/time_bucket_asset_response_dto.dart';
+part 'model/time_bucket_asset_response_dto_duration_inner.dart';
 part 'model/time_bucket_response_dto.dart';
-part 'model/time_bucket_size.dart';
+part 'model/time_buckets_response_dto.dart';
+part 'model/timeline_asset_description_dto.dart';
+part 'model/timeline_stack_response_dto.dart';
 part 'model/tone_mapping.dart';
 part 'model/transcode_hw_accel.dart';
 part 'model/transcode_policy.dart';
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -270,8 +270,6 @@ class ApiClient {
          return AssetTypeEnumTypeTransformer().decode(value);
        case 'AudioCodec':
          return AudioCodecTypeTransformer().decode(value);
-        case 'AvatarResponse':
-          return AvatarResponse.fromJson(value);
        case 'AvatarUpdate':
          return AvatarUpdate.fromJson(value);
        case 'BulkIdResponseDto':
@@ -392,6 +390,20 @@ class ApiClient {
          return MergePersonDto.fromJson(value);
        case 'MetadataSearchDto':
          return MetadataSearchDto.fromJson(value);
+        case 'NotificationCreateDto':
+          return NotificationCreateDto.fromJson(value);
+        case 'NotificationDeleteAllDto':
+          return NotificationDeleteAllDto.fromJson(value);
+        case 'NotificationDto':
+          return NotificationDto.fromJson(value);
+        case 'NotificationLevel':
+          return NotificationLevelTypeTransformer().decode(value);
+        case 'NotificationType':
+          return NotificationTypeTypeTransformer().decode(value);
+        case 'NotificationUpdateAllDto':
+          return NotificationUpdateAllDto.fromJson(value);
+        case 'NotificationUpdateDto':
+          return NotificationUpdateDto.fromJson(value);
        case 'OAuthAuthorizeResponseDto':
          return OAuthAuthorizeResponseDto.fromJson(value);
        case 'OAuthCallbackDto':
@@ -620,10 +632,18 @@ class ApiClient {
          return TemplateResponseDto.fromJson(value);
        case 'TestEmailResponseDto':
          return TestEmailResponseDto.fromJson(value);
+        case 'TimeBucketAssetResponseDto':
+          return TimeBucketAssetResponseDto.fromJson(value);
+        case 'TimeBucketAssetResponseDtoDurationInner':
+          return TimeBucketAssetResponseDtoDurationInner.fromJson(value);
        case 'TimeBucketResponseDto':
          return TimeBucketResponseDto.fromJson(value);
-        case 'TimeBucketSize':
-          return TimeBucketSizeTypeTransformer().decode(value);
+        case 'TimeBucketsResponseDto':
+          return TimeBucketsResponseDto.fromJson(value);
+        case 'TimelineAssetDescriptionDto':
+          return TimelineAssetDescriptionDto.fromJson(value);
+        case 'TimelineStackResponseDto':
+          return TimelineStackResponseDto.fromJson(value);
        case 'ToneMapping':
          return ToneMappingTypeTransformer().decode(value);
        case 'TranscodeHWAccel':
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -100,6 +100,12 @@ String parameterToString(dynamic value) {
  if (value is MemoryType) {
    return MemoryTypeTypeTransformer().encode(value).toString();
  }
+  if (value is NotificationLevel) {
+    return NotificationLevelTypeTransformer().encode(value).toString();
+  }
+  if (value is NotificationType) {
+    return NotificationTypeTypeTransformer().encode(value).toString();
+  }
  if (value is PartnerDirection) {
    return PartnerDirectionTypeTransformer().encode(value).toString();
  }
@@ -133,9 +139,6 @@ String parameterToString(dynamic value) {
  if (value is SyncRequestType) {
    return SyncRequestTypeTypeTransformer().encode(value).toString();
  }
-  if (value is TimeBucketSize) {
-    return TimeBucketSizeTypeTransformer().encode(value).toString();
-  }
  if (value is ToneMapping) {
    return ToneMappingTypeTransformer().encode(value).toString();
  }
--- a/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart
+++ b/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart
@@ -13,6 +13,7 @@ part of openapi.api;
 class TimeBucketAssetResponseDto {
  /// Returns a new [TimeBucketAssetResponseDto] instance.
  TimeBucketAssetResponseDto({
+    this.description = const [],
    this.duration = const [],
    this.id = const [],
    this.isArchived = const [],
@@ -29,6 +30,8 @@ class TimeBucketAssetResponseDto {
    this.thumbhash = const [],
  });

+  List<TimelineAssetDescriptionDto> description;
+
  List<TimeBucketAssetResponseDtoDurationInner> duration;

  List<String> id;
@@ -59,6 +62,7 @@ class TimeBucketAssetResponseDto {

  @override
  bool operator ==(Object other) => identical(this, other) || other is TimeBucketAssetResponseDto &&
+    _deepEquality.equals(other.description, description) &&
    _deepEquality.equals(other.duration, duration) &&
    _deepEquality.equals(other.id, id) &&
    _deepEquality.equals(other.isArchived, isArchived) &&
@@ -77,6 +81,7 @@ class TimeBucketAssetResponseDto {
  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
+    (description.hashCode) +
    (duration.hashCode) +
    (id.hashCode) +
    (isArchived.hashCode) +
@@ -93,10 +98,11 @@ class TimeBucketAssetResponseDto {
    (thumbhash.hashCode);

  @override
-  String toString() => 'TimeBucketAssetResponseDto[duration=$duration, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isImage=$isImage, isTrashed=$isTrashed, isVideo=$isVideo, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, ownerId=$ownerId, projectionType=$projectionType, ratio=$ratio, stack=$stack, thumbhash=$thumbhash]';
+  String toString() => 'TimeBucketAssetResponseDto[description=$description, duration=$duration, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isImage=$isImage, isTrashed=$isTrashed, isVideo=$isVideo, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, ownerId=$ownerId, projectionType=$projectionType, ratio=$ratio, stack=$stack, thumbhash=$thumbhash]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
+      json[r'description'] = this.description;
      json[r'duration'] = this.duration;
      json[r'id'] = this.id;
      json[r'isArchived'] = this.isArchived;
@@ -123,6 +129,7 @@ class TimeBucketAssetResponseDto {
      final json = value.cast<String, dynamic>();

      return TimeBucketAssetResponseDto(
+        description: TimelineAssetDescriptionDto.listFromJson(json[r'description']),
        duration: TimeBucketAssetResponseDtoDurationInner.listFromJson(json[r'duration']),
        id: json[r'id'] is Iterable
            ? (json[r'id'] as Iterable).cast<String>().toList(growable: false)
@@ -200,6 +207,7 @@ class TimeBucketAssetResponseDto {

  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
+    'description',
    'duration',
    'id',
    'isArchived',
--- a/mobile/openapi/lib/model/timeline_asset_description_dto.dart
+++ b/mobile/openapi/lib/model/timeline_asset_description_dto.dart
@@ -0,0 +1,115 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// 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 TimelineAssetDescriptionDto {
+  /// Returns a new [TimelineAssetDescriptionDto] instance.
+  TimelineAssetDescriptionDto({
+    required this.city,
+    required this.country,
+  });
+
+  String? city;
+
+  String? country;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is TimelineAssetDescriptionDto &&
+    other.city == city &&
+    other.country == country;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (city == null ? 0 : city!.hashCode) +
+    (country == null ? 0 : country!.hashCode);
+
+  @override
+  String toString() => 'TimelineAssetDescriptionDto[city=$city, country=$country]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.city != null) {
+      json[r'city'] = this.city;
+    } else {
+    //  json[r'city'] = null;
+    }
+    if (this.country != null) {
+      json[r'country'] = this.country;
+    } else {
+    //  json[r'country'] = null;
+    }
+    return json;
+  }
+
+  /// Returns a new [TimelineAssetDescriptionDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static TimelineAssetDescriptionDto? fromJson(dynamic value) {
+    upgradeDto(value, "TimelineAssetDescriptionDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return TimelineAssetDescriptionDto(
+        city: mapValueOfType<String>(json, r'city'),
+        country: mapValueOfType<String>(json, r'country'),
+      );
+    }
+    return null;
+  }
+
+  static List<TimelineAssetDescriptionDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <TimelineAssetDescriptionDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = TimelineAssetDescriptionDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, TimelineAssetDescriptionDto> mapFromJson(dynamic json) {
+    final map = <String, TimelineAssetDescriptionDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = TimelineAssetDescriptionDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of TimelineAssetDescriptionDto-objects as value to a dart map
+  static Map<String, List<TimelineAssetDescriptionDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<TimelineAssetDescriptionDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = TimelineAssetDescriptionDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'city',
+    'country',
+  };
+}
+