refactor!: remove asset faces from AssetResponseDto (#27779)

* refactor!: remove faces from `people` in AssetResposnseDto

* chore: tests

* chore: e2e generator

* chore: code review readonly

* chore: code review changes

* chore: cleanup

* fix: openapi

* chore: format

---------

Co-authored-by: Jason Rasmussen <jason@rasm.me>

mobile/openapi/README.md

@@ -357,7 +357,6 @@ Class | Method | HTTP request | Description
  - [AssetFaceResponseDto](doc//AssetFaceResponseDto.md)
  - [AssetFaceUpdateDto](doc//AssetFaceUpdateDto.md)
  - [AssetFaceUpdateItem](doc//AssetFaceUpdateItem.md)
- - [AssetFaceWithoutPersonResponseDto](doc//AssetFaceWithoutPersonResponseDto.md)
  - [AssetIdErrorReason](doc//AssetIdErrorReason.md)
  - [AssetIdsDto](doc//AssetIdsDto.md)
  - [AssetIdsResponseDto](doc//AssetIdsResponseDto.md)
@@ -483,7 +482,6 @@ Class | Method | HTTP request | Description
  - [PersonResponseDto](doc//PersonResponseDto.md)
  - [PersonStatisticsResponseDto](doc//PersonStatisticsResponseDto.md)
  - [PersonUpdateDto](doc//PersonUpdateDto.md)
- - [PersonWithFacesResponseDto](doc//PersonWithFacesResponseDto.md)
  - [PinCodeChangeDto](doc//PinCodeChangeDto.md)
  - [PinCodeResetDto](doc//PinCodeResetDto.md)
  - [PinCodeSetupDto](doc//PinCodeSetupDto.md)

mobile/openapi/lib/api.dart

@@ -105,7 +105,6 @@ part 'model/asset_face_delete_dto.dart';
 part 'model/asset_face_response_dto.dart';
 part 'model/asset_face_update_dto.dart';
 part 'model/asset_face_update_item.dart';
-part 'model/asset_face_without_person_response_dto.dart';
 part 'model/asset_id_error_reason.dart';
 part 'model/asset_ids_dto.dart';
 part 'model/asset_ids_response_dto.dart';
@@ -231,7 +230,6 @@ part 'model/person_create_dto.dart';
 part 'model/person_response_dto.dart';
 part 'model/person_statistics_response_dto.dart';
 part 'model/person_update_dto.dart';
-part 'model/person_with_faces_response_dto.dart';
 part 'model/pin_code_change_dto.dart';
 part 'model/pin_code_reset_dto.dart';
 part 'model/pin_code_setup_dto.dart';

mobile/openapi/lib/api_client.dart

@@ -256,8 +256,6 @@ class ApiClient {
           return AssetFaceUpdateDto.fromJson(value);
         case 'AssetFaceUpdateItem':
           return AssetFaceUpdateItem.fromJson(value);
-        case 'AssetFaceWithoutPersonResponseDto':
-          return AssetFaceWithoutPersonResponseDto.fromJson(value);
         case 'AssetIdErrorReason':
           return AssetIdErrorReasonTypeTransformer().decode(value);
         case 'AssetIdsDto':
@@ -508,8 +506,6 @@ class ApiClient {
           return PersonStatisticsResponseDto.fromJson(value);
         case 'PersonUpdateDto':
           return PersonUpdateDto.fromJson(value);
-        case 'PersonWithFacesResponseDto':
-          return PersonWithFacesResponseDto.fromJson(value);
         case 'PinCodeChangeDto':
           return PinCodeChangeDto.fromJson(value);
         case 'PinCodeResetDto':

mobile/openapi/lib/model/asset_face_without_person_response_dto.dart

@@ -1,189 +0,0 @@
-//
-// 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 AssetFaceWithoutPersonResponseDto {
-  /// Returns a new [AssetFaceWithoutPersonResponseDto] instance.
-  AssetFaceWithoutPersonResponseDto({
-    required this.boundingBoxX1,
-    required this.boundingBoxX2,
-    required this.boundingBoxY1,
-    required this.boundingBoxY2,
-    required this.id,
-    required this.imageHeight,
-    required this.imageWidth,
-    this.sourceType,
-  });
-
-  /// Bounding box X1 coordinate
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int boundingBoxX1;
-
-  /// Bounding box X2 coordinate
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int boundingBoxX2;
-
-  /// Bounding box Y1 coordinate
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int boundingBoxY1;
-
-  /// Bounding box Y2 coordinate
-  ///
-  /// Minimum value: -9007199254740991
-  /// Maximum value: 9007199254740991
-  int boundingBoxY2;
-
-  /// Face ID
-  String id;
-
-  /// Image height in pixels
-  ///
-  /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int imageHeight;
-
-  /// Image width in pixels
-  ///
-  /// Minimum value: 0
-  /// Maximum value: 9007199254740991
-  int imageWidth;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  SourceType? sourceType;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetFaceWithoutPersonResponseDto &&
-    other.boundingBoxX1 == boundingBoxX1 &&
-    other.boundingBoxX2 == boundingBoxX2 &&
-    other.boundingBoxY1 == boundingBoxY1 &&
-    other.boundingBoxY2 == boundingBoxY2 &&
-    other.id == id &&
-    other.imageHeight == imageHeight &&
-    other.imageWidth == imageWidth &&
-    other.sourceType == sourceType;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (boundingBoxX1.hashCode) +
-    (boundingBoxX2.hashCode) +
-    (boundingBoxY1.hashCode) +
-    (boundingBoxY2.hashCode) +
-    (id.hashCode) +
-    (imageHeight.hashCode) +
-    (imageWidth.hashCode) +
-    (sourceType == null ? 0 : sourceType!.hashCode);
-
-  @override
-  String toString() => 'AssetFaceWithoutPersonResponseDto[boundingBoxX1=$boundingBoxX1, boundingBoxX2=$boundingBoxX2, boundingBoxY1=$boundingBoxY1, boundingBoxY2=$boundingBoxY2, id=$id, imageHeight=$imageHeight, imageWidth=$imageWidth, sourceType=$sourceType]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'boundingBoxX1'] = this.boundingBoxX1;
-      json[r'boundingBoxX2'] = this.boundingBoxX2;
-      json[r'boundingBoxY1'] = this.boundingBoxY1;
-      json[r'boundingBoxY2'] = this.boundingBoxY2;
-      json[r'id'] = this.id;
-      json[r'imageHeight'] = this.imageHeight;
-      json[r'imageWidth'] = this.imageWidth;
-    if (this.sourceType != null) {
-      json[r'sourceType'] = this.sourceType;
-    } else {
-    //  json[r'sourceType'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [AssetFaceWithoutPersonResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static AssetFaceWithoutPersonResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "AssetFaceWithoutPersonResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return AssetFaceWithoutPersonResponseDto(
-        boundingBoxX1: mapValueOfType<int>(json, r'boundingBoxX1')!,
-        boundingBoxX2: mapValueOfType<int>(json, r'boundingBoxX2')!,
-        boundingBoxY1: mapValueOfType<int>(json, r'boundingBoxY1')!,
-        boundingBoxY2: mapValueOfType<int>(json, r'boundingBoxY2')!,
-        id: mapValueOfType<String>(json, r'id')!,
-        imageHeight: mapValueOfType<int>(json, r'imageHeight')!,
-        imageWidth: mapValueOfType<int>(json, r'imageWidth')!,
-        sourceType: SourceType.fromJson(json[r'sourceType']),
-      );
-    }
-    return null;
-  }
-
-  static List<AssetFaceWithoutPersonResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetFaceWithoutPersonResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = AssetFaceWithoutPersonResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, AssetFaceWithoutPersonResponseDto> mapFromJson(dynamic json) {
-    final map = <String, AssetFaceWithoutPersonResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = AssetFaceWithoutPersonResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of AssetFaceWithoutPersonResponseDto-objects as value to a dart map
-  static Map<String, List<AssetFaceWithoutPersonResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetFaceWithoutPersonResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = AssetFaceWithoutPersonResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'boundingBoxX1',
-    'boundingBoxX2',
-    'boundingBoxY1',
-    'boundingBoxY2',
-    'id',
-    'imageHeight',
-    'imageWidth',
-  };
-}
-

mobile/openapi/lib/model/asset_response_dto.dart

@@ -42,7 +42,6 @@ class AssetResponseDto {
     this.tags = const [],
     required this.thumbhash,
     required this.type,
-    this.unassignedFaces = const [],
     required this.updatedAt,
     required this.visibility,
     required this.width,
@@ -139,7 +138,7 @@ class AssetResponseDto {
   /// Owner user ID
   String ownerId;
 
-  List<PersonWithFacesResponseDto> people;
+  List<PersonResponseDto> people;
 
   /// Is resized
   ///
@@ -159,8 +158,6 @@ class AssetResponseDto {
 
   AssetTypeEnum type;
 
-  List<AssetFaceWithoutPersonResponseDto> unassignedFaces;
-
   /// The UTC timestamp when the asset record was last updated in the database. This is automatically maintained by the database and reflects when any field in the asset was last modified.
   DateTime updatedAt;
 
@@ -203,7 +200,6 @@ class AssetResponseDto {
     _deepEquality.equals(other.tags, tags) &&
     other.thumbhash == thumbhash &&
     other.type == type &&
-    _deepEquality.equals(other.unassignedFaces, unassignedFaces) &&
     other.updatedAt == updatedAt &&
     other.visibility == visibility &&
     other.width == width;
@@ -240,13 +236,12 @@ class AssetResponseDto {
     (tags.hashCode) +
     (thumbhash == null ? 0 : thumbhash!.hashCode) +
     (type.hashCode) +
-    (unassignedFaces.hashCode) +
     (updatedAt.hashCode) +
     (visibility.hashCode) +
     (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isEdited=$isEdited, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
+  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isEdited=$isEdited, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -323,7 +318,6 @@ class AssetResponseDto {
     //  json[r'thumbhash'] = null;
     }
       json[r'type'] = this.type;
-      json[r'unassignedFaces'] = this.unassignedFaces;
       json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
       json[r'visibility'] = this.visibility;
     if (this.width != null) {
@@ -366,13 +360,12 @@ class AssetResponseDto {
         originalPath: mapValueOfType<String>(json, r'originalPath')!,
         owner: UserResponseDto.fromJson(json[r'owner']),
         ownerId: mapValueOfType<String>(json, r'ownerId')!,
-        people: PersonWithFacesResponseDto.listFromJson(json[r'people']),
+        people: PersonResponseDto.listFromJson(json[r'people']),
         resized: mapValueOfType<bool>(json, r'resized'),
         stack: AssetStackResponseDto.fromJson(json[r'stack']),
         tags: TagResponseDto.listFromJson(json[r'tags']),
         thumbhash: mapValueOfType<String>(json, r'thumbhash'),
         type: AssetTypeEnum.fromJson(json[r'type'])!,
-        unassignedFaces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'unassignedFaces']),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
         width: mapValueOfType<int>(json, r'width'),

mobile/openapi/lib/model/person_with_faces_response_dto.dart

@@ -1,202 +0,0 @@
-//
-// 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 PersonWithFacesResponseDto {
-  /// Returns a new [PersonWithFacesResponseDto] instance.
-  PersonWithFacesResponseDto({
-    required this.birthDate,
-    this.color,
-    this.faces = const [],
-    required this.id,
-    this.isFavorite,
-    required this.isHidden,
-    required this.name,
-    required this.thumbnailPath,
-    this.updatedAt,
-  });
-
-  /// Person date of birth
-  DateTime? birthDate;
-
-  /// Person color (hex)
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? color;
-
-  List<AssetFaceWithoutPersonResponseDto> faces;
-
-  /// Person ID
-  String id;
-
-  /// Is favorite
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  bool? isFavorite;
-
-  /// Is hidden
-  bool isHidden;
-
-  /// Person name
-  String name;
-
-  /// Thumbnail path
-  String thumbnailPath;
-
-  /// Last update date
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  DateTime? updatedAt;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is PersonWithFacesResponseDto &&
-    other.birthDate == birthDate &&
-    other.color == color &&
-    _deepEquality.equals(other.faces, faces) &&
-    other.id == id &&
-    other.isFavorite == isFavorite &&
-    other.isHidden == isHidden &&
-    other.name == name &&
-    other.thumbnailPath == thumbnailPath &&
-    other.updatedAt == updatedAt;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (birthDate == null ? 0 : birthDate!.hashCode) +
-    (color == null ? 0 : color!.hashCode) +
-    (faces.hashCode) +
-    (id.hashCode) +
-    (isFavorite == null ? 0 : isFavorite!.hashCode) +
-    (isHidden.hashCode) +
-    (name.hashCode) +
-    (thumbnailPath.hashCode) +
-    (updatedAt == null ? 0 : updatedAt!.hashCode);
-
-  @override
-  String toString() => 'PersonWithFacesResponseDto[birthDate=$birthDate, color=$color, faces=$faces, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (this.birthDate != null) {
-      json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
-    } else {
-    //  json[r'birthDate'] = null;
-    }
-    if (this.color != null) {
-      json[r'color'] = this.color;
-    } else {
-    //  json[r'color'] = null;
-    }
-      json[r'faces'] = this.faces;
-      json[r'id'] = this.id;
-    if (this.isFavorite != null) {
-      json[r'isFavorite'] = this.isFavorite;
-    } else {
-    //  json[r'isFavorite'] = null;
-    }
-      json[r'isHidden'] = this.isHidden;
-      json[r'name'] = this.name;
-      json[r'thumbnailPath'] = this.thumbnailPath;
-    if (this.updatedAt != null) {
-      json[r'updatedAt'] = this.updatedAt!.toUtc().toIso8601String();
-    } else {
-    //  json[r'updatedAt'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [PersonWithFacesResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static PersonWithFacesResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "PersonWithFacesResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return PersonWithFacesResponseDto(
-        birthDate: mapDateTime(json, r'birthDate', r''),
-        color: mapValueOfType<String>(json, r'color'),
-        faces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'faces']),
-        id: mapValueOfType<String>(json, r'id')!,
-        isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
-        isHidden: mapValueOfType<bool>(json, r'isHidden')!,
-        name: mapValueOfType<String>(json, r'name')!,
-        thumbnailPath: mapValueOfType<String>(json, r'thumbnailPath')!,
-        updatedAt: mapDateTime(json, r'updatedAt', r''),
-      );
-    }
-    return null;
-  }
-
-  static List<PersonWithFacesResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <PersonWithFacesResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = PersonWithFacesResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, PersonWithFacesResponseDto> mapFromJson(dynamic json) {
-    final map = <String, PersonWithFacesResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = PersonWithFacesResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of PersonWithFacesResponseDto-objects as value to a dart map
-  static Map<String, List<PersonWithFacesResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<PersonWithFacesResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = PersonWithFacesResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'birthDate',
-    'faces',
-    'id',
-    'isHidden',
-    'name',
-    'thumbnailPath',
-  };
-}
-