Add asset repository and refactor asset service (#540)

* build endpoint to get asset count by month

* Added asset repository

* Added create asset

* get asset by device ID

* Added test for existing methods

* Refactor additional endpoint

* Refactor database api to get curated locations and curated objects

* Refactor get search properties

* Fixed cookies parsing for websocket

* Added API to get asset count by time group

* Remove unused code

mobile/openapi/lib/api.dart

@@ -38,6 +38,8 @@ part 'model/add_assets_dto.dart';
 part 'model/add_users_dto.dart';
 part 'model/admin_signup_response_dto.dart';
 part 'model/album_response_dto.dart';
+part 'model/asset_count_by_time_group_dto.dart';
+part 'model/asset_count_by_time_group_response_dto.dart';
 part 'model/asset_file_upload_response_dto.dart';
 part 'model/asset_response_dto.dart';
 part 'model/asset_type_enum.dart';
@@ -55,6 +57,7 @@ part 'model/delete_asset_status.dart';
 part 'model/device_info_response_dto.dart';
 part 'model/device_type_enum.dart';
 part 'model/exif_response_dto.dart';
+part 'model/get_asset_count_by_time_group_dto.dart';
 part 'model/login_credential_dto.dart';
 part 'model/login_response_dto.dart';
 part 'model/logout_response_dto.dart';
@@ -66,6 +69,7 @@ part 'model/server_version_reponse_dto.dart';
 part 'model/sign_up_dto.dart';
 part 'model/smart_info_response_dto.dart';
 part 'model/thumbnail_format.dart';
+part 'model/time_group_enum.dart';
 part 'model/update_album_dto.dart';
 part 'model/update_device_info_dto.dart';
 part 'model/update_user_dto.dart';

mobile/openapi/lib/api/asset_api.dart

@@ -298,10 +298,57 @@ class AssetApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /asset/searchTerm' operation and returns the [Response].
+  /// Performs an HTTP 'GET /asset/count-by-date' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [GetAssetCountByTimeGroupDto] getAssetCountByTimeGroupDto (required):
+  Future<Response> getAssetCountByTimeGroupWithHttpInfo(GetAssetCountByTimeGroupDto getAssetCountByTimeGroupDto,) async {
+    // ignore: prefer_const_declarations
+    final path = r'/asset/count-by-date';
+
+    // ignore: prefer_final_locals
+    Object? postBody = getAssetCountByTimeGroupDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [GetAssetCountByTimeGroupDto] getAssetCountByTimeGroupDto (required):
+  Future<AssetCountByTimeGroupResponseDto?> getAssetCountByTimeGroup(GetAssetCountByTimeGroupDto getAssetCountByTimeGroupDto,) async {
+    final response = await getAssetCountByTimeGroupWithHttpInfo(getAssetCountByTimeGroupDto,);
+    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), 'AssetCountByTimeGroupResponseDto',) as AssetCountByTimeGroupResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Performs an HTTP 'GET /asset/search-terms' operation and returns the [Response].
   Future<Response> getAssetSearchTermsWithHttpInfo() async {
     // ignore: prefer_const_declarations
-    final path = r'/asset/searchTerm';
+    final path = r'/asset/search-terms';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -398,10 +445,10 @@ class AssetApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /asset/allLocation' operation and returns the [Response].
+  /// Performs an HTTP 'GET /asset/curated-locations' operation and returns the [Response].
   Future<Response> getCuratedLocationsWithHttpInfo() async {
     // ignore: prefer_const_declarations
-    final path = r'/asset/allLocation';
+    final path = r'/asset/curated-locations';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -442,10 +489,10 @@ class AssetApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /asset/allObjects' operation and returns the [Response].
+  /// Performs an HTTP 'GET /asset/curated-objects' operation and returns the [Response].
   Future<Response> getCuratedObjectsWithHttpInfo() async {
     // ignore: prefer_const_declarations
-    final path = r'/asset/allObjects';
+    final path = r'/asset/curated-objects';
 
     // ignore: prefer_final_locals
     Object? postBody;

mobile/openapi/lib/api_client.dart

@@ -200,6 +200,10 @@ class ApiClient {
           return AdminSignupResponseDto.fromJson(value);
         case 'AlbumResponseDto':
           return AlbumResponseDto.fromJson(value);
+        case 'AssetCountByTimeGroupDto':
+          return AssetCountByTimeGroupDto.fromJson(value);
+        case 'AssetCountByTimeGroupResponseDto':
+          return AssetCountByTimeGroupResponseDto.fromJson(value);
         case 'AssetFileUploadResponseDto':
           return AssetFileUploadResponseDto.fromJson(value);
         case 'AssetResponseDto':
@@ -234,6 +238,8 @@ class ApiClient {
           return DeviceTypeEnumTypeTransformer().decode(value);
         case 'ExifResponseDto':
           return ExifResponseDto.fromJson(value);
+        case 'GetAssetCountByTimeGroupDto':
+          return GetAssetCountByTimeGroupDto.fromJson(value);
         case 'LoginCredentialDto':
           return LoginCredentialDto.fromJson(value);
         case 'LoginResponseDto':
@@ -256,6 +262,8 @@ class ApiClient {
           return SmartInfoResponseDto.fromJson(value);
         case 'ThumbnailFormat':
           return ThumbnailFormatTypeTransformer().decode(value);
+        case 'TimeGroupEnum':
+          return TimeGroupEnumTypeTransformer().decode(value);
         case 'UpdateAlbumDto':
           return UpdateAlbumDto.fromJson(value);
         case 'UpdateDeviceInfoDto':

mobile/openapi/lib/api_helper.dart

@@ -67,6 +67,9 @@ String parameterToString(dynamic value) {
   if (value is ThumbnailFormat) {
     return ThumbnailFormatTypeTransformer().encode(value).toString();
   }
+  if (value is TimeGroupEnum) {
+    return TimeGroupEnumTypeTransformer().encode(value).toString();
+  }
   return value.toString();
 }
 

mobile/openapi/lib/model/asset_count_by_time_group_dto.dart

@@ -0,0 +1,119 @@
+//
+// 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 AssetCountByTimeGroupDto {
+  /// Returns a new [AssetCountByTimeGroupDto] instance.
+  AssetCountByTimeGroupDto({
+    required this.timeGroup,
+    required this.count,
+  });
+
+  String timeGroup;
+
+  int count;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetCountByTimeGroupDto &&
+     other.timeGroup == timeGroup &&
+     other.count == count;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (timeGroup.hashCode) +
+    (count.hashCode);
+
+  @override
+  String toString() => 'AssetCountByTimeGroupDto[timeGroup=$timeGroup, count=$count]';
+
+  Map<String, dynamic> toJson() {
+    final _json = <String, dynamic>{};
+      _json[r'timeGroup'] = timeGroup;
+      _json[r'count'] = count;
+    return _json;
+  }
+
+  /// Returns a new [AssetCountByTimeGroupDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetCountByTimeGroupDto? fromJson(dynamic value) {
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        requiredKeys.forEach((key) {
+          assert(json.containsKey(key), 'Required key "AssetCountByTimeGroupDto[$key]" is missing from JSON.');
+          assert(json[key] != null, 'Required key "AssetCountByTimeGroupDto[$key]" has a null value in JSON.');
+        });
+        return true;
+      }());
+
+      return AssetCountByTimeGroupDto(
+        timeGroup: mapValueOfType<String>(json, r'timeGroup')!,
+        count: mapValueOfType<int>(json, r'count')!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetCountByTimeGroupDto>? listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetCountByTimeGroupDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetCountByTimeGroupDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetCountByTimeGroupDto> mapFromJson(dynamic json) {
+    final map = <String, AssetCountByTimeGroupDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetCountByTimeGroupDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetCountByTimeGroupDto-objects as value to a dart map
+  static Map<String, List<AssetCountByTimeGroupDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetCountByTimeGroupDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetCountByTimeGroupDto.listFromJson(entry.value, growable: growable,);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'timeGroup',
+    'count',
+  };
+}
+

mobile/openapi/lib/model/asset_count_by_time_group_response_dto.dart

@@ -0,0 +1,119 @@
+//
+// 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 AssetCountByTimeGroupResponseDto {
+  /// Returns a new [AssetCountByTimeGroupResponseDto] instance.
+  AssetCountByTimeGroupResponseDto({
+    required this.totalAssets,
+    this.groups = const [],
+  });
+
+  int totalAssets;
+
+  List<AssetCountByTimeGroupDto> groups;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetCountByTimeGroupResponseDto &&
+     other.totalAssets == totalAssets &&
+     other.groups == groups;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (totalAssets.hashCode) +
+    (groups.hashCode);
+
+  @override
+  String toString() => 'AssetCountByTimeGroupResponseDto[totalAssets=$totalAssets, groups=$groups]';
+
+  Map<String, dynamic> toJson() {
+    final _json = <String, dynamic>{};
+      _json[r'totalAssets'] = totalAssets;
+      _json[r'groups'] = groups;
+    return _json;
+  }
+
+  /// Returns a new [AssetCountByTimeGroupResponseDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetCountByTimeGroupResponseDto? fromJson(dynamic value) {
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        requiredKeys.forEach((key) {
+          assert(json.containsKey(key), 'Required key "AssetCountByTimeGroupResponseDto[$key]" is missing from JSON.');
+          assert(json[key] != null, 'Required key "AssetCountByTimeGroupResponseDto[$key]" has a null value in JSON.');
+        });
+        return true;
+      }());
+
+      return AssetCountByTimeGroupResponseDto(
+        totalAssets: mapValueOfType<int>(json, r'totalAssets')!,
+        groups: AssetCountByTimeGroupDto.listFromJson(json[r'groups'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetCountByTimeGroupResponseDto>? listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetCountByTimeGroupResponseDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetCountByTimeGroupResponseDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetCountByTimeGroupResponseDto> mapFromJson(dynamic json) {
+    final map = <String, AssetCountByTimeGroupResponseDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetCountByTimeGroupResponseDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetCountByTimeGroupResponseDto-objects as value to a dart map
+  static Map<String, List<AssetCountByTimeGroupResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetCountByTimeGroupResponseDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetCountByTimeGroupResponseDto.listFromJson(entry.value, growable: growable,);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'totalAssets',
+    'groups',
+  };
+}
+

mobile/openapi/lib/model/get_asset_count_by_time_group_dto.dart

@@ -0,0 +1,111 @@
+//
+// 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 GetAssetCountByTimeGroupDto {
+  /// Returns a new [GetAssetCountByTimeGroupDto] instance.
+  GetAssetCountByTimeGroupDto({
+    required this.timeGroup,
+  });
+
+  TimeGroupEnum timeGroup;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is GetAssetCountByTimeGroupDto &&
+     other.timeGroup == timeGroup;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (timeGroup.hashCode);
+
+  @override
+  String toString() => 'GetAssetCountByTimeGroupDto[timeGroup=$timeGroup]';
+
+  Map<String, dynamic> toJson() {
+    final _json = <String, dynamic>{};
+      _json[r'timeGroup'] = timeGroup;
+    return _json;
+  }
+
+  /// Returns a new [GetAssetCountByTimeGroupDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static GetAssetCountByTimeGroupDto? fromJson(dynamic value) {
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        requiredKeys.forEach((key) {
+          assert(json.containsKey(key), 'Required key "GetAssetCountByTimeGroupDto[$key]" is missing from JSON.');
+          assert(json[key] != null, 'Required key "GetAssetCountByTimeGroupDto[$key]" has a null value in JSON.');
+        });
+        return true;
+      }());
+
+      return GetAssetCountByTimeGroupDto(
+        timeGroup: TimeGroupEnum.fromJson(json[r'timeGroup'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<GetAssetCountByTimeGroupDto>? listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <GetAssetCountByTimeGroupDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = GetAssetCountByTimeGroupDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, GetAssetCountByTimeGroupDto> mapFromJson(dynamic json) {
+    final map = <String, GetAssetCountByTimeGroupDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = GetAssetCountByTimeGroupDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of GetAssetCountByTimeGroupDto-objects as value to a dart map
+  static Map<String, List<GetAssetCountByTimeGroupDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<GetAssetCountByTimeGroupDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = GetAssetCountByTimeGroupDto.listFromJson(entry.value, growable: growable,);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'timeGroup',
+  };
+}
+

mobile/openapi/lib/model/time_group_enum.dart

@@ -0,0 +1,85 @@
+//
+// 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 TimeGroupEnum {
+  /// Instantiate a new enum with the provided [value].
+  const TimeGroupEnum._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const day = TimeGroupEnum._(r'day');
+  static const month = TimeGroupEnum._(r'month');
+
+  /// List of all possible values in this [enum][TimeGroupEnum].
+  static const values = <TimeGroupEnum>[
+    day,
+    month,
+  ];
+
+  static TimeGroupEnum? fromJson(dynamic value) => TimeGroupEnumTypeTransformer().decode(value);
+
+  static List<TimeGroupEnum>? listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <TimeGroupEnum>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = TimeGroupEnum.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [TimeGroupEnum] to String,
+/// and [decode] dynamic data back to [TimeGroupEnum].
+class TimeGroupEnumTypeTransformer {
+  factory TimeGroupEnumTypeTransformer() => _instance ??= const TimeGroupEnumTypeTransformer._();
+
+  const TimeGroupEnumTypeTransformer._();
+
+  String encode(TimeGroupEnum data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a TimeGroupEnum.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  TimeGroupEnum? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data.toString()) {
+        case r'day': return TimeGroupEnum.day;
+        case r'month': return TimeGroupEnum.month;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [TimeGroupEnumTypeTransformer] instance.
+  static TimeGroupEnumTypeTransformer? _instance;
+}
+