no message

Author: heart

Sources/Pam/PAMHelper.swift

@@ -0,0 +1,66 @@
+//
+//  File.swift
+//  
+//
+//  Created by narongrit kanhanoi on 29/3/2564 BE.
+//
+
+import Foundation
+import UserNotifications
+
+public class PAMUtils {
+    static func prettify(dict: [String: Any]) -> String {
+        let jsonData = try! JSONSerialization.data(withJSONObject: dict, options: .prettyPrinted)
+        return String(data: jsonData, encoding: .utf8) ?? ""
+    }
+    static func dateFrom(string: String?) -> Date?{
+        guard let date = string else {return nil}
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        let dateObj = dateFormatter.date(from:date)
+        return dateObj
+    }
+    
+    public static func isPamNotification(_ notification: UNNotification) -> Bool{
+        if notification.request.content.userInfo["pam"] != nil {
+            return true
+        }
+        return false
+    }
+    
+    public static func convertUNNotificationToPam(_ notification: UNNotification) -> PamPushMessage? {
+        if let data = notification.request.content.userInfo["pam"] as? NSDictionary {
+            let url = data.object(forKey: "url") as? String
+            let popupType = data.object(forKey: "popupType") as? String
+            let pixel = data.object(forKey: "pixel") as? String
+            let flex = data.object(forKey: "flex") as? String
+            
+            let aps = notification.request.content.userInfo["aps"] as? [String: Any]
+            let alert = aps?["alert"] as? [String: String]
+            let title = alert?["title"]
+            let body = alert?["body"]
+            
+            var payload:[String: Any] = [:]
+            for (value, key) in data {
+                payload[key as! String] = value
+            }
+            
+            return PamPushMessage(
+                deliverID: nil,
+                pixel: pixel,
+                title: title,
+                description: body,
+                thumbnailUrl: nil,
+                flex: flex,
+                url: url,
+                popupType: popupType,
+                isRead: false,
+                date: Date(),
+                data: payload,
+                pam: nil)
+        }
+        
+        return nil
+    }
+}
+

Sources/Pam/PAMUtils.swift

@@ -345,7 +345,7 @@ public class Pam: NSObject {
         if isEnableLog {
             print("\n\n🦄 PAM : POST Event = 🍀\(event)🍀")
             print("🦄 PAM : Payload")
-            print("🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉\n",PAMHelper.prettify(dict: body), "\n🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉\n\n")
+            print("🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉\n",PAMUtils.prettify(dict: body), "\n🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉🍉\n\n")
         }
 
         HttpClient.post(url: url, queryString: nil, headers: nil, json: body) { res in

Sources/Pam/Pam.swift

@@ -18,8 +18,8 @@ public struct PamPushMessage {
     public let popupType:String?
     public let isRead: Bool
     public let date: Date?
-    public let data: NSDictionary?
-    public let pam: NSDictionary?
+    public let data: [String: Any]?
+    public let pam: [String: Any]?
 
     public func read(){
         NotificationAPI.read(message: self)
@@ -30,23 +30,22 @@ public struct PamPushMessage {
 
         var arr: [PamPushMessage]?
 
-        if let json = try? JSONSerialization.jsonObject(with: data) as? NSDictionary{
+        if let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
 
-            if let items = json.object(forKey:"items") as? [NSDictionary] {
+            if let items = json["items"] as? [[String: Any]] {
                 arr = items.map { item in
-                    
-                    let deliverID = item.object(forKey:"deliver_id") as? String
-                    let pixel = item.object(forKey:"pixel") as? String
-                    let title = item.object(forKey:"title") as? String
-                    let description = item.object(forKey:"description") as? String
-                    let thumbnailUrl = item.object(forKey:"thumbnail_url") as? String
-                    let flex = item.object(forKey:"flex") as? String
-                    let url = item.object(forKey:"url") as? String
-                    let data = item.object(forKey:"json_data") as? NSDictionary
-                    let pam = item.object(forKey:"pam") as? NSDictionary
-                    let popupType = item.object(forKey:"popupType") as? String
-                    let date = item.object(forKey:"created_date") as? String
-                    let isRead = item.object(forKey:"is_open") as? Bool
+                    let deliverID = item["deliver_id"] as? String
+                    let pixel = item["pixel"] as? String
+                    let title = item["title"] as? String
+                    let description = item["description"] as? String
+                    let thumbnailUrl = item["thumbnail_url"] as? String
+                    let flex = item["flex"] as? String
+                    let url = item["url"] as? String
+                    let data = item["json_data"] as? [String: Any]
+                    let pam = item["pam"] as? [String: Any]
+                    let popupType = item["popupType"] as? String
+                    let date = item["created_date"] as? String
+                    let isRead = item["is_open"] as? Bool
 
                     return PamPushMessage(
                         deliverID: deliverID,
@@ -58,11 +57,12 @@ public struct PamPushMessage {
                         url: url,
                         popupType: popupType,
                         isRead: isRead ?? true,
-                        date: PAMHelper.dateFrom(string: date),
+                        date: PAMUtils.dateFrom(string: date),
                         data: data,
                         pam: pam)
                 }
             }
+            
         }
 
         return arr ?? []