Make the Personalization’s dynamicTemplateData generic

Sources/SendGridKit/Models/Personalization.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Personalization: Codable {
+public struct Personalization<DynamicTemplateData: Codable>: Codable {
 
     /// An array of recipients. Each object within this array may contain the name, but must always contain the email, of a recipient.
     public var to: [EmailAddress]?
@@ -21,8 +21,8 @@ public struct Personalization: Codable {
     public var substitutions: [String: String]?
 
     /// A collection of key/value pairs following the pattern "key":"value" to substitute handlebar template data
-    public var dynamicTemplateData: [String: String]?
-    
+    public var dynamicTemplateData: DynamicTemplateData?
+
     /// Values that are specific to this personalization that will be carried along with the email and its activity data.
     public var customArgs: [String: String]?
 
@@ -36,7 +36,7 @@ public struct Personalization: Codable {
         subject: String? = nil,
         headers: [String: String]? = nil,
         substitutions: [String: String]? = nil,
-        dynamicTemplateData: [String: String]? = nil,
+        dynamicTemplateData: DynamicTemplateData? = nil,
         customArgs: [String: String]? = nil,
         sendAt: Date? = nil
     ) {
@@ -64,3 +64,27 @@ public struct Personalization: Codable {
     }
 
 }
+
+public extension Personalization where DynamicTemplateData == [String: String] {
+    init(
+        to: [EmailAddress]? = nil,
+        cc: [EmailAddress]? = nil,
+        bcc: [EmailAddress]? = nil,
+        subject: String? = nil,
+        headers: [String: String]? = nil,
+        substitutions: [String: String]? = nil,
+        dynamicTemplateData: [String: String]? = nil,
+        customArgs: [String: String]? = nil,
+        sendAt: Date? = nil
+    ) {
+        self.to = to
+        self.cc = cc
+        self.bcc = bcc
+        self.subject = subject
+        self.headers = headers
+        self.substitutions = substitutions
+        self.dynamicTemplateData = dynamicTemplateData
+        self.customArgs = customArgs
+        self.sendAt = sendAt
+    }
+}

Sources/SendGridKit/Models/SendGridEmail.swift

@@ -1,9 +1,9 @@
 import Foundation
 
-public struct SendGridEmail: Codable {
-    
+public struct SendGridEmail<DynamicTemplateData: Codable>: Codable {
+
     /// An array of messages and their metadata. Each object within personalizations can be thought of as an envelope - it defines who should receive an individual message and how that message should be handled.
-    public var personalizations: [Personalization]
+    public var personalizations: [Personalization<DynamicTemplateData>]
 
     public var from: EmailAddress
 
@@ -52,7 +52,7 @@ public struct SendGridEmail: Codable {
     public var trackingSettings: TrackingSettings?
 
     public init(
-        personalizations: [Personalization],
+        personalizations: [Personalization<DynamicTemplateData>],
         from: EmailAddress,
         replyTo: EmailAddress? = nil,
         replyToList: [EmailAddress]? = nil,
@@ -110,3 +110,43 @@ public struct SendGridEmail: Codable {
     }
 
 }
+
+public extension SendGridEmail where DynamicTemplateData == [String: String] {
+    init(
+        personalizations: [Personalization<[String: String]>],
+        from: EmailAddress,
+        replyTo: EmailAddress? = nil,
+        replyToList: [EmailAddress]? = nil,
+        subject: String? = nil,
+        content: [EmailContent]? = nil,
+        attachments: [EmailAttachment]? = nil,
+        templateId: String? = nil,
+        headers: [String: String]? = nil,
+        categories: [String]? = nil,
+        customArgs: [String: String]? = nil,
+        sendAt: Date? = nil,
+        batchId: String? = nil,
+        asm: AdvancedSuppressionManager? = nil,
+        ipPoolName: String? = nil,
+        mailSettings: MailSettings? = nil,
+        trackingSettings: TrackingSettings? = nil
+    ) {
+        self.personalizations = personalizations
+        self.from = from
+        self.replyTo = replyTo
+        self.replyToList = replyToList
+        self.subject = subject
+        self.content = content
+        self.attachments = attachments
+        self.templateId = templateId
+        self.headers = headers
+        self.categories = categories
+        self.customArgs = customArgs
+        self.sendAt = sendAt
+        self.batchId = batchId
+        self.asm = asm
+        self.ipPoolName = ipPoolName
+        self.mailSettings = mailSettings
+        self.trackingSettings = trackingSettings
+    }
+}

Sources/SendGridKit/SendGridClient.swift

@@ -27,8 +27,8 @@ public struct SendGridClient {
         self.apiKey = apiKey
     }
 
-    public func send(email: SendGridEmail) async throws {
-                
+    public func send<DynamicTemplateData: Codable>(email: SendGridEmail<DynamicTemplateData>) async throws {
+
         var headers = HTTPHeaders()
         headers.add(name: "Authorization", value: "Bearer \(apiKey)")
         headers.add(name: "Content-Type", value: "application/json")

Tests/SendGridKitTests/SendGridTestsKit.swift

@@ -24,7 +24,7 @@ class SendGridKitTests: XCTestCase {
 
         // TODO: Replace to address with the email address you'd like to recieve your test email!
         let personalization = Personalization(to: ["TO-ADDRESS"])
-        
+
         // TODO: Replace from address with the email address associated with your verified Sender Identity!
         let email = SendGridEmail(
             personalizations: [personalization],