diff --git a/lib/features/registration/models/location_model.dart b/lib/features/registration/models/location_model.dart index 3632a3e4..cc6b107e 100644 --- a/lib/features/registration/models/location_model.dart +++ b/lib/features/registration/models/location_model.dart @@ -1,15 +1,15 @@ import 'package:freezed_annotation/freezed_annotation.dart'; part 'location_model.g.dart'; + part 'location_model.freezed.dart'; @freezed class LocationModel with _$LocationModel { const factory LocationModel({ - required Map locations, - @JsonKey(name: 'response_body') - required String responseBody, -}) = _LocationModel; + required List locations, + @JsonKey(name: 'response_body') required String responseBody, + }) = _LocationModel; factory LocationModel.fromJson(Map json) => _$LocationModelFromJson(json); -} \ No newline at end of file +} diff --git a/lib/features/registration/models/location_model.freezed.dart b/lib/features/registration/models/location_model.freezed.dart index 71cbcb49..f640ca2e 100644 --- a/lib/features/registration/models/location_model.freezed.dart +++ b/lib/features/registration/models/location_model.freezed.dart @@ -20,7 +20,7 @@ LocationModel _$LocationModelFromJson(Map json) { /// @nodoc mixin _$LocationModel { - Map get locations => throw _privateConstructorUsedError; + List get locations => throw _privateConstructorUsedError; @JsonKey(name: 'response_body') String get responseBody => throw _privateConstructorUsedError; @@ -37,7 +37,7 @@ abstract class $LocationModelCopyWith<$Res> { _$LocationModelCopyWithImpl<$Res, LocationModel>; @useResult $Res call( - {Map locations, + {List locations, @JsonKey(name: 'response_body') String responseBody}); } @@ -61,7 +61,7 @@ class _$LocationModelCopyWithImpl<$Res, $Val extends LocationModel> locations: null == locations ? _value.locations : locations // ignore: cast_nullable_to_non_nullable - as Map, + as List, responseBody: null == responseBody ? _value.responseBody : responseBody // ignore: cast_nullable_to_non_nullable @@ -79,7 +79,7 @@ abstract class _$$LocationModelImplCopyWith<$Res> @override @useResult $Res call( - {Map locations, + {List locations, @JsonKey(name: 'response_body') String responseBody}); } @@ -101,7 +101,7 @@ class __$$LocationModelImplCopyWithImpl<$Res> locations: null == locations ? _value._locations : locations // ignore: cast_nullable_to_non_nullable - as Map, + as List, responseBody: null == responseBody ? _value.responseBody : responseBody // ignore: cast_nullable_to_non_nullable @@ -114,19 +114,19 @@ class __$$LocationModelImplCopyWithImpl<$Res> @JsonSerializable() class _$LocationModelImpl implements _LocationModel { const _$LocationModelImpl( - {required final Map locations, + {required final List locations, @JsonKey(name: 'response_body') required this.responseBody}) : _locations = locations; factory _$LocationModelImpl.fromJson(Map json) => _$$LocationModelImplFromJson(json); - final Map _locations; + final List _locations; @override - Map get locations { - if (_locations is EqualUnmodifiableMapView) return _locations; + List get locations { + if (_locations is EqualUnmodifiableListView) return _locations; // ignore: implicit_dynamic_type - return EqualUnmodifiableMapView(_locations); + return EqualUnmodifiableListView(_locations); } @override @@ -170,7 +170,7 @@ class _$LocationModelImpl implements _LocationModel { abstract class _LocationModel implements LocationModel { const factory _LocationModel( - {required final Map locations, + {required final List locations, @JsonKey(name: 'response_body') required final String responseBody}) = _$LocationModelImpl; @@ -178,7 +178,7 @@ abstract class _LocationModel implements LocationModel { _$LocationModelImpl.fromJson; @override - Map get locations; + List get locations; @override @JsonKey(name: 'response_body') String get responseBody; diff --git a/lib/features/registration/models/location_model.g.dart b/lib/features/registration/models/location_model.g.dart index 04a199fb..449630a4 100644 --- a/lib/features/registration/models/location_model.g.dart +++ b/lib/features/registration/models/location_model.g.dart @@ -8,7 +8,8 @@ part of 'location_model.dart'; _$LocationModelImpl _$$LocationModelImplFromJson(Map json) => _$LocationModelImpl( - locations: json['locations'] as Map, + locations: + (json['locations'] as List).map((e) => e as String).toList(), responseBody: json['response_body'] as String, ); diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart index af81fda8..c8aef3fa 100644 --- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart +++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart @@ -59,7 +59,7 @@ class RegistrationCubit extends Cubit { try { final location = (await registrationRepository.getLocationsListByQuery(query)); emit(RegistrationState(sheet: state.sheet.copyWith(responseBody: location.responseBody))); - return location.locations.values.toList().map((e) => e.toString()).toList(); + return location.locations; } catch (e) { rethrow; }