6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 40b8c3b2
Changed files
comwell_key_app/build.yaml | 13 ++++++++++- .../lib/.generated/database/comwell_db.g.dart | 4 ++-- .../lib/.generated/overview/models/booking.g.dart | 6 +++--- .../lib/.generated/overview/models/bookings.g.dart | 14 ++++++------ .../overview/models/payment_details.g.dart | 3 +-- .../models/add_card_payment_method.g.dart | 3 +-- .../.generated/profile_settings/model/user.g.dart | 9 +++++--- .../.generated/services/adyen/adyen_amount.g.dart | 2 +- .../services/adyen/adyen_line_item.g.dart | 3 +-- .../services/adyen/payment_method.g.dart | 3 +-- .../services/adyen/payment_methods.g.dart | 16 +++++++------- .../services/adyen/payment_request_data.g.dart | 25 +++++++++++++++------- .../services/adyen/stored_payment_method.g.dart | 2 +- .../tracking/models/analytics_event_item.g.dart | 3 +-- .../lib/database/tables/booking_table.dart | 2 -- .../lib/database/tables/user_table.dart | 3 --- .../lib/profile_settings/model/user.dart | 3 +++ .../lib/services/adyen/adyen_amount.dart | 7 ++++-- .../lib/services/adyen/stored_payment_method.dart | 2 ++ 19 files changed, 72 insertions(+), 51 deletions(-)
Diff
diff --git a/comwell_key_app/build.yaml b/comwell_key_app/build.yaml
index b79ba129..bff57302 100644
--- a/comwell_key_app/build.yaml
+++ b/comwell_key_app/build.yaml
@@ -4,4 +4,15 @@ targets:
source_gen:combining_builder:
options:
build_extensions:
- '^lib/{{}}.dart': 'lib/.generated/{{}}.g.dart'
\ No newline at end of file
+ '^lib/{{}}.dart': 'lib/.generated/{{}}.g.dart'
+ json_serializable:
+ options:
+ explicit_to_json: true
+ any_map: true
+ generate_for:
+ exclude:
+ - 'lib/database/**'
+ drift_dev:
+ generate_for:
+ include:
+ - 'lib/database/**'
\ No newline at end of file
diff --git a/comwell_key_app/lib/.generated/database/comwell_db.g.dart b/comwell_key_app/lib/.generated/database/comwell_db.g.dart
index dd1959d6..99db1942 100644
--- a/comwell_key_app/lib/.generated/database/comwell_db.g.dart
+++ b/comwell_key_app/lib/.generated/database/comwell_db.g.dart
@@ -59,7 +59,7 @@ class $BookingEntityTable extends BookingEntity
}
@override
- Set<GeneratedColumn> get $primaryKey => {id};
+ Set<GeneratedColumn> get $primaryKey => const {};
@override
BookingDb map(Map<String, dynamic> data, {String? tablePrefix}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
@@ -275,7 +275,7 @@ class $UserEntityTable extends UserEntity
}
@override
- Set<GeneratedColumn> get $primaryKey => {id};
+ Set<GeneratedColumn> get $primaryKey => const {};
@override
UserDb map(Map<String, dynamic> data, {String? tablePrefix}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
diff --git a/comwell_key_app/lib/.generated/overview/models/booking.g.dart b/comwell_key_app/lib/.generated/overview/models/booking.g.dart
index f1763483..10b51d28 100644
--- a/comwell_key_app/lib/.generated/overview/models/booking.g.dart
+++ b/comwell_key_app/lib/.generated/overview/models/booking.g.dart
@@ -6,7 +6,7 @@ part of '../../../overview/models/booking.dart';
// JsonSerializableGenerator
// **************************************************************************
-Booking _$BookingFromJson(Map<String, dynamic> json) => Booking(
+Booking _$BookingFromJson(Map json) => Booking(
id: json['id'] as String,
userId: json['userId'] as String,
roomNumber: json['roomNumber'] as String,
@@ -22,7 +22,7 @@ Booking _$BookingFromJson(Map<String, dynamic> json) => Booking(
booker: json['booker'] as String,
bookingDate: DateTime.parse(json['bookingDate'] as String),
paymentDetails: PaymentDetails.fromJson(
- json['paymentDetails'] as Map<String, dynamic>),
+ Map<String, dynamic>.from(json['paymentDetails'] as Map)),
);
Map<String, dynamic> _$BookingToJson(Booking instance) => <String, dynamic>{
@@ -40,7 +40,7 @@ Map<String, dynamic> _$BookingToJson(Booking instance) => <String, dynamic>{
'children': instance.children,
'booker': instance.booker,
'bookingDate': instance.bookingDate.toIso8601String(),
- 'paymentDetails': instance.paymentDetails,
+ 'paymentDetails': instance.paymentDetails.toJson(),
};
const _$BookingStatusEnumMap = {
diff --git a/comwell_key_app/lib/.generated/overview/models/bookings.g.dart b/comwell_key_app/lib/.generated/overview/models/bookings.g.dart
index 70ab5c27..638108c0 100644
--- a/comwell_key_app/lib/.generated/overview/models/bookings.g.dart
+++ b/comwell_key_app/lib/.generated/overview/models/bookings.g.dart
@@ -6,20 +6,20 @@ part of '../../../overview/models/bookings.dart';
// JsonSerializableGenerator
// **************************************************************************
-Bookings _$BookingsFromJson(Map<String, dynamic> json) => Bookings(
+Bookings _$BookingsFromJson(Map json) => Bookings(
current: (json['current'] as List<dynamic>)
- .map((e) => Booking.fromJson(e as Map<String, dynamic>))
+ .map((e) => Booking.fromJson(Map<String, dynamic>.from(e as Map)))
.toList(),
past: (json['past'] as List<dynamic>)
- .map((e) => Booking.fromJson(e as Map<String, dynamic>))
+ .map((e) => Booking.fromJson(Map<String, dynamic>.from(e as Map)))
.toList(),
cancelled: (json['cancelled'] as List<dynamic>)
- .map((e) => Booking.fromJson(e as Map<String, dynamic>))
+ .map((e) => Booking.fromJson(Map<String, dynamic>.from(e as Map)))
.toList(),
);
Map<String, dynamic> _$BookingsToJson(Bookings instance) => <String, dynamic>{
- 'current': instance.current,
- 'past': instance.past,
- 'cancelled': instance.cancelled,
+ 'current': instance.current.map((e) => e.toJson()).toList(),
+ 'past': instance.past.map((e) => e.toJson()).toList(),
+ 'cancelled': instance.cancelled.map((e) => e.toJson()).toList(),
};
diff --git a/comwell_key_app/lib/.generated/overview/models/payment_details.g.dart b/comwell_key_app/lib/.generated/overview/models/payment_details.g.dart
index 0a81fbba..aa6f2456 100644
--- a/comwell_key_app/lib/.generated/overview/models/payment_details.g.dart
+++ b/comwell_key_app/lib/.generated/overview/models/payment_details.g.dart
@@ -6,8 +6,7 @@ part of '../../../overview/models/payment_details.dart';
// JsonSerializableGenerator
// **************************************************************************
-PaymentDetails _$PaymentDetailsFromJson(Map<String, dynamic> json) =>
- PaymentDetails(
+PaymentDetails _$PaymentDetailsFromJson(Map json) => PaymentDetails(
cardNumber: json['cardNumber'] as String,
cardHolder: json['cardHolder'] as String,
expiryDate: json['expiryDate'] as String?,
diff --git a/comwell_key_app/lib/.generated/pregistration/models/add_card_payment_method.g.dart b/comwell_key_app/lib/.generated/pregistration/models/add_card_payment_method.g.dart
index 465b9cd5..c2aeecc0 100644
--- a/comwell_key_app/lib/.generated/pregistration/models/add_card_payment_method.g.dart
+++ b/comwell_key_app/lib/.generated/pregistration/models/add_card_payment_method.g.dart
@@ -6,8 +6,7 @@ part of '../../../pregistration/models/add_card_payment_method.dart';
// JsonSerializableGenerator
// **************************************************************************
-AddCardPaymentMethod _$AddCardPaymentMethodFromJson(
- Map<String, dynamic> json) =>
+AddCardPaymentMethod _$AddCardPaymentMethodFromJson(Map json) =>
AddCardPaymentMethod(
brands: (json['brands'] as List<dynamic>)
.map((e) => $enumDecode(_$CardTypeEnumMap, e)),
diff --git a/comwell_key_app/lib/.generated/profile_settings/model/user.g.dart b/comwell_key_app/lib/.generated/profile_settings/model/user.g.dart
index 9134fbeb..fe21e788 100644
--- a/comwell_key_app/lib/.generated/profile_settings/model/user.g.dart
+++ b/comwell_key_app/lib/.generated/profile_settings/model/user.g.dart
@@ -6,15 +6,17 @@ part of '../../../profile_settings/model/user.dart';
// JsonSerializableGenerator
// **************************************************************************
-User _$UserFromJson(Map<String, dynamic> json) => User(
+User _$UserFromJson(Map json) => User(
id: json['id'] as String,
firstName: json['firstName'] as String,
lastName: json['lastName'] as String,
countryCode: json['countryCode'] as String,
phone: json['phone'] as String,
email: json['email'] as String,
- address: Address.fromJson(json['address'] as Map<String, dynamic>),
+ address:
+ Address.fromJson(Map<String, dynamic>.from(json['address'] as Map)),
birthday: DateTime.parse(json['birthday'] as String),
+ shopperReference: json['shopperReference'] as String?,
);
Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
@@ -24,6 +26,7 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
'countryCode': instance.countryCode,
'phone': instance.phone,
'email': instance.email,
- 'address': instance.address,
+ 'address': instance.address.toJson(),
'birthday': instance.birthday.toIso8601String(),
+ 'shopperReference': instance.shopperReference,
};
diff --git a/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart b/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
index e57cc3ad..9b150dff 100644
--- a/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
@@ -6,7 +6,7 @@ part of '../../../services/adyen/adyen_amount.dart';
// JsonSerializableGenerator
// **************************************************************************
-AdyenAmount _$AdyenAmountFromJson(Map<String, dynamic> json) => AdyenAmount(
+AdyenAmount _$AdyenAmountFromJson(Map json) => AdyenAmount(
currency: json['currency'] as String,
value: (json['value'] as num).toInt(),
);
diff --git a/comwell_key_app/lib/.generated/services/adyen/adyen_line_item.g.dart b/comwell_key_app/lib/.generated/services/adyen/adyen_line_item.g.dart
index 68228837..9ca3ae4e 100644
--- a/comwell_key_app/lib/.generated/services/adyen/adyen_line_item.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/adyen_line_item.g.dart
@@ -6,8 +6,7 @@ part of '../../../services/adyen/adyen_line_item.dart';
// JsonSerializableGenerator
// **************************************************************************
-AdyenLineItem _$AdyenLineItemFromJson(Map<String, dynamic> json) =>
- AdyenLineItem(
+AdyenLineItem _$AdyenLineItemFromJson(Map json) => AdyenLineItem(
quantity: (json['quantity'] as num?)?.toInt(),
amountExcludingTax: (json['amountExcludingTax'] as num?)?.toInt(),
taxPercentage: (json['taxPercentage'] as num?)?.toInt(),
diff --git a/comwell_key_app/lib/.generated/services/adyen/payment_method.g.dart b/comwell_key_app/lib/.generated/services/adyen/payment_method.g.dart
index e7037891..595cb86a 100644
--- a/comwell_key_app/lib/.generated/services/adyen/payment_method.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/payment_method.g.dart
@@ -6,8 +6,7 @@ part of '../../../services/adyen/payment_method.dart';
// JsonSerializableGenerator
// **************************************************************************
-PaymentMethod _$PaymentMethodFromJson(Map<String, dynamic> json) =>
- PaymentMethod(
+PaymentMethod _$PaymentMethodFromJson(Map json) => PaymentMethod(
json['name'] as String,
json['type'] as String,
);
diff --git a/comwell_key_app/lib/.generated/services/adyen/payment_methods.g.dart b/comwell_key_app/lib/.generated/services/adyen/payment_methods.g.dart
index bb18e944..395f2387 100644
--- a/comwell_key_app/lib/.generated/services/adyen/payment_methods.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/payment_methods.g.dart
@@ -6,16 +6,16 @@ part of '../../../services/adyen/payment_methods.dart';
// JsonSerializableGenerator
// **************************************************************************
-PaymentMethods _$PaymentMethodsFromJson(Map<String, dynamic> json) =>
- PaymentMethods(
- (json['paymentMethods'] as List<dynamic>)
- .map((e) => PaymentMethod.fromJson(e as Map<String, dynamic>)),
- (json['storedPaymentMethods'] as List<dynamic>)
- .map((e) => StoredPaymentMethod.fromJson(e as Map<String, dynamic>)),
+PaymentMethods _$PaymentMethodsFromJson(Map json) => PaymentMethods(
+ (json['paymentMethods'] as List<dynamic>).map(
+ (e) => PaymentMethod.fromJson(Map<String, dynamic>.from(e as Map))),
+ (json['storedPaymentMethods'] as List<dynamic>).map((e) =>
+ StoredPaymentMethod.fromJson(Map<String, dynamic>.from(e as Map))),
);
Map<String, dynamic> _$PaymentMethodsToJson(PaymentMethods instance) =>
<String, dynamic>{
- 'paymentMethods': instance.paymentMethods.toList(),
- 'storedPaymentMethods': instance.storedPaymentMethods.toList(),
+ 'paymentMethods': instance.paymentMethods.map((e) => e.toJson()).toList(),
+ 'storedPaymentMethods':
+ instance.storedPaymentMethods.map((e) => e.toJson()).toList(),
};
diff --git a/comwell_key_app/lib/.generated/services/adyen/payment_request_data.g.dart b/comwell_key_app/lib/.generated/services/adyen/payment_request_data.g.dart
index e1f060d5..21d02b2d 100644
--- a/comwell_key_app/lib/.generated/services/adyen/payment_request_data.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/payment_request_data.g.dart
@@ -6,33 +6,41 @@ part of '../../../services/adyen/payment_request_data.dart';
// JsonSerializableGenerator
// **************************************************************************
-PaymentsRequestData _$PaymentsRequestDataFromJson(Map<String, dynamic> json) =>
+PaymentsRequestData _$PaymentsRequestDataFromJson(Map json) =>
PaymentsRequestData(
merchantAccount: json['merchantAccount'] as String,
- amount: AdyenAmount.fromJson(json['amount'] as Map<String, dynamic>),
+ amount: AdyenAmount.fromJson(
+ Map<String, dynamic>.from(json['amount'] as Map)),
reference: json['reference'] as String,
shopperReference: json['shopperReference'] as String?,
countryCode: json['countryCode'] as String?,
returnUrl: json['returnUrl'] as String?,
- additionalData: json['additionalData'] as Map<String, dynamic>?,
+ additionalData: (json['additionalData'] as Map?)?.map(
+ (k, e) => MapEntry(k as String, e),
+ ),
shopperIP: json['shopperIP'] as String?,
channel: json['channel'] as String?,
lineItems: (json['lineItems'] as List<dynamic>?)
- ?.map((e) => AdyenLineItem.fromJson(e as Map<String, dynamic>))
+ ?.map((e) =>
+ AdyenLineItem.fromJson(Map<String, dynamic>.from(e as Map)))
.toList(),
shopperEmail: json['shopperEmail'] as String?,
- threeDS2RequestData: json['threeDS2RequestData'] as Map<String, dynamic>?,
+ threeDS2RequestData: (json['threeDS2RequestData'] as Map?)?.map(
+ (k, e) => MapEntry(k as String, e),
+ ),
recurringProcessingModel: $enumDecodeNullable(
_$RecurringProcessingModelEnumMap, json['recurringProcessingModel']),
shopperInteraction: json['shopperInteraction'] as String?,
- authenticationData: json['authenticationData'] as Map<String, dynamic>?,
+ authenticationData: (json['authenticationData'] as Map?)?.map(
+ (k, e) => MapEntry(k as String, e),
+ ),
);
Map<String, dynamic> _$PaymentsRequestDataToJson(
PaymentsRequestData instance) =>
<String, dynamic>{
'merchantAccount': instance.merchantAccount,
- 'amount': instance.amount,
+ 'amount': instance.amount.toJson(),
'reference': instance.reference,
if (instance.shopperReference case final value?)
'shopperReference': value,
@@ -41,7 +49,8 @@ Map<String, dynamic> _$PaymentsRequestDataToJson(
if (instance.additionalData case final value?) 'additionalData': value,
if (instance.shopperIP case final value?) 'shopperIP': value,
if (instance.channel case final value?) 'channel': value,
- if (instance.lineItems case final value?) 'lineItems': value,
+ if (instance.lineItems?.map((e) => e.toJson()).toList() case final value?)
+ 'lineItems': value,
if (instance.shopperEmail case final value?) 'shopperEmail': value,
if (instance.threeDS2RequestData case final value?)
'threeDS2RequestData': value,
diff --git a/comwell_key_app/lib/.generated/services/adyen/stored_payment_method.g.dart b/comwell_key_app/lib/.generated/services/adyen/stored_payment_method.g.dart
index 589d22a1..33ce8945 100644
--- a/comwell_key_app/lib/.generated/services/adyen/stored_payment_method.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/stored_payment_method.g.dart
@@ -6,7 +6,7 @@ part of '../../../services/adyen/stored_payment_method.dart';
// JsonSerializableGenerator
// **************************************************************************
-StoredPaymentMethod _$StoredPaymentMethodFromJson(Map<String, dynamic> json) =>
+StoredPaymentMethod _$StoredPaymentMethodFromJson(Map json) =>
StoredPaymentMethod(
expiryMonth: json['expiryMonth'] as String,
expiryYear: json['expiryYear'] as String,
diff --git a/comwell_key_app/lib/.generated/tracking/models/analytics_event_item.g.dart b/comwell_key_app/lib/.generated/tracking/models/analytics_event_item.g.dart
index 3ead8923..77ecfb12 100644
--- a/comwell_key_app/lib/.generated/tracking/models/analytics_event_item.g.dart
+++ b/comwell_key_app/lib/.generated/tracking/models/analytics_event_item.g.dart
@@ -6,8 +6,7 @@ part of '../../../tracking/models/analytics_event_item.dart';
// JsonSerializableGenerator
// **************************************************************************
-AnalyticsEventItem _$AnalyticsEventItemFromJson(Map<String, dynamic> json) =>
- AnalyticsEventItem(
+AnalyticsEventItem _$AnalyticsEventItemFromJson(Map json) => AnalyticsEventItem(
hotelName: json['hotelName'] as String,
currency: json['currency'] as String,
value: json['value'] as num,
diff --git a/comwell_key_app/lib/database/tables/booking_table.dart b/comwell_key_app/lib/database/tables/booking_table.dart
index 8fb22660..a11d178a 100644
--- a/comwell_key_app/lib/database/tables/booking_table.dart
+++ b/comwell_key_app/lib/database/tables/booking_table.dart
@@ -8,6 +8,4 @@ class BookingEntity extends Table {
TextColumn get json => text()();
- @override
- Set<Column<Object>> get primaryKey => {id};
}
diff --git a/comwell_key_app/lib/database/tables/user_table.dart b/comwell_key_app/lib/database/tables/user_table.dart
index eafca514..dd8d37e9 100644
--- a/comwell_key_app/lib/database/tables/user_table.dart
+++ b/comwell_key_app/lib/database/tables/user_table.dart
@@ -5,7 +5,4 @@ class UserEntity extends Table {
TextColumn get id => text().unique()();
TextColumn get json => text()();
-
- @override
- Set<Column<Object>> get primaryKey => {id};
}
diff --git a/comwell_key_app/lib/profile_settings/model/user.dart b/comwell_key_app/lib/profile_settings/model/user.dart
index 91113f0d..d529e02a 100644
--- a/comwell_key_app/lib/profile_settings/model/user.dart
+++ b/comwell_key_app/lib/profile_settings/model/user.dart
@@ -15,6 +15,7 @@ class User {
final String email;
final Address address;
final DateTime birthday;
+ final String? shopperReference;
User({
required this.id,
@@ -25,6 +26,7 @@ class User {
required this.email,
required this.address,
required this.birthday,
+ this.shopperReference,
});
factory User.fromJson(Json json) => _$UserFromJson(json);
@@ -51,6 +53,7 @@ class User {
email: email ?? this.email,
address: address ?? this.address,
birthday: birthday ?? this.birthday,
+ shopperReference: shopperReference ?? this.shopperReference,
);
}
}
diff --git a/comwell_key_app/lib/services/adyen/adyen_amount.dart b/comwell_key_app/lib/services/adyen/adyen_amount.dart
index 2477cb3a..2bfeaec8 100644
--- a/comwell_key_app/lib/services/adyen/adyen_amount.dart
+++ b/comwell_key_app/lib/services/adyen/adyen_amount.dart
@@ -4,7 +4,7 @@ import 'package:json_annotation/json_annotation.dart';
part '../../.generated/services/adyen/adyen_amount.g.dart';
@JsonSerializable()
-class AdyenAmount {
+final class AdyenAmount {
final String currency;
final int value;
@@ -12,7 +12,10 @@ class AdyenAmount {
factory AdyenAmount.zeroPayment() => AdyenAmount(currency: "DKK", value: 0);
- AdyenAmount({required this.currency, required this.value});
+ AdyenAmount({
+ required this.currency,
+ required this.value,
+ });
Json toJson() => _$AdyenAmountToJson(this);
}
diff --git a/comwell_key_app/lib/services/adyen/stored_payment_method.dart b/comwell_key_app/lib/services/adyen/stored_payment_method.dart
index 33174ed2..91bdc4fb 100644
--- a/comwell_key_app/lib/services/adyen/stored_payment_method.dart
+++ b/comwell_key_app/lib/services/adyen/stored_payment_method.dart
@@ -24,6 +24,8 @@ class StoredPaymentMethod extends Equatable {
factory StoredPaymentMethod.fromJson(Json json) => _$StoredPaymentMethodFromJson(json);
+ Json toJson() => _$StoredPaymentMethodToJson(this);
+
@override
List<Object?> get props => [id];
}
\ No newline at end of file