Integrate DataSource into view model

Author: Ecarrion

WooCommerce/Classes/Tools/Zendesk/ZendeskManager.swift

@@ -64,8 +64,8 @@ protocol ZendeskManagerProtocol: SupportManagerAdapter {
     func generalTags() -> [String]
     func wcPayTags() -> [String]
 
-    func generalCustomFields() -> [[Int64: String]]
-    func wcPayCustomFields() -> [[Int64: String]]
+    func generalCustomFields() -> [Int64: String]
+    func wcPayCustomFields() -> [Int64: String]
 }
 
 struct NoZendeskManager: ZendeskManagerProtocol {
@@ -157,12 +157,12 @@ extension NoZendeskManager {
         []
     }
 
-    func generalCustomFields() -> [[Int64: String]] {
-        []
+    func generalCustomFields() -> [Int64: String] {
+        [:]
     }
 
-    func wcPayCustomFields() -> [[Int64: String]] {
-        []
+    func wcPayCustomFields() -> [Int64: String] {
+        [:]
     }
 }
 
@@ -555,19 +555,23 @@ extension ZendeskManager {
         getWCPayTags(supportSourceTag: nil)
     }
 
-    func generalCustomFields() -> [[Int64: String]] {
+    func generalCustomFields() -> [Int64: String] {
         // Extracts the custom fields from the `createRequest` method
-        createRequest(supportSourceTag: nil).customFields.compactMap { field in
-            guard let value = field.value as? String else { return nil } // Guards that all values are string
-            return [field.fieldId: value]
+        createRequest(supportSourceTag: nil).customFields.reduce([:]) { dict, field in
+            guard let value = field.value as? String else { return dict } // Guards that all values are string
+            var mutableDict = dict
+            mutableDict[field.fieldId] = value
+            return mutableDict
         }
     }
 
-    func wcPayCustomFields() -> [[Int64: String]] {
+    func wcPayCustomFields() -> [Int64: String] {
         // Extracts the custom fields from the `createWCPayRequest` method.
-        createWCPayRequest(supportSourceTag: nil).customFields.compactMap { field in
-            guard let value = field.value as? String else { return nil } // Guards that all values are string
-            return [field.fieldId: value]
+        createWCPayRequest(supportSourceTag: nil).customFields.reduce([:]) { dict, field in
+            guard let value = field.value as? String else { return dict } // Guards that all values are string
+            var mutableDict = dict
+            mutableDict[field.fieldId] = value
+            return mutableDict
         }
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Help/SupportForm/SupportFormViewModel.swift

@@ -13,12 +13,30 @@ public protocol SupportFormMetaDataSource {
 
     /// Zendesk Custom Fields
     ///
-    var customFields: [[Int64: String]] { get }
+    var customFields: [Int64: String] { get }
 }
 
 
-/// View Model for the support form
+/// View Model for the support form.
 ///
 public final class SupportFormViewModel {
 
+    /// Zendesk metadata provider.
+    ///
+    private let dataSource: SupportFormMetaDataSource
+
+    init(dataSource: SupportFormMetaDataSource) {
+        self.dataSource = dataSource
+    }
+
+    /// Submits the support request using the Zendesk Provider.
+    ///
+    func submitSupportRequest(onCompletion: @escaping (Result<Void, Error>) -> Void) {
+        ZendeskProvider.shared.createSupportRequest(formID: dataSource.formID,
+                                                    customFields: dataSource.customFields,
+                                                    tags: dataSource.tags,
+                                                    subject: "Temporary Subject",
+                                                    description: "Temporary Description",
+                                                    onCompletion: onCompletion)
+    }
 }

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Help/SupportForm/SupportFormsDataSources.swift

@@ -11,7 +11,7 @@ struct GeneralSupportDataSource: SupportFormMetaDataSource {
         ZendeskProvider.shared.generalTags()
     }
 
-    var customFields: [[Int64: String]] {
+    var customFields: [Int64: String] {
         ZendeskProvider.shared.generalCustomFields()
     }
 }
@@ -27,7 +27,7 @@ struct WCPaySupportDataSource: SupportFormMetaDataSource {
         ZendeskProvider.shared.wcPayTags()
     }
 
-    var customFields: [[Int64: String]] {
+    var customFields: [Int64: String] {
         ZendeskProvider.shared.wcPayCustomFields()
     }
 }