fix: handle edited assets for merged/local assets

mobile/openapi/lib/api.dart

@@ -306,6 +306,8 @@ part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
 part 'model/sync_asset_delete_v1.dart';
+part 'model/sync_asset_edit_delete_v1.dart';
+part 'model/sync_asset_edit_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';

mobile/openapi/lib/api_client.dart

@@ -660,6 +660,10 @@ class ApiClient {
           return SyncAlbumV1.fromJson(value);
         case 'SyncAssetDeleteV1':
           return SyncAssetDeleteV1.fromJson(value);
+        case 'SyncAssetEditDeleteV1':
+          return SyncAssetEditDeleteV1.fromJson(value);
+        case 'SyncAssetEditV1':
+          return SyncAssetEditV1.fromJson(value);
         case 'SyncAssetExifV1':
           return SyncAssetExifV1.fromJson(value);
         case 'SyncAssetFaceDeleteV1':

mobile/openapi/lib/model/sync_asset_edit_delete_v1.dart

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

mobile/openapi/lib/model/sync_asset_edit_v1.dart

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

mobile/openapi/lib/model/sync_entity_type.dart

@@ -28,6 +28,8 @@ class SyncEntityType {
   static const userDeleteV1 = SyncEntityType._(r'UserDeleteV1');
   static const assetV1 = SyncEntityType._(r'AssetV1');
   static const assetDeleteV1 = SyncEntityType._(r'AssetDeleteV1');
+  static const assetEditV1 = SyncEntityType._(r'AssetEditV1');
+  static const assetEditDeleteV1 = SyncEntityType._(r'AssetEditDeleteV1');
   static const assetExifV1 = SyncEntityType._(r'AssetExifV1');
   static const assetMetadataV1 = SyncEntityType._(r'AssetMetadataV1');
   static const assetMetadataDeleteV1 = SyncEntityType._(r'AssetMetadataDeleteV1');
@@ -78,6 +80,8 @@ class SyncEntityType {
     userDeleteV1,
     assetV1,
     assetDeleteV1,
+    assetEditV1,
+    assetEditDeleteV1,
     assetExifV1,
     assetMetadataV1,
     assetMetadataDeleteV1,
@@ -163,6 +167,8 @@ class SyncEntityTypeTypeTransformer {
         case r'UserDeleteV1': return SyncEntityType.userDeleteV1;
         case r'AssetV1': return SyncEntityType.assetV1;
         case r'AssetDeleteV1': return SyncEntityType.assetDeleteV1;
+        case r'AssetEditV1': return SyncEntityType.assetEditV1;
+        case r'AssetEditDeleteV1': return SyncEntityType.assetEditDeleteV1;
         case r'AssetExifV1': return SyncEntityType.assetExifV1;
         case r'AssetMetadataV1': return SyncEntityType.assetMetadataV1;
         case r'AssetMetadataDeleteV1': return SyncEntityType.assetMetadataDeleteV1;

mobile/openapi/lib/model/sync_request_type.dart

@@ -29,6 +29,7 @@ class SyncRequestType {
   static const albumAssetsV1 = SyncRequestType._(r'AlbumAssetsV1');
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
   static const assetsV1 = SyncRequestType._(r'AssetsV1');
+  static const assetEditsV1 = SyncRequestType._(r'AssetEditsV1');
   static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
   static const assetMetadataV1 = SyncRequestType._(r'AssetMetadataV1');
   static const authUsersV1 = SyncRequestType._(r'AuthUsersV1');
@@ -52,6 +53,7 @@ class SyncRequestType {
     albumAssetsV1,
     albumAssetExifsV1,
     assetsV1,
+    assetEditsV1,
     assetExifsV1,
     assetMetadataV1,
     authUsersV1,
@@ -110,6 +112,7 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumAssetsV1': return SyncRequestType.albumAssetsV1;
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         case r'AssetsV1': return SyncRequestType.assetsV1;
+        case r'AssetEditsV1': return SyncRequestType.assetEditsV1;
         case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
         case r'AssetMetadataV1': return SyncRequestType.assetMetadataV1;
         case r'AuthUsersV1': return SyncRequestType.authUsersV1;