feat(web): show partners assets on the main timeline (#4933)

mobile/openapi/lib/api.dart

@@ -124,6 +124,7 @@ part 'model/o_auth_authorize_response_dto.dart';
 part 'model/o_auth_callback_dto.dart';
 part 'model/o_auth_config_dto.dart';
 part 'model/o_auth_config_response_dto.dart';
+part 'model/partner_response_dto.dart';
 part 'model/path_entity_type.dart';
 part 'model/path_type.dart';
 part 'model/people_response_dto.dart';
@@ -186,6 +187,7 @@ part 'model/transcode_policy.dart';
 part 'model/update_album_dto.dart';
 part 'model/update_asset_dto.dart';
 part 'model/update_library_dto.dart';
+part 'model/update_partner_dto.dart';
 part 'model/update_stack_parent_dto.dart';
 part 'model/update_tag_dto.dart';
 part 'model/update_user_dto.dart';

mobile/openapi/lib/api/asset_api.dart

@@ -997,8 +997,10 @@ class AssetApi {
   ///
   /// * [bool] withStacked:
   ///
+  /// * [bool] withPartners:
+  ///
   /// * [String] key:
-  Future<Response> getTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
+  Future<Response> getTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, bool? withPartners, String? key, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/time-bucket';
 
@@ -1030,6 +1032,9 @@ class AssetApi {
     }
     if (withStacked != null) {
       queryParams.addAll(_queryParams('', 'withStacked', withStacked));
+    }
+    if (withPartners != null) {
+      queryParams.addAll(_queryParams('', 'withPartners', withPartners));
     }
       queryParams.addAll(_queryParams('', 'timeBucket', timeBucket));
     if (key != null) {
@@ -1070,9 +1075,11 @@ class AssetApi {
   ///
   /// * [bool] withStacked:
   ///
+  /// * [bool] withPartners:
+  ///
   /// * [String] key:
-  Future<List<AssetResponseDto>?> getTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
-    final response = await getTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, );
+  Future<List<AssetResponseDto>?> getTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, bool? withPartners, String? key, }) async {
+    final response = await getTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, withPartners: withPartners, key: key, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1108,8 +1115,10 @@ class AssetApi {
   ///
   /// * [bool] withStacked:
   ///
+  /// * [bool] withPartners:
+  ///
   /// * [String] key:
-  Future<Response> getTimeBucketsWithHttpInfo(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
+  Future<Response> getTimeBucketsWithHttpInfo(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, bool? withPartners, String? key, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/time-buckets';
 
@@ -1142,6 +1151,9 @@ class AssetApi {
     if (withStacked != null) {
       queryParams.addAll(_queryParams('', 'withStacked', withStacked));
     }
+    if (withPartners != null) {
+      queryParams.addAll(_queryParams('', 'withPartners', withPartners));
+    }
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
@@ -1178,9 +1190,11 @@ class AssetApi {
   ///
   /// * [bool] withStacked:
   ///
+  /// * [bool] withPartners:
+  ///
   /// * [String] key:
-  Future<List<TimeBucketResponseDto>?> getTimeBuckets(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
-    final response = await getTimeBucketsWithHttpInfo(size,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, );
+  Future<List<TimeBucketResponseDto>?> getTimeBuckets(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, bool? withPartners, String? key, }) async {
+    final response = await getTimeBucketsWithHttpInfo(size,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, withPartners: withPartners, key: key, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/partner_api.dart

@@ -49,7 +49,7 @@ class PartnerApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<UserResponseDto?> createPartner(String id,) async {
+  Future<PartnerResponseDto?> createPartner(String id,) async {
     final response = await createPartnerWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -58,7 +58,7 @@ class PartnerApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PartnerResponseDto',) as PartnerResponseDto;
     
     }
     return null;
@@ -98,7 +98,7 @@ class PartnerApi {
   /// Parameters:
   ///
   /// * [String] direction (required):
-  Future<List<UserResponseDto>?> getPartners(String direction,) async {
+  Future<List<PartnerResponseDto>?> getPartners(String direction,) async {
     final response = await getPartnersWithHttpInfo(direction,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -108,8 +108,8 @@ class PartnerApi {
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
       final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<UserResponseDto>') as List)
-        .cast<UserResponseDto>()
+      return (await apiClient.deserializeAsync(responseBody, 'List<PartnerResponseDto>') as List)
+        .cast<PartnerResponseDto>()
         .toList();
 
     }
@@ -155,4 +155,56 @@ class PartnerApi {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
   }
+
+  /// Performs an HTTP 'PUT /partner/{id}' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [UpdatePartnerDto] updatePartnerDto (required):
+  Future<Response> updatePartnerWithHttpInfo(String id, UpdatePartnerDto updatePartnerDto,) async {
+    // ignore: prefer_const_declarations
+    final path = r'/partner/{id}'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody = updatePartnerDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'PUT',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [UpdatePartnerDto] updatePartnerDto (required):
+  Future<PartnerResponseDto?> updatePartner(String id, UpdatePartnerDto updatePartnerDto,) async {
+    final response = await updatePartnerWithHttpInfo(id, updatePartnerDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PartnerResponseDto',) as PartnerResponseDto;
+    
+    }
+    return null;
+  }
 }

mobile/openapi/lib/api_client.dart

@@ -337,6 +337,8 @@ class ApiClient {
           return OAuthConfigDto.fromJson(value);
         case 'OAuthConfigResponseDto':
           return OAuthConfigResponseDto.fromJson(value);
+        case 'PartnerResponseDto':
+          return PartnerResponseDto.fromJson(value);
         case 'PathEntityType':
           return PathEntityTypeTypeTransformer().decode(value);
         case 'PathType':
@@ -461,6 +463,8 @@ class ApiClient {
           return UpdateAssetDto.fromJson(value);
         case 'UpdateLibraryDto':
           return UpdateLibraryDto.fromJson(value);
+        case 'UpdatePartnerDto':
+          return UpdatePartnerDto.fromJson(value);
         case 'UpdateStackParentDto':
           return UpdateStackParentDto.fromJson(value);
         case 'UpdateTagDto':

mobile/openapi/lib/model/partner_response_dto.dart

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

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