diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart index 2b6f7e80..a6a119e1 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart +++ b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart @@ -36,11 +36,11 @@ abstract class LatestPositionsItemResponseModel required int positionDate, int? positionDateOriginal, String? frequentPlaceName, - required String message, - required List networks, - required bool ignore, - required bool suspect, - required bool frequentPlace, + @Default('') String message, + @Default([]) List networks, + @Default(false) bool ignore, + @Default(false) bool suspect, + @Default(false) bool frequentPlace, }) = _LatestPositionsItemResponseModel; factory LatestPositionsItemResponseModel.fromJson( @@ -110,9 +110,9 @@ extension LatestPositionsAddressResponseModelMapper abstract class LatestPositionsNetworkResponseModel with _$LatestPositionsNetworkResponseModel { const factory LatestPositionsNetworkResponseModel({ - required String SSID, - required String BSSID, - required String signal, + @Default('') String SSID, + @Default('') String BSSID, + @Default('') String signal, }) = _LatestPositionsNetworkResponseModel; factory LatestPositionsNetworkResponseModel.fromJson( diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart index 539d621b..773f743f 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart +++ b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart @@ -507,7 +507,7 @@ return $default(_that.id,_that.deviceIdentificator,_that.latitude,_that.longitud @JsonSerializable() class _LatestPositionsItemResponseModel implements LatestPositionsItemResponseModel { - const _LatestPositionsItemResponseModel({required this.id, required this.deviceIdentificator, required this.latitude, required this.longitude, required this.hpe, this.ncell, required this.type, this.steps, this.address, required this.createdAt, required this.positionDate, this.positionDateOriginal, this.frequentPlaceName, required this.message, required final List networks, required this.ignore, required this.suspect, required this.frequentPlace}): _networks = networks; + const _LatestPositionsItemResponseModel({required this.id, required this.deviceIdentificator, required this.latitude, required this.longitude, required this.hpe, this.ncell, required this.type, this.steps, this.address, required this.createdAt, required this.positionDate, this.positionDateOriginal, this.frequentPlaceName, this.message = '', final List networks = const [], this.ignore = false, this.suspect = false, this.frequentPlace = false}): _networks = networks; factory _LatestPositionsItemResponseModel.fromJson(Map json) => _$LatestPositionsItemResponseModelFromJson(json); @override final String id; @@ -523,17 +523,17 @@ class _LatestPositionsItemResponseModel implements LatestPositionsItemResponseMo @override final int positionDate; @override final int? positionDateOriginal; @override final String? frequentPlaceName; -@override final String message; +@override@JsonKey() final String message; final List _networks; -@override List get networks { +@override@JsonKey() List get networks { if (_networks is EqualUnmodifiableListView) return _networks; // ignore: implicit_dynamic_type return EqualUnmodifiableListView(_networks); } -@override final bool ignore; -@override final bool suspect; -@override final bool frequentPlace; +@override@JsonKey() final bool ignore; +@override@JsonKey() final bool suspect; +@override@JsonKey() final bool frequentPlace; /// Create a copy of LatestPositionsItemResponseModel /// with the given fields replaced by the non-null parameter values. @@ -1099,12 +1099,12 @@ return $default(_that.SSID,_that.BSSID,_that.signal);case _: @JsonSerializable() class _LatestPositionsNetworkResponseModel implements LatestPositionsNetworkResponseModel { - const _LatestPositionsNetworkResponseModel({required this.SSID, required this.BSSID, required this.signal}); + const _LatestPositionsNetworkResponseModel({this.SSID = '', this.BSSID = '', this.signal = ''}); factory _LatestPositionsNetworkResponseModel.fromJson(Map json) => _$LatestPositionsNetworkResponseModelFromJson(json); -@override final String SSID; -@override final String BSSID; -@override final String signal; +@override@JsonKey() final String SSID; +@override@JsonKey() final String BSSID; +@override@JsonKey() final String signal; /// Create a copy of LatestPositionsNetworkResponseModel /// with the given fields replaced by the non-null parameter values. diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart index 184e6b95..52079d05 100644 --- a/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart +++ b/modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart @@ -42,17 +42,19 @@ _LatestPositionsItemResponseModel _$LatestPositionsItemResponseModelFromJson( positionDate: (json['positionDate'] as num).toInt(), positionDateOriginal: (json['positionDateOriginal'] as num?)?.toInt(), frequentPlaceName: json['frequentPlaceName'] as String?, - message: json['message'] as String, - networks: (json['networks'] as List) - .map( - (e) => LatestPositionsNetworkResponseModel.fromJson( - e as Map, - ), - ) - .toList(), - ignore: json['ignore'] as bool, - suspect: json['suspect'] as bool, - frequentPlace: json['frequentPlace'] as bool, + message: json['message'] as String? ?? '', + networks: + (json['networks'] as List?) + ?.map( + (e) => LatestPositionsNetworkResponseModel.fromJson( + e as Map, + ), + ) + .toList() ?? + const [], + ignore: json['ignore'] as bool? ?? false, + suspect: json['suspect'] as bool? ?? false, + frequentPlace: json['frequentPlace'] as bool? ?? false, ); Map _$LatestPositionsItemResponseModelToJson( @@ -101,9 +103,9 @@ Map _$LatestPositionsAddressResponseModelToJson( _LatestPositionsNetworkResponseModel _$LatestPositionsNetworkResponseModelFromJson(Map json) => _LatestPositionsNetworkResponseModel( - SSID: json['SSID'] as String, - BSSID: json['BSSID'] as String, - signal: json['signal'] as String, + SSID: json['SSID'] as String? ?? '', + BSSID: json['BSSID'] as String? ?? '', + signal: json['signal'] as String? ?? '', ); Map _$LatestPositionsNetworkResponseModelToJson(