6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 3be0cb8b

AuthorMikkel Thygesen<mth@dwarf.dk>

Date2025-01-14 13:42:17 +0100

341: adjusted types

Changed files

comwell_key_app/lib/services/adyen/adyen_line_item.dart       | 2 +-
 comwell_key_app/lib/services/adyen/payment_method.dart        | 2 +-
 comwell_key_app/lib/services/adyen/payment_methods.dart       | 3 ++-
 comwell_key_app/lib/services/adyen/payment_request_data.dart  | 7 +++----
 comwell_key_app/lib/services/adyen/stored_payment_method.dart | 3 ++-
 comwell_key_app/lib/services/api.dart                         | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

Diff

diff --git a/comwell_key_app/lib/services/adyen/adyen_line_item.dart b/comwell_key_app/lib/services/adyen/adyen_line_item.dart

index a5a899f5..39fff860 100644

--- a/comwell_key_app/lib/services/adyen/adyen_line_item.dart

+++ b/comwell_key_app/lib/services/adyen/adyen_line_item.dart

@@ -3,7 +3,7 @@ import 'package:json_annotation/json_annotation.dart';

part '../../.generated/services/adyen/adyen_line_item.g.dart';

-@JsonSerializable()

+@JsonSerializable(includeIfNull: false)

class AdyenLineItem {

int? quantity;

int? amountExcludingTax;

diff --git a/comwell_key_app/lib/services/adyen/payment_method.dart b/comwell_key_app/lib/services/adyen/payment_method.dart

index 68b81f61..2a58e149 100644

--- a/comwell_key_app/lib/services/adyen/payment_method.dart

+++ b/comwell_key_app/lib/services/adyen/payment_method.dart

@@ -10,7 +10,7 @@ class PaymentMethod {

PaymentMethod(this.name, this.type);

- factory PaymentMethod.fromJson(Map<String, dynamic> json) => _$PaymentMethodFromJson(json);

+ factory PaymentMethod.fromJson(Json json) => _$PaymentMethodFromJson(json);

Json toJson() => _$PaymentMethodToJson(this);

}

\ No newline at end of file

diff --git a/comwell_key_app/lib/services/adyen/payment_methods.dart b/comwell_key_app/lib/services/adyen/payment_methods.dart

index d9a9948f..33c4b4db 100644

--- a/comwell_key_app/lib/services/adyen/payment_methods.dart

+++ b/comwell_key_app/lib/services/adyen/payment_methods.dart

@@ -1,5 +1,6 @@

import 'package:comwell_key_app/services/adyen/payment_method.dart';

import 'package:comwell_key_app/services/adyen/stored_payment_method.dart';

+import 'package:comwell_key_app/utils/json.dart';

import 'package:json_annotation/json_annotation.dart';

part '../../.generated/services/adyen/payment_methods.g.dart';

@@ -11,5 +12,5 @@ class PaymentMethods {

PaymentMethods(this.paymentMethods, this.storedPaymentMethods);

- factory PaymentMethods.fromJson(Map<String, dynamic> json) => _$PaymentMethodsFromJson(json);

+ factory PaymentMethods.fromJson(Json json) => _$PaymentMethodsFromJson(json);

}

\ No newline at end of file

diff --git a/comwell_key_app/lib/services/adyen/payment_request_data.dart b/comwell_key_app/lib/services/adyen/payment_request_data.dart

index 0a3f9dc6..c6823050 100644

--- a/comwell_key_app/lib/services/adyen/payment_request_data.dart

+++ b/comwell_key_app/lib/services/adyen/payment_request_data.dart

@@ -7,7 +7,6 @@ import 'extensions.dart';

part '../../.generated/services/adyen/payment_request_data.g.dart';

@JsonSerializable(includeIfNull: false)

class PaymentsRequestData {

final String merchantAccount;

@@ -16,15 +15,15 @@ class PaymentsRequestData {

final String? shopperReference;

final String? countryCode;

final String? returnUrl;

- final Map<String, dynamic>? additionalData;

+ final Json? additionalData;

final String? shopperIP;

final String? channel;

final List<AdyenLineItem>? lineItems;

final String? shopperEmail;

- final Map<String, dynamic>? threeDS2RequestData;

+ final Json? threeDS2RequestData;

final RecurringProcessingModel? recurringProcessingModel;

final String? shopperInteraction;

- final Map<String, dynamic>? authenticationData;

+ final Json? authenticationData;

PaymentsRequestData({

required this.merchantAccount,

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 f5c1d14e..34bb8e9b 100644

--- a/comwell_key_app/lib/services/adyen/stored_payment_method.dart

+++ b/comwell_key_app/lib/services/adyen/stored_payment_method.dart

@@ -1,3 +1,4 @@

+import 'package:comwell_key_app/utils/json.dart';

import 'package:equatable/equatable.dart';

import 'package:json_annotation/json_annotation.dart';

@@ -29,7 +30,7 @@ class StoredPaymentMethod extends Equatable {

required this.type,

});

- factory StoredPaymentMethod.fromJson(Map<String, dynamic> json) => _$StoredPaymentMethodFromJson(json);

+ factory StoredPaymentMethod.fromJson(Json json) => _$StoredPaymentMethodFromJson(json);

@override

List<Object?> get props => [id];

diff --git a/comwell_key_app/lib/services/api.dart b/comwell_key_app/lib/services/api.dart

index f8bde9ae..253677a0 100644

--- a/comwell_key_app/lib/services/api.dart

+++ b/comwell_key_app/lib/services/api.dart

@@ -2,6 +2,7 @@ import 'dart:convert';

import 'package:comwell_key_app/profile_settings/model/user.dart';

import 'package:comwell_key_app/services/http_client.dart';

+import 'package:comwell_key_app/utils/json.dart';

import 'package:dio/dio.dart';

import 'adyen/payment_methods.dart';

@@ -31,10 +32,9 @@ class Api {

return await dio.get('/paymentMethods?shopperReference=$shopperReference');

}

- Future<Map<String, dynamic>> postPaymentsDetails(

- Map<String, dynamic> body) async {

+ Future<Json> postPaymentsDetails(Json body) async {

final response = await dio.post("/payment/details", data: jsonEncode(body));

- return response.data as Map<String, dynamic>;

+ return response.data as Json;

}

Future<Response<dynamic>> createEndpointRegistration() async {