Merge pull request #50 from Adyen/feature/improvePaymentResultClass

Feature/improve payment result class
Adyen · Oct 12, 2023 · d8e0bf5 · d8e0bf5
2 parents 7b30509 + 5711439
commit d8e0bf5
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 50 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -186,20 +186,29 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-
   _dialogBuilder(BuildContext context, PaymentResult paymentResult) {
+    String title = "";
     String message = "";
-    if (paymentResult.result != null) {
-      message = "Result code: ${paymentResult.result?.resultCode}";
-    } else {
-      message = "Error: ${paymentResult.reason}";
+    switch (paymentResult) {
+      case PaymentAdvancedFlowFinished():
+        title = "Finished";
+        message = "Result code: ${paymentResult.resultCode}";
+      case PaymentSessionFinished():
+        title = "Finished";
+        message = "Result code: ${paymentResult.resultCode}";
+      case PaymentCancelledByUser():
+        title = "Cancelled by user";
+        message = "Drop-in cancelled by user";
+      case PaymentError():
+        title = "Error occurred";
+        message = "${paymentResult.reason}";
     }
 
     return showDialog(
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: Text(paymentResult.type.name),
+          title: Text(title),
           content: Text(message),
           actions: <Widget>[
             TextButton(

diff --git a/lib/src/adyen_checkout.dart b/lib/src/adyen_checkout.dart
@@ -97,13 +97,26 @@ class AdyenCheckout implements AdyenCheckoutInterface {
       }
     });
 
-    return dropInSessionCompleter.future.then((value) {
+    return dropInSessionCompleter.future.then((paymentResultDTO) {
       AdyenCheckoutPlatformInterface.instance.cleanUpDropIn();
       _resultApi.dropInSessionPlatformCommunicationStream.close();
-      _adyenLogger.print("Drop-in session result type: ${value.type.name}");
       _adyenLogger
-          .print("Drop-in session result code: ${value.result?.resultCode}");
-      return value.fromDTO();
+          .print("Drop-in session result type: ${paymentResultDTO.type.name}");
+      _adyenLogger.print(
+          "Drop-in session result code: ${paymentResultDTO.result?.resultCode}");
+      switch (paymentResultDTO.type) {
+        case PaymentResultEnum.cancelledByUser:
+          return PaymentCancelledByUser();
+        case PaymentResultEnum.error:
+          return PaymentError(reason: paymentResultDTO.reason);
+        case PaymentResultEnum.finished:
+          return PaymentSessionFinished(
+            sessionId: paymentResultDTO.result?.sessionId ?? "",
+            sessionData: paymentResultDTO.result?.sessionData ?? "",
+            resultCode: paymentResultDTO.result?.resultCode ?? "",
+            order: paymentResultDTO.result?.order?.fromDTO(),
+          );
+      }
     });
   }
 
@@ -168,14 +181,23 @@ class AdyenCheckout implements AdyenCheckoutInterface {
       }
     });
 
-    return dropInAdvancedFlowCompleter.future.then((value) {
+    return dropInAdvancedFlowCompleter.future.then((paymentResultDTO) {
       AdyenCheckoutPlatformInterface.instance.cleanUpDropIn();
       _resultApi.dropInAdvancedFlowPlatformCommunicationStream.close();
-      _adyenLogger
-          .print("Drop-in advanced flow result type: ${value.type.name}");
       _adyenLogger.print(
-          "Drop-in advanced flow result code: ${value.result?.resultCode}");
-      return value.fromDTO();
+          "Drop-in advanced flow result type: ${paymentResultDTO.type.name}");
+      _adyenLogger.print(
+          "Drop-in advanced flow result code: ${paymentResultDTO.result?.resultCode}");
+      switch (paymentResultDTO.type) {
+        case PaymentResultEnum.cancelledByUser:
+          return PaymentCancelledByUser();
+        case PaymentResultEnum.error:
+          return PaymentError(reason: paymentResultDTO.reason);
+        case PaymentResultEnum.finished:
+          return PaymentAdvancedFlowFinished(
+            resultCode: paymentResultDTO.result?.resultCode ?? "",
+          );
+      }
     });
   }
 

diff --git a/lib/src/models/payment_result.dart b/lib/src/models/payment_result.dart
@@ -1,27 +1,31 @@
 import 'package:adyen_checkout/adyen_checkout.dart';
 
-class PaymentResult {
-  final PaymentResultEnum type;
-  final String? reason;
-  final PaymentResultModel? result;
+sealed class PaymentResult {}
+
+class PaymentAdvancedFlowFinished extends PaymentResult {
+  final String resultCode;
 
-  PaymentResult(
-    this.type,
-    this.reason,
-    this.result,
-  );
+  PaymentAdvancedFlowFinished({required this.resultCode});
 }
 
-class PaymentResultModel {
-  final String? sessionId;
-  final String? sessionData;
-  final String? resultCode;
+class PaymentSessionFinished extends PaymentResult {
+  final String sessionId;
+  final String sessionData;
+  final String resultCode;
   final OrderResponse? order;
 
-  PaymentResultModel(
-    this.sessionId,
-    this.sessionData,
-    this.resultCode,
+  PaymentSessionFinished({
+    required this.sessionId,
+    required this.sessionData,
+    required this.resultCode,
     this.order,
-  );
+  });
+}
+
+class PaymentCancelledByUser extends PaymentResult {}
+
+class PaymentError extends PaymentResult {
+  final String? reason;
+
+  PaymentError({required this.reason});
 }
diff --git a/lib/src/utils/dto_mapper.dart b/lib/src/utils/dto_mapper.dart
@@ -69,23 +69,6 @@ extension AmountMapper on Amount {
       );
 }
 
-extension PaymentResultMapper on PaymentResultDTO {
-  PaymentResult fromDTO() => PaymentResult(
-        type,
-        reason,
-        result?.fromDTO(),
-      );
-}
-
-extension PaymentResulModelMapper on PaymentResultModelDTO {
-  PaymentResultModel fromDTO() => PaymentResultModel(
-        sessionId,
-        sessionData,
-        resultCode,
-        order?.fromDTO(),
-      );
-}
-
 extension OrderResponseMapper on OrderResponseDTO {
   OrderResponse fromDTO() => OrderResponse(
         pspReference: pspReference,