diff --git a/lib/core/pagination/pagination_response.dart b/lib/core/pagination/pagination_response.dart index b1705c7..f3beec9 100644 --- a/lib/core/pagination/pagination_response.dart +++ b/lib/core/pagination/pagination_response.dart @@ -15,7 +15,7 @@ class PaginationResponse { items = (json['items'] as List) .map((e) => fromJson.call(e)) .toList(), - isLastPage = json['is_last_page'] as bool; + isLastPage = json['isLastPage'] as bool; final int page; final int size; diff --git a/lib/features/pet/data/dto/pet_data_dto.dart b/lib/features/pet/data/dto/pet_data_dto.dart index fc26129..72b5e12 100644 --- a/lib/features/pet/data/dto/pet_data_dto.dart +++ b/lib/features/pet/data/dto/pet_data_dto.dart @@ -16,16 +16,13 @@ class PetDataListDto { @JsonSerializable() class PetDataDto { final int id; - @JsonKey(name: 'birth_date') final String birthDate; final String breed; final String name; final bool neutered; - @JsonKey(name: 'pet_type') final String petType; final String sex; - @JsonKey(name: 'weight_in_kg') - final int weightKg; + final int weightInKg; PetDataDto({ required this.id, @@ -35,7 +32,7 @@ class PetDataDto { required this.neutered, required this.petType, required this.sex, - required this.weightKg, + required this.weightInKg, }); factory PetDataDto.fromJson(Map json) => diff --git a/lib/features/pet/data/dto/pet_data_dto.g.dart b/lib/features/pet/data/dto/pet_data_dto.g.dart index fe3e1ec..a2a44c3 100644 --- a/lib/features/pet/data/dto/pet_data_dto.g.dart +++ b/lib/features/pet/data/dto/pet_data_dto.g.dart @@ -20,23 +20,23 @@ Map _$PetDataListDtoToJson(PetDataListDto instance) => PetDataDto _$PetDataDtoFromJson(Map json) => PetDataDto( id: json['id'] as int, - birthDate: json['birth_date'] as String, + birthDate: json['birthDate'] as String, breed: json['breed'] as String, name: json['name'] as String, neutered: json['neutered'] as bool, - petType: json['pet_type'] as String, + petType: json['petType'] as String, sex: json['sex'] as String, - weightKg: json['weight_in_kg'] as int, + weightInKg: json['weightInKg'] as int, ); Map _$PetDataDtoToJson(PetDataDto instance) => { 'id': instance.id, - 'birth_date': instance.birthDate, + 'birthDate': instance.birthDate, 'breed': instance.breed, 'name': instance.name, 'neutered': instance.neutered, - 'pet_type': instance.petType, + 'petType': instance.petType, 'sex': instance.sex, - 'weight_in_kg': instance.weightKg, + 'weightInKg': instance.weightInKg, }; diff --git a/lib/features/pet/domain/breed.dart b/lib/features/pet/domain/breed.dart index 2285e02..af61b2d 100644 --- a/lib/features/pet/domain/breed.dart +++ b/lib/features/pet/domain/breed.dart @@ -10,7 +10,7 @@ part 'breed.g.dart'; class Breed with _$Breed { factory Breed({ required int id, - @JsonKey(name: 'pet_type') required PetType petType, + required PetType petType, required String name, }) = _Breed; diff --git a/lib/features/pet/domain/breed.freezed.dart b/lib/features/pet/domain/breed.freezed.dart index 9977e07..df1f0cf 100644 --- a/lib/features/pet/domain/breed.freezed.dart +++ b/lib/features/pet/domain/breed.freezed.dart @@ -21,7 +21,6 @@ Breed _$BreedFromJson(Map json) { /// @nodoc mixin _$Breed { int get id => throw _privateConstructorUsedError; - @JsonKey(name: 'pet_type') PetType get petType => throw _privateConstructorUsedError; String get name => throw _privateConstructorUsedError; @@ -35,7 +34,7 @@ abstract class $BreedCopyWith<$Res> { factory $BreedCopyWith(Breed value, $Res Function(Breed) then) = _$BreedCopyWithImpl<$Res, Breed>; @useResult - $Res call({int id, @JsonKey(name: 'pet_type') PetType petType, String name}); + $Res call({int id, PetType petType, String name}); } /// @nodoc @@ -78,7 +77,7 @@ abstract class _$$_BreedCopyWith<$Res> implements $BreedCopyWith<$Res> { __$$_BreedCopyWithImpl<$Res>; @override @useResult - $Res call({int id, @JsonKey(name: 'pet_type') PetType petType, String name}); + $Res call({int id, PetType petType, String name}); } /// @nodoc @@ -114,10 +113,7 @@ class __$$_BreedCopyWithImpl<$Res> extends _$BreedCopyWithImpl<$Res, _$_Breed> /// @nodoc @JsonSerializable() class _$_Breed implements _Breed { - _$_Breed( - {required this.id, - @JsonKey(name: 'pet_type') required this.petType, - required this.name}); + _$_Breed({required this.id, required this.petType, required this.name}); factory _$_Breed.fromJson(Map json) => _$$_BreedFromJson(json); @@ -125,7 +121,6 @@ class _$_Breed implements _Breed { @override final int id; @override - @JsonKey(name: 'pet_type') final PetType petType; @override final String name; @@ -166,7 +161,7 @@ class _$_Breed implements _Breed { abstract class _Breed implements Breed { factory _Breed( {required final int id, - @JsonKey(name: 'pet_type') required final PetType petType, + required final PetType petType, required final String name}) = _$_Breed; factory _Breed.fromJson(Map json) = _$_Breed.fromJson; @@ -174,7 +169,6 @@ abstract class _Breed implements Breed { @override int get id; @override - @JsonKey(name: 'pet_type') PetType get petType; @override String get name; diff --git a/lib/features/pet/domain/breed.g.dart b/lib/features/pet/domain/breed.g.dart index 949f935..b1e0780 100644 --- a/lib/features/pet/domain/breed.g.dart +++ b/lib/features/pet/domain/breed.g.dart @@ -8,13 +8,13 @@ part of 'breed.dart'; _$_Breed _$$_BreedFromJson(Map json) => _$_Breed( id: json['id'] as int, - petType: $enumDecode(_$PetTypeEnumMap, json['pet_type']), + petType: $enumDecode(_$PetTypeEnumMap, json['petType']), name: json['name'] as String, ); Map _$$_BreedToJson(_$_Breed instance) => { 'id': instance.id, - 'pet_type': _$PetTypeEnumMap[instance.petType]!, + 'petType': _$PetTypeEnumMap[instance.petType]!, 'name': instance.name, }; diff --git a/lib/features/pet/entities/pet_data_entity.dart b/lib/features/pet/entities/pet_data_entity.dart index b544078..7d14e2a 100644 --- a/lib/features/pet/entities/pet_data_entity.dart +++ b/lib/features/pet/entities/pet_data_entity.dart @@ -28,7 +28,7 @@ class PetDataEntity with _$PetDataEntity { neutered: dto.neutered, petType: PetType.getByCode(dto.petType), sexType: SexType.getByCode(dto.sex), - weightKg: dto.weightKg, + weightKg: dto.weightInKg, breed: dto.breed); } } diff --git a/lib/features/pet/entities/pet_data_entity.freezed.dart b/lib/features/pet/entities/pet_data_entity.freezed.dart index 802dd26..951673b 100644 --- a/lib/features/pet/entities/pet_data_entity.freezed.dart +++ b/lib/features/pet/entities/pet_data_entity.freezed.dart @@ -21,6 +21,7 @@ mixin _$PetDataEntity { String get name => throw _privateConstructorUsedError; bool get neutered => throw _privateConstructorUsedError; PetType get petType => throw _privateConstructorUsedError; + @JsonKey(name: 'sex') SexType get sexType => throw _privateConstructorUsedError; int get weightKg => throw _privateConstructorUsedError; String get breed => throw _privateConstructorUsedError; @@ -42,7 +43,7 @@ abstract class $PetDataEntityCopyWith<$Res> { String name, bool neutered, PetType petType, - SexType sexType, + @JsonKey(name: 'sex') SexType sexType, int weightKg, String breed}); } @@ -120,7 +121,7 @@ abstract class _$$_PetDataEntityCopyWith<$Res> String name, bool neutered, PetType petType, - SexType sexType, + @JsonKey(name: 'sex') SexType sexType, int weightKg, String breed}); } @@ -191,7 +192,7 @@ class _$_PetDataEntity extends _PetDataEntity { required this.name, required this.neutered, required this.petType, - required this.sexType, + @JsonKey(name: 'sex') required this.sexType, required this.weightKg, required this.breed}) : super._(); @@ -207,6 +208,7 @@ class _$_PetDataEntity extends _PetDataEntity { @override final PetType petType; @override + @JsonKey(name: 'sex') final SexType sexType; @override final int weightKg; @@ -253,7 +255,7 @@ abstract class _PetDataEntity extends PetDataEntity { required final String name, required final bool neutered, required final PetType petType, - required final SexType sexType, + @JsonKey(name: 'sex') required final SexType sexType, required final int weightKg, required final String breed}) = _$_PetDataEntity; const _PetDataEntity._() : super._(); @@ -269,6 +271,7 @@ abstract class _PetDataEntity extends PetDataEntity { @override PetType get petType; @override + @JsonKey(name: 'sex') SexType get sexType; @override int get weightKg; diff --git a/lib/features/sos/data/dto/sos_post_dto.dart b/lib/features/sos/data/dto/sos_post_dto.dart index 7e3c114..b5a3a34 100644 --- a/lib/features/sos/data/dto/sos_post_dto.dart +++ b/lib/features/sos/data/dto/sos_post_dto.dart @@ -15,16 +15,12 @@ class SosPostDto { final AuthorDto author; final String title; final String content; - @JsonKey(name: 'date_start_at') final String dateStartAt; - @JsonKey(name: 'date_end_at') final String dateEndAt; - @JsonKey(name: 'thumbnail_id') final int thumbnailId; final List conditions; final List media; final String reward; - @JsonKey(name: 'reward_amount') final String rewardAmount; final List pets; diff --git a/lib/features/sos/data/dto/sos_post_dto.g.dart b/lib/features/sos/data/dto/sos_post_dto.g.dart index c8f6856..3dba01d 100644 --- a/lib/features/sos/data/dto/sos_post_dto.g.dart +++ b/lib/features/sos/data/dto/sos_post_dto.g.dart @@ -17,11 +17,11 @@ SosPostDto _$SosPostDtoFromJson(Map json) => SosPostDto( .map((e) => MediaImageDto.fromJson(e as Map)) .toList(), title: json['title'] as String, - dateStartAt: json['date_start_at'] as String, - dateEndAt: json['date_end_at'] as String, - thumbnailId: json['thumbnail_id'] as int, + dateStartAt: json['dateStartAt'] as String, + dateEndAt: json['dateEndAt'] as String, + thumbnailId: json['thumbnailId'] as int, reward: json['reward'] as String, - rewardAmount: json['reward_amount'] as String, + rewardAmount: json['rewardAmount'] as String, pets: (json['pets'] as List) .map((e) => PetDataDto.fromJson(e as Map)) .toList(), @@ -33,12 +33,12 @@ Map _$SosPostDtoToJson(SosPostDto instance) => 'author': instance.author, 'title': instance.title, 'content': instance.content, - 'date_start_at': instance.dateStartAt, - 'date_end_at': instance.dateEndAt, - 'thumbnail_id': instance.thumbnailId, + 'dateStartAt': instance.dateStartAt, + 'dateEndAt': instance.dateEndAt, + 'thumbnailId': instance.thumbnailId, 'conditions': instance.conditions, 'media': instance.media, 'reward': instance.reward, - 'reward_amount': instance.rewardAmount, + 'rewardAmount': instance.rewardAmount, 'pets': instance.pets, };