6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit ceb30112
Changed files
.../.generated/services/models/booking_dto.g.dart | 2 +- .../lib/.generated/services/models/user_dto.g.dart | 22 ++++++++++++---------- .../lib/services/mappers/booking_mapper.dart | 2 +- .../lib/services/mappers/user_mapper.dart | 18 +++++++++--------- .../lib/services/models/booking_dto.dart | 2 +- comwell_key_app/lib/services/models/user_dto.dart | 18 +++++++++--------- 6 files changed, 33 insertions(+), 31 deletions(-)
Diff
diff --git a/comwell_key_app/lib/.generated/services/models/booking_dto.g.dart b/comwell_key_app/lib/.generated/services/models/booking_dto.g.dart
index 2a96ed75..e5f80a00 100644
--- a/comwell_key_app/lib/.generated/services/models/booking_dto.g.dart
+++ b/comwell_key_app/lib/.generated/services/models/booking_dto.g.dart
@@ -19,7 +19,7 @@ BookingDTO _$BookingDTOFromJson(Map json) => BookingDTO(
status: json['status'] as String,
isCancelled: json['isCancelled'] as bool?,
bookTime: json['bookTime'] as String?,
- roomType: json['roomType'] as String,
+ roomType: json['roomType'] as String?,
adults: (json['adults'] as num).toInt(),
children: (json['children'] as num).toInt(),
totalCharge: json['totalCharge'] as num?,
diff --git a/comwell_key_app/lib/.generated/services/models/user_dto.g.dart b/comwell_key_app/lib/.generated/services/models/user_dto.g.dart
index 8b296faa..07e895ea 100644
--- a/comwell_key_app/lib/.generated/services/models/user_dto.g.dart
+++ b/comwell_key_app/lib/.generated/services/models/user_dto.g.dart
@@ -11,16 +11,18 @@ UserDto _$UserDtoFromJson(Map json) => UserDto(
firstName: json['firstName'] as String,
lastName: json['lastName'] as String,
email: json['email'] as String,
- clubId: json['clubId'] as String,
- clubLevel: json['clubLevel'] as String,
+ clubId: json['clubId'] as String?,
+ clubLevel: json['clubLevel'] as String?,
clubLevelName: json['clubLevelName'] as String?,
- birthDate: DateTime.parse(json['birthDate'] as String),
- phoneNumber: json['phoneNumber'] as String,
- gender: json['gender'] as String,
- addressStreet: json['addressStreet'] as String,
- addressZip: json['addressZip'] as String,
- addressCity: json['addressCity'] as String,
- addressCountry: json['addressCountry'] as String,
+ birthDate: json['birthDate'] == null
+ ? null
+ : DateTime.parse(json['birthDate'] as String),
+ phoneNumber: json['phoneNumber'] as String?,
+ gender: json['gender'] as String?,
+ addressStreet: json['addressStreet'] as String?,
+ addressZip: json['addressZip'] as String?,
+ addressCity: json['addressCity'] as String?,
+ addressCountry: json['addressCountry'] as String?,
points: (json['points'] as num?)?.toInt(),
locale: json['locale'] as String?,
);
@@ -33,7 +35,7 @@ Map<String, dynamic> _$UserDtoToJson(UserDto instance) => <String, dynamic>{
'clubId': instance.clubId,
'clubLevel': instance.clubLevel,
'clubLevelName': instance.clubLevelName,
- 'birthDate': instance.birthDate.toIso8601String(),
+ 'birthDate': instance.birthDate?.toIso8601String(),
'phoneNumber': instance.phoneNumber,
'gender': instance.gender,
'addressStreet': instance.addressStreet,
diff --git a/comwell_key_app/lib/services/mappers/booking_mapper.dart b/comwell_key_app/lib/services/mappers/booking_mapper.dart
index d67cafb0..c8129d47 100644
--- a/comwell_key_app/lib/services/mappers/booking_mapper.dart
+++ b/comwell_key_app/lib/services/mappers/booking_mapper.dart
@@ -17,7 +17,7 @@ extension BookingDTOMapper on BookingDTO {
reservationStatus: reservationStatus,
image: "assets/images/no_current_bookings_background.jpeg",
hotelName: "Hotel $hotelCode",
- roomType: roomType,
+ roomType: roomType ?? '',
totalCharge: totalCharge ?? 0,
children: children,
booker: Guest(name: "$firstName $lastName", id: "$userId"),
diff --git a/comwell_key_app/lib/services/mappers/user_mapper.dart b/comwell_key_app/lib/services/mappers/user_mapper.dart
index 4f3e3adc..2c83820b 100644
--- a/comwell_key_app/lib/services/mappers/user_mapper.dart
+++ b/comwell_key_app/lib/services/mappers/user_mapper.dart
@@ -9,18 +9,18 @@ extension UserMapper on UserDto {
firstName: firstName,
lastName: lastName,
email: email,
- addressCountry: addressCountry,
- phoneNumber: phoneNumber,
+ addressCountry: addressCountry ?? '',
+ phoneNumber: phoneNumber ?? '',
address: Address(
- street: addressStreet,
- city: addressCity,
- country: addressCountry,
- zipCode: addressZip,
+ street: addressStreet ?? '',
+ city: addressCity ?? '',
+ country: addressCountry ?? '',
+ zipCode: addressZip ?? '',
),
- birthDate: birthDate,
- shopperReference: clubId,
+ birthDate: birthDate ?? DateTime.now(),
+ shopperReference: clubId ?? '',
points: points ?? 0,
- gender: gender,
+ gender: gender ?? '',
clubId: clubId,
clubLevel: clubLevel,
clubLevelName: clubLevelName,
diff --git a/comwell_key_app/lib/services/models/booking_dto.dart b/comwell_key_app/lib/services/models/booking_dto.dart
index cf4e1bed..b7a132ac 100644
--- a/comwell_key_app/lib/services/models/booking_dto.dart
+++ b/comwell_key_app/lib/services/models/booking_dto.dart
@@ -17,7 +17,7 @@ class BookingDTO {
final String status;
final bool? isCancelled;
final String? bookTime;
- final String roomType;
+ final String? roomType;
final int adults;
final int children;
final num? totalCharge;
diff --git a/comwell_key_app/lib/services/models/user_dto.dart b/comwell_key_app/lib/services/models/user_dto.dart
index 9836237e..5dca6e49 100644
--- a/comwell_key_app/lib/services/models/user_dto.dart
+++ b/comwell_key_app/lib/services/models/user_dto.dart
@@ -9,16 +9,16 @@ class UserDto {
final String firstName;
final String lastName;
final String email;
- final String clubId;
- final String clubLevel;
+ final String? clubId;
+ final String? clubLevel;
final String? clubLevelName;
- final DateTime birthDate;
- final String phoneNumber;
- final String gender;
- final String addressStreet;
- final String addressZip;
- final String addressCity;
- final String addressCountry;
+ final DateTime? birthDate;
+ final String? phoneNumber;
+ final String? gender;
+ final String? addressStreet;
+ final String? addressZip;
+ final String? addressCity;
+ final String? addressCountry;
final int? points;
final String? locale;