chore!: migrate album owner to album_user (#27467)

Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
2026-05-18 03:10:24 +03:00 · 2026-04-22 16:52:23 +02:00
parent dfacde5af8
commit 4bfb8b36c2
75 changed files with 14750 additions and 1104 deletions
@@ -568,6 +568,7 @@ Class | Method | HTTP request | Description
 - [SyncAlbumUserDeleteV1](doc//SyncAlbumUserDeleteV1.md)
 - [SyncAlbumUserV1](doc//SyncAlbumUserV1.md)
 - [SyncAlbumV1](doc//SyncAlbumV1.md)
+ - [SyncAlbumV2](doc//SyncAlbumV2.md)
 - [SyncAssetDeleteV1](doc//SyncAssetDeleteV1.md)
 - [SyncAssetEditDeleteV1](doc//SyncAssetEditDeleteV1.md)
 - [SyncAssetEditV1](doc//SyncAssetEditV1.md)
@@ -316,6 +316,7 @@ part 'model/sync_album_to_asset_v1.dart';
 part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
+part 'model/sync_album_v2.dart';
 part 'model/sync_asset_delete_v1.dart';
 part 'model/sync_asset_edit_delete_v1.dart';
 part 'model/sync_asset_edit_v1.dart';
@@ -678,6 +678,8 @@ class ApiClient {
          return SyncAlbumUserV1.fromJson(value);
        case 'SyncAlbumV1':
          return SyncAlbumV1.fromJson(value);
+        case 'SyncAlbumV2':
+          return SyncAlbumV2.fromJson(value);
        case 'SyncAssetDeleteV1':
          return SyncAssetDeleteV1.fromJson(value);
        case 'SyncAssetEditDeleteV1':
@@ -26,8 +26,6 @@ class AlbumResponseDto {
    required this.isActivityEnabled,
    this.lastModifiedAssetTimestamp,
    this.order,
-    required this.owner,
-    required this.ownerId,
    required this.shared,
    this.startDate,
    required this.updatedAt,
@@ -39,6 +37,7 @@ class AlbumResponseDto {
  /// Thumbnail asset ID
  String? albumThumbnailAssetId;

+  /// First entry is always the album owner. Second entry is the auth user, if it differs from the owner. The rest are ordered alphabetically.
  List<AlbumUserResponseDto> albumUsers;

  /// Number of assets
@@ -90,11 +89,6 @@ class AlbumResponseDto {
  ///
  AssetOrder? order;

-  UserResponseDto owner;
-
-  /// Owner user ID
-  String ownerId;
-
  /// Is shared album
  bool shared;

@@ -125,8 +119,6 @@ class AlbumResponseDto {
    other.isActivityEnabled == isActivityEnabled &&
    other.lastModifiedAssetTimestamp == lastModifiedAssetTimestamp &&
    other.order == order &&
-    other.owner == owner &&
-    other.ownerId == ownerId &&
    other.shared == shared &&
    other.startDate == startDate &&
    other.updatedAt == updatedAt;
@@ -147,14 +139,12 @@ class AlbumResponseDto {
    (isActivityEnabled.hashCode) +
    (lastModifiedAssetTimestamp == null ? 0 : lastModifiedAssetTimestamp!.hashCode) +
    (order == null ? 0 : order!.hashCode) +
-    (owner.hashCode) +
-    (ownerId.hashCode) +
    (shared.hashCode) +
    (startDate == null ? 0 : startDate!.hashCode) +
    (updatedAt.hashCode);

  @override
-  String toString() => 'AlbumResponseDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, albumUsers=$albumUsers, assetCount=$assetCount, contributorCounts=$contributorCounts, createdAt=$createdAt, description=$description, endDate=$endDate, hasSharedLink=$hasSharedLink, id=$id, isActivityEnabled=$isActivityEnabled, lastModifiedAssetTimestamp=$lastModifiedAssetTimestamp, order=$order, owner=$owner, ownerId=$ownerId, shared=$shared, startDate=$startDate, updatedAt=$updatedAt]';
+  String toString() => 'AlbumResponseDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, albumUsers=$albumUsers, assetCount=$assetCount, contributorCounts=$contributorCounts, createdAt=$createdAt, description=$description, endDate=$endDate, hasSharedLink=$hasSharedLink, id=$id, isActivityEnabled=$isActivityEnabled, lastModifiedAssetTimestamp=$lastModifiedAssetTimestamp, order=$order, shared=$shared, startDate=$startDate, updatedAt=$updatedAt]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
@@ -187,8 +177,6 @@ class AlbumResponseDto {
    } else {
    //  json[r'order'] = null;
    }
-      json[r'owner'] = this.owner;
-      json[r'ownerId'] = this.ownerId;
      json[r'shared'] = this.shared;
    if (this.startDate != null) {
      json[r'startDate'] = this.startDate!.toUtc().toIso8601String();
@@ -221,8 +209,6 @@ class AlbumResponseDto {
        isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled')!,
        lastModifiedAssetTimestamp: mapDateTime(json, r'lastModifiedAssetTimestamp', r''),
        order: AssetOrder.fromJson(json[r'order']),
-        owner: UserResponseDto.fromJson(json[r'owner'])!,
-        ownerId: mapValueOfType<String>(json, r'ownerId')!,
        shared: mapValueOfType<bool>(json, r'shared')!,
        startDate: mapDateTime(json, r'startDate', r''),
        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
@@ -282,8 +268,6 @@ class AlbumResponseDto {
    'hasSharedLink',
    'id',
    'isActivityEnabled',
-    'owner',
-    'ownerId',
    'shared',
    'updatedAt',
  };
@@ -24,11 +24,13 @@ class AlbumUserRole {
  String toJson() => value;

  static const editor = AlbumUserRole._(r'editor');
+  static const owner = AlbumUserRole._(r'owner');
  static const viewer = AlbumUserRole._(r'viewer');

  /// List of all possible values in this [enum][AlbumUserRole].
  static const values = <AlbumUserRole>[
    editor,
+    owner,
    viewer,
  ];

@@ -69,6 +71,7 @@ class AlbumUserRoleTypeTransformer {
    if (data != null) {
      switch (data) {
        case r'editor': return AlbumUserRole.editor;
+        case r'owner': return AlbumUserRole.owner;
        case r'viewer': return AlbumUserRole.viewer;
        default:
          if (!allowNull) {
@@ -0,0 +1,170 @@
+//
+// 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 SyncAlbumV2 {
+  /// Returns a new [SyncAlbumV2] instance.
+  SyncAlbumV2({
+    required this.createdAt,
+    required this.description,
+    required this.id,
+    required this.isActivityEnabled,
+    required this.name,
+    required this.order,
+    required this.thumbnailAssetId,
+    required this.updatedAt,
+  });
+
+  /// Created at
+  DateTime createdAt;
+
+  /// Album description
+  String description;
+
+  /// Album ID
+  String id;
+
+  /// Is activity enabled
+  bool isActivityEnabled;
+
+  /// Album name
+  String name;
+
+  AssetOrder order;
+
+  /// Thumbnail asset ID
+  String? thumbnailAssetId;
+
+  /// Updated at
+  DateTime updatedAt;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAlbumV2 &&
+    other.createdAt == createdAt &&
+    other.description == description &&
+    other.id == id &&
+    other.isActivityEnabled == isActivityEnabled &&
+    other.name == name &&
+    other.order == order &&
+    other.thumbnailAssetId == thumbnailAssetId &&
+    other.updatedAt == updatedAt;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (createdAt.hashCode) +
+    (description.hashCode) +
+    (id.hashCode) +
+    (isActivityEnabled.hashCode) +
+    (name.hashCode) +
+    (order.hashCode) +
+    (thumbnailAssetId == null ? 0 : thumbnailAssetId!.hashCode) +
+    (updatedAt.hashCode);
+
+  @override
+  String toString() => 'SyncAlbumV2[createdAt=$createdAt, description=$description, id=$id, isActivityEnabled=$isActivityEnabled, name=$name, order=$order, thumbnailAssetId=$thumbnailAssetId, updatedAt=$updatedAt]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'createdAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+        ? this.createdAt.millisecondsSinceEpoch
+        : this.createdAt.toUtc().toIso8601String();
+      json[r'description'] = this.description;
+      json[r'id'] = this.id;
+      json[r'isActivityEnabled'] = this.isActivityEnabled;
+      json[r'name'] = this.name;
+      json[r'order'] = this.order;
+    if (this.thumbnailAssetId != null) {
+      json[r'thumbnailAssetId'] = this.thumbnailAssetId;
+    } else {
+    //  json[r'thumbnailAssetId'] = null;
+    }
+      json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+        ? this.updatedAt.millisecondsSinceEpoch
+        : this.updatedAt.toUtc().toIso8601String();
+    return json;
+  }
+
+  /// Returns a new [SyncAlbumV2] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAlbumV2? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAlbumV2");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAlbumV2(
+        createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
+        description: mapValueOfType<String>(json, r'description')!,
+        id: mapValueOfType<String>(json, r'id')!,
+        isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled')!,
+        name: mapValueOfType<String>(json, r'name')!,
+        order: AssetOrder.fromJson(json[r'order'])!,
+        thumbnailAssetId: mapValueOfType<String>(json, r'thumbnailAssetId'),
+        updatedAt: mapDateTime(json, r'updatedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAlbumV2> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAlbumV2>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAlbumV2.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAlbumV2> mapFromJson(dynamic json) {
+    final map = <String, SyncAlbumV2>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAlbumV2.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAlbumV2-objects as value to a dart map
+  static Map<String, List<SyncAlbumV2>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAlbumV2>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAlbumV2.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'createdAt',
+    'description',
+    'id',
+    'isActivityEnabled',
+    'name',
+    'order',
+    'thumbnailAssetId',
+    'updatedAt',
+  };
+}
+
@@ -44,6 +44,7 @@ class SyncEntityType {
  static const partnerStackDeleteV1 = SyncEntityType._(r'PartnerStackDeleteV1');
  static const partnerStackV1 = SyncEntityType._(r'PartnerStackV1');
  static const albumV1 = SyncEntityType._(r'AlbumV1');
+  static const albumV2 = SyncEntityType._(r'AlbumV2');
  static const albumDeleteV1 = SyncEntityType._(r'AlbumDeleteV1');
  static const albumUserV1 = SyncEntityType._(r'AlbumUserV1');
  static const albumUserBackfillV1 = SyncEntityType._(r'AlbumUserBackfillV1');
@@ -97,6 +98,7 @@ class SyncEntityType {
    partnerStackDeleteV1,
    partnerStackV1,
    albumV1,
+    albumV2,
    albumDeleteV1,
    albumUserV1,
    albumUserBackfillV1,
@@ -185,6 +187,7 @@ class SyncEntityTypeTypeTransformer {
        case r'PartnerStackDeleteV1': return SyncEntityType.partnerStackDeleteV1;
        case r'PartnerStackV1': return SyncEntityType.partnerStackV1;
        case r'AlbumV1': return SyncEntityType.albumV1;
+        case r'AlbumV2': return SyncEntityType.albumV2;
        case r'AlbumDeleteV1': return SyncEntityType.albumDeleteV1;
        case r'AlbumUserV1': return SyncEntityType.albumUserV1;
        case r'AlbumUserBackfillV1': return SyncEntityType.albumUserBackfillV1;
@@ -24,6 +24,7 @@ class SyncRequestType {
  String toJson() => value;

  static const albumsV1 = SyncRequestType._(r'AlbumsV1');
+  static const albumsV2 = SyncRequestType._(r'AlbumsV2');
  static const albumUsersV1 = SyncRequestType._(r'AlbumUsersV1');
  static const albumToAssetsV1 = SyncRequestType._(r'AlbumToAssetsV1');
  static const albumAssetsV1 = SyncRequestType._(r'AlbumAssetsV1');
@@ -49,6 +50,7 @@ class SyncRequestType {
  /// List of all possible values in this [enum][SyncRequestType].
  static const values = <SyncRequestType>[
    albumsV1,
+    albumsV2,
    albumUsersV1,
    albumToAssetsV1,
    albumAssetsV1,
@@ -109,6 +111,7 @@ class SyncRequestTypeTypeTransformer {
    if (data != null) {
      switch (data) {
        case r'AlbumsV1': return SyncRequestType.albumsV1;
+        case r'AlbumsV2': return SyncRequestType.albumsV2;
        case r'AlbumUsersV1': return SyncRequestType.albumUsersV1;
        case r'AlbumToAssetsV1': return SyncRequestType.albumToAssetsV1;
        case r'AlbumAssetsV1': return SyncRequestType.albumAssetsV1;