Fix naming + error messaging

tradingticket · Jun 7, 2018 · ddcaadc · ddcaadc
1 parent 2a6b5ed
commit ddcaadc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/TradeItIosTicketSDK2/TradeItOrder.swift b/TradeItIosTicketSDK2/TradeItOrder.swift
@@ -1,10 +1,7 @@
 public typealias TradeItPlaceOrderResult = TradeItPlaceTradeResult
 public typealias TradeItPreviewOrderResult = TradeItPreviewTradeResult
 public typealias TradeItPlaceOrderHandlers = (_ onSuccess: @escaping (TradeItPlaceOrderResult) -> Void,
-                                              _ onVerifyUrl: @escaping (
-                                                                URL,
-                                                                _ complete1FA: @escaping () -> Void
-                                              ) -> Void,
+                                              _ onVerifyUrl: @escaping (URL, _ completeTradeChallenge: @escaping () -> Void) -> Void,
                                               _ onFailure: @escaping (TradeItErrorResult) -> Void) -> Void
 
 @objc public class TradeItOrder: NSObject {

diff --git a/TradeItIosTicketSDK2/TradeItOrderService.swift b/TradeItIosTicketSDK2/TradeItOrderService.swift
@@ -36,10 +36,7 @@ internal class TradeItOrderService: NSObject {
     func cancelOrder(
         _ data: TradeItCancelOrderRequest,
         onSuccess: @escaping () -> Void,
-        onVerifyUrl: @escaping (
-                            URL,
-                            _ complete1FA: @escaping () -> Void
-        ) -> Void,
+        onVerifyUrl: @escaping (URL, _ completeCancelOrderChallenge: @escaping () -> Void) -> Void,
         onFailure: @escaping (TradeItErrorResult) -> Void
         ) {
         data.token = self.session.token
@@ -65,7 +62,7 @@ internal class TradeItOrderService: NSObject {
                     onVerifyUrl(
                         oAuthUrl,
                         {
-                            self.complete1FA(completionBlock: handler)
+                            self.completeCancelOrderChallenge(completionBlock: handler)
                         }
                     )
                 case _ as TradeItAllOrderStatusResult:
@@ -83,7 +80,7 @@ internal class TradeItOrderService: NSObject {
         }
     }
 
-    func complete1FA(completionBlock: @escaping (TradeItResult) -> Void) {
+    func completeCancelOrderChallenge(completionBlock: @escaping (TradeItResult) -> Void) {
         let complete1FARequest = TradeItComplete1FARequest(token: self.session.token)
         let request = TradeItRequestFactory.buildJsonRequest(
             for: complete1FARequest,
@@ -93,7 +90,7 @@ internal class TradeItOrderService: NSObject {
 
         self.session.connector.send(request, targetClassType: TradeItAllOrderStatusResult.self) { result in
             completionBlock(
-                result ?? TradeItErrorResult.tradeError(withSystemMessage: "Error canceling order.")
+                result ?? TradeItErrorResult.error(withSystemMessage: "Error canceling order.")
             )
         }
     }

diff --git a/TradeItIosTicketSDK2/TradeItOrdersViewController.swift b/TradeItIosTicketSDK2/TradeItOrdersViewController.swift
@@ -91,8 +91,8 @@ class TradeItOrdersViewController: TradeItViewController, TradeItOrdersTableDele
                     activityView.hide(animated: true)
                     self.loadOrders()
                 },
-                onVerifyUrl: { url, complete1FA in
-                    self.cancelOrderSecurityHandler = complete1FA
+                onVerifyUrl: { url, completeCancelOrderChallenge in
+                    self.cancelOrderSecurityHandler = completeCancelOrderChallenge
                     let safariViewController = SFSafariViewController(url: url)
                     self.present(safariViewController, animated: true, completion: nil)
                 },
@@ -126,7 +126,10 @@ class TradeItOrdersViewController: TradeItViewController, TradeItOrdersTableDele
             cancelOrderSecurityHandler()
         } else {
             return self.alertManager.showError(
-                TradeItErrorResult.error(withSystemMessage: "Canceling order could not be submitted please try again."),
+                TradeItErrorResult(
+                    title: "Canceling order failed",
+                    message: "Your cancel order request could not be submitted. Please try again."
+                ),
                 onViewController: self
             )
         }

diff --git a/TradeItIosTicketSDK2/TradeItTradePreviewViewController.swift b/TradeItIosTicketSDK2/TradeItTradePreviewViewController.swift
@@ -91,8 +91,8 @@ class TradeItTradePreviewViewController: TradeItViewController, UITableViewDeleg
                 activityView.hide(animated: true)
                 self.delegate?.orderSuccessfullyPlaced(onTradePreviewViewController: self, withPlaceOrderResult: result)
             },
-            { url, complete1FA in
-                self.tradeSecurityHandler = complete1FA
+            { url, completeTradeChallenge in
+                self.tradeSecurityHandler = completeTradeChallenge
                 let safariViewController = SFSafariViewController(url: url)
                 self.present(safariViewController, animated: true, completion: nil)
             },

diff --git a/TradeItIosTicketSDK2/TradeItYahooTradePreviewViewController.swift b/TradeItIosTicketSDK2/TradeItYahooTradePreviewViewController.swift
@@ -109,7 +109,7 @@ class TradeItYahooTradePreviewViewController: TradeItYahooViewController, UITabl
 
                         self.fireViewEventNotification(view: .submitted)
                     },
-                    { url, complete1FA in
+                    { url, completeTradeChallenge in
                         activityView.hide(animated: true)
                         self.alertManager.showError(
                             TradeItErrorResult.tradeError(withSystemMessage: "completeTradeChallenge is not implemented"),