react-native-netmera 2.0.0-alpha02 → 2.0.0-alpha04

package/ios/RNNetmera.swift

@@ -61,6 +61,8 @@ public class RNNetmera: NSObject {
   var netmeraInbox: NetmeraInboxManager?
   var categoryManager: NetmeraInboxCategoryManager?
 
+  // MARK: Initialize methods
+  
   /// Tracks whether `Netmera.initialize()` and shared setup have completed at least once.
   private static var isInitialized = false
 
@@ -99,6 +101,8 @@ public class RNNetmera: NSObject {
     ])
   }
   
+  // MARK: Notification methods
+  
   @objc(requestPushNotificationAuthorization:withRejecter:)
   public func requestPushNotificationAuthorization(
     resolve: @escaping RCTPromiseResolveBlock,
@@ -117,14 +121,6 @@ public class RNNetmera: NSObject {
     }
   }
   
-  @objc(currentExternalId:withRejecter:)
-  func currentExternalId(
-    resolve: RCTPromiseResolveBlock,
-    reject: RCTPromiseRejectBlock
-  ) {
-    resolve(Netmera.getCurrentExternalId())
-  }
-  
   @objc(checkNotificationPermission:withRejecter:)
   func checkNotificationPermission(
     resolve: @escaping RCTPromiseResolveBlock,
@@ -146,6 +142,28 @@ public class RNNetmera: NSObject {
     }
   }
   
+  @objc(isPushEnabled:withRejecter:)
+  func isPushEnabled(
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+    Netmera.isReceivingPushNotificationsEnabled { isEnabled in
+      resolve(isEnabled)
+    }
+  }
+  
+  @objc(enablePush)
+  func enablePush() {
+    Netmera.setReceivingPushNotificationsEnabled(true)
+  }
+  
+  @objc(disablePush)
+  func disablePush() {
+    Netmera.setReceivingPushNotificationsEnabled(false)
+  }
+  
+  // MARK: Location methods
+  
   @objc(requestPermissionsForLocation)
   func requestPermissionsForLocation() {
     Netmera.requestLocationAuthorization()
@@ -156,6 +174,8 @@ public class RNNetmera: NSObject {
     Netmera.setNetmeraMaxActiveRegions(count: maxActiveRegions)
   }
   
+  // MARK: Popup presentation methods
+  
   @objc(enablePopupPresentation)
   func enablePopupPresentation() {
     Netmera.setPopupPresentationEnabled(true)
@@ -171,25 +191,7 @@ public class RNNetmera: NSObject {
     Netmera.dismissAllPresentations()
   }
   
-  @objc(isPushEnabled:withRejecter:)
-  func isPushEnabled(
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    Netmera.isReceivingPushNotificationsEnabled { isEnabled in
-      resolve(isEnabled)
-    }
-  }
-  
-  @objc(enablePush)
-  func enablePush() {
-    Netmera.setReceivingPushNotificationsEnabled(true)
-  }
-  
-  @objc(disablePush)
-  func disablePush() {
-    Netmera.setReceivingPushNotificationsEnabled(false)
-  }
+  // MARK: Data management methods
   
   @objc(startDataTransfer)
   func startDataTransfer() {
@@ -235,6 +237,8 @@ public class RNNetmera: NSObject {
     Netmera.send(eventWithKey: code, attributes: filtered)
   }
 
+  // MARK: User methods
+  
   @objc(identifyUser:hasCallback:withResolver:withRejecter:)
   func identifyUser(_ userDictionary: [String: Any],
                     hasCallback: Bool,
@@ -295,6 +299,14 @@ public class RNNetmera: NSObject {
     InternalNetmera.updateUserProfile(withDictionary: userProfileDictionary, completion: completionBlock)
   }
   
+  @objc(currentExternalId:withRejecter:)
+  func currentExternalId(
+    resolve: RCTPromiseResolveBlock,
+    reject: RCTPromiseRejectBlock
+  ) {
+    resolve(Netmera.getCurrentExternalId())
+  }
+  
   @objc(fetchCoupons:max:withResolver:withRejecter:)
   func fetchCoupons(_ page: Int, max: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     let filter = NetmeraCouponFilter(page: page, max: max)
@@ -302,8 +314,20 @@ public class RNNetmera: NSObject {
     Netmera.fetchCoupons(using: filter) { result in
       switch result {
       case .success(let coupons):
-        let array = RNNetmeraUtils.shared.parseCouponObjects(coupons)
-        resolve(array)
+        resolve(coupons.map { coupon in
+            var data: [String: Any] = [
+                "couponId": coupon.couponId,
+                "name": coupon.name,
+                "code": coupon.code
+            ]
+            if let assignDate = coupon.assignDate {
+                data["assignDate"] = String(format: "%f", assignDate.timeIntervalSince1970)
+            }
+            if let expireDate = coupon.expireDate {
+                data["expireDate"] = String(format: "%f", expireDate.timeIntervalSince1970)
+            }
+            return data
+        })
       case .failure(let error):
         reject(ERROR_CODE_COUPON_FETCH, ERROR_MESSAGE_COUPON_FETCH, error)
       }
@@ -316,10 +340,13 @@ public class RNNetmera: NSObject {
     Netmera.getUserCategoryPreferenceList { result in
       switch result {
       case .success(let categories):
-        let parsed = RNNetmeraUtils.shared.parseUserCategoryPreferenceListToMap(
-          categories
-        )
-        resolve(parsed)
+        resolve(categories.map { preference in
+           var data: [String: Any] = [:]
+           if let id = preference.categoryId { data["categoryId"] = id }
+           if let name = preference.categoryName { data["categoryName"] = name }
+           if let enabled = preference.categoryEnabled { data["optInStatus"] = enabled }
+           return data
+       })
       case .failure(_):
         reject(ERROR_CODE_GET_CATEGORY_PREFERENCE,
                ERROR_MESSAGE_GET_CATEGORY_PREFERENCE,
@@ -346,15 +373,70 @@ public class RNNetmera: NSObject {
     }
   }
   
-  @objc(getInitialURL:withRejecter:)
-  func getInitialURL(resolve: RCTPromiseResolveBlock,
-                     reject: RCTPromiseRejectBlock) {
-    if let url = RNNetmeraRCTEventEmitter.getInitialUrl() {
-      resolve(url.absoluteString)
-    } else {
+  @objc(setEmailPermission:withResolver:withRejecter:)
+    func setEmailPermission(isAllowed: Bool,
+                            resolve: RCTPromiseResolveBlock,
+                            reject: RCTPromiseRejectBlock) {
+      Netmera.setEmailPermission(isAllowed: isAllowed)
       resolve(nil)
     }
-  }
+
+    @objc(getEmailPermission:withRejecter:)
+    func getEmailPermission(resolve: @escaping RCTPromiseResolveBlock,
+                            reject: @escaping RCTPromiseRejectBlock) {
+      Netmera.getEmailPermission { result in
+        switch result {
+        case .success(let isAllowed):
+          resolve(isAllowed)
+        case .failure(let error):
+          reject(ERROR_CODE_EMAIL_PERMISSION, ERROR_MESSAGE_EMAIL_PERMISSION, error)
+        }
+      }
+    }
+
+    @objc(setSmsPermission:withResolver:withRejecter:)
+    func setSmsPermission(isAllowed: Bool,
+                          resolve: RCTPromiseResolveBlock,
+                          reject: RCTPromiseRejectBlock) {
+      Netmera.setSmsPermission(isAllowed: isAllowed)
+      resolve(nil)
+    }
+
+    @objc(getSmsPermission:withRejecter:)
+    func getSmsPermission(resolve: @escaping RCTPromiseResolveBlock,
+                          reject: @escaping RCTPromiseRejectBlock) {
+      Netmera.getSmsPermission { result in
+        switch result {
+        case .success(let isAllowed):
+          resolve(isAllowed)
+        case .failure(let error):
+          reject(ERROR_CODE_SMS_PERMISSION, ERROR_MESSAGE_SMS_PERMISSION, error)
+        }
+      }
+    }
+
+    @objc(setWhatsAppPermission:withResolver:withRejecter:)
+    func setWhatsAppPermission(isAllowed: Bool,
+                               resolve: RCTPromiseResolveBlock,
+                               reject: RCTPromiseRejectBlock) {
+      Netmera.setWhatsAppPermission(isAllowed: isAllowed)
+      resolve(nil)
+    }
+
+    @objc(getWhatsAppPermission:withRejecter:)
+    func getWhatsAppPermission(resolve: @escaping RCTPromiseResolveBlock,
+                               reject: @escaping RCTPromiseRejectBlock) {
+      Netmera.getWhatsAppPermission { result in
+        switch result {
+        case .success(let isAllowed):
+          resolve(isAllowed)
+        case .failure(let error):
+          reject(ERROR_CODE_WHATSAPP_PERMISSION, ERROR_MESSAGE_WHATSAPP_PERMISSION, error)
+        }
+      }
+    }
+
+  // MARK: Push inbox methods
   
   @objc(fetchInbox:withResolver:withRejecter:)
   public func fetchInbox(_ inboxDictionary: [String: Any],
@@ -386,7 +468,7 @@ public class RNNetmera: NSObject {
       switch result {
       case .success:
         let array: [[String: Any]] = manager.objects.map {
-          RNNetmeraUtils.shared.dictionaryFromInboxPush($0)
+          RNNetmeraPushObject.getPushObjectMap($0)
         }
         resolver(array)
         self.netmeraInbox = manager
@@ -412,7 +494,7 @@ public class RNNetmera: NSObject {
     inbox.nextPage { status in
       switch status {
       case .success:
-        let array = RNNetmeraUtils.shared.mapPushObjects(inbox.objects)
+        let array = RNNetmeraPushObject.mapPushObjects(inbox.objects)
         resolver(array)
       case .failure(let error):
         rejecter(ERROR_CODE_NOT_NEXT_PAGE, ERROR_MESSAGE_NOT_NEXT_PAGE, error)
@@ -477,10 +559,22 @@ public class RNNetmera: NSObject {
 
   
   @objc(fetchCategory:withResolver:withRejecter:)
-  public func fetchCategory(_ inboxDictionary: [String: Any],
+  public func fetchCategory(_ filterDict: [String: Any],
                             resolver: @escaping RCTPromiseResolveBlock,
                             rejecter: @escaping RCTPromiseRejectBlock) {
-    let filter = RNNetmeraCategoryObject.getCategoryFilter(inboxDictionary)
+    let categoryInboxStatus: NetmeraInboxStatus
+    if let statusRaw = filterDict["status"] as? Int {
+        categoryInboxStatus = NetmeraInboxStatus(rawValue: statusRaw)
+    } else {
+        categoryInboxStatus = .default
+    }
+    let categoryPageSize = filterDict["pageSize"] as? Int ?? 10
+    let categoryIncludeExpired = filterDict["includeExpiredObjects"] as? Bool ?? false
+    let filter = NetmeraInboxCategoryFilter(
+        status: categoryInboxStatus,
+        pageSize: categoryPageSize,
+        shouldIncludeExpiredObjects: categoryIncludeExpired
+    )
     
     guard let manager = Netmera.inboxCategoryManager(with: filter) else {
       rejecter(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil)
@@ -492,10 +586,21 @@ public class RNNetmera: NSObject {
       case .success(let isSuccess):
         if isSuccess {
           self.categoryManager = manager
-          let mappedCategories = RNNetmeraCategoryObject.mapCategoryObjects(
-            manager.categories
-          )
-          resolver(mappedCategories)
+          resolver(manager.categories.map { categoryObject in
+              var data: [String: Any] = [:]
+              data["categoryName"] = categoryObject.categoryName
+              data["readCount"] = categoryObject.statusCounts[.read] ?? 0
+              data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
+              data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
+              if let lastMessage = categoryObject.lastMessage {
+                  let lastMsg = RNNetmeraPushObject.getPushObjectMap(lastMessage)
+                  if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
+                     let jsonStr = String(data: jsonData, encoding: .utf8) {
+                      data["lastMessage"] = jsonStr
+                  }
+              }
+              return data
+          })
         } else {
           rejecter(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil)
         }
@@ -521,10 +626,21 @@ public class RNNetmera: NSObject {
       switch status {
       case .success(let isSuccess):
         if isSuccess {
-          let mappedCategories = RNNetmeraCategoryObject.mapCategoryObjects(
-            category.categories
-          )
-          resolve(mappedCategories)
+          resolve(category.categories.map { categoryObject in
+              var data: [String: Any] = [:]
+              data["categoryName"] = categoryObject.categoryName
+              data["readCount"] = categoryObject.statusCounts[.read] ?? 0
+              data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
+              data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
+              if let lastMessage = categoryObject.lastMessage {
+                  let lastMsg = RNNetmeraPushObject.getPushObjectMap(lastMessage)
+                  if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
+                     let jsonStr = String(data: jsonData, encoding: .utf8) {
+                      data["lastMessage"] = jsonStr
+                  }
+              }
+              return data
+          })
         } else {
           reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil)
         }
@@ -546,11 +662,11 @@ public class RNNetmera: NSObject {
       return
     }
     
-    if let pushInboxObject = inbox.objects.first(
-      where: { $0.payload?.pushId == pushId
-      }),
-       let pushObject = pushInboxObject.push {
-      Netmera.handlePushObject(pushObject)
+    if let pushInboxObject = inbox.objects.first(where: { $0.payload?.pushId == pushId }),
+       let payload = pushInboxObject.payload,
+       let action = payload.action {
+        Netmera.handleAction(action, for: payload)
+
     }
     
     resolver(nil)
@@ -568,14 +684,14 @@ public class RNNetmera: NSObject {
     
     for pushInboxObject in inbox.objects {
       guard
-        let pushObject = pushInboxObject.push,
+        let pushObject = pushInboxObject.payload,
         let actions = pushObject.interactiveAction
       else {
         continue
       }
       if let interactiveAction = actions.first(where: { $0.id == interactiveActionId }),
          let action = interactiveAction.action {
-        Netmera.handleInteractiveAction(action, for: pushObject)
+        Netmera.handleAction(action, for: pushObject)
         return
       }
     }
@@ -583,38 +699,6 @@ public class RNNetmera: NSObject {
     resolver(false)
   }
   
-  @objc(handleLastMessage:withResolver:withRejecter:)
-  public func handleLastMessage(_ pushId: String,
-                                resolver: @escaping RCTPromiseResolveBlock,
-                                rejecter: @escaping RCTPromiseRejectBlock) {
-    
-    guard let inbox = netmeraInbox else {
-      rejecter(ERROR_CODE_INBOX_NULL, ERROR_MESSAGE_INBOX_NULL, nil)
-      return
-    }
-    
-    guard !pushId.isEmpty else {
-      rejecter(
-        ERROR_CODE_INVALID_PUSH_OBJECT,
-        ERROR_MESSAGE_INVALID_PUSH_OBJECT,
-        nil
-      )
-      return
-    }
-    
-    if let matched = inbox.objects.last(where: { $0.push?.pushId == pushId }),
-       let pushObject = matched.push {
-      Netmera.handlePushObject(pushObject)
-      resolver(true)
-    } else {
-      rejecter(
-        ERROR_CODE_INVALID_PUSH_OBJECT,
-        ERROR_MESSAGE_INVALID_PUSH_OBJECT,
-        nil
-      )
-    }
-  }
-  
   @objc(updateStatusByCategories:status:withResolver:withRejecter:)
   public func updateStatusByCategories(_ categoryList: [String],
                                        status: Int,
@@ -670,7 +754,20 @@ public class RNNetmera: NSObject {
       return
     }
     
-    let status = RNNetmeraUtils.shared.getInboxStatus(code: statusValue)
+    let status: NetmeraInboxStatus
+    switch statusValue {
+    case NetmeraInboxStatus.deleted.rawValue:
+      status = .deleted
+    case NetmeraInboxStatus.read.rawValue:
+      status = .read
+    case NetmeraInboxStatus.unread.rawValue:
+      status = .unread
+    case NetmeraInboxStatus.all.rawValue:
+      fallthrough
+    default:
+      status = .all
+    }
+    
     let shouldIncludeExpiredObjects = filterDictionary["includeExpiredObjects"] as? Bool ?? false
     let categories = filterDictionary["categoryList"] as? [String] ?? []
     
@@ -683,77 +780,24 @@ public class RNNetmera: NSObject {
     Netmera.fetchInboxCount(with: filter) { resultStatus in
       switch resultStatus {
       case .success(let response):
-        let responseMap = RNNetmeraUtils.shared.parseInboxCount(for: response)
-        resolver(responseMap)
+        resolver([
+          "7": response.count(for: .all),
+          "1": response.count(for: .read),
+          "2": response.count(for: .unread),
+          "4": response.count(for: .deleted)
+        ])
       case .failure(let error):
         rejecter(ERROR_CODE_INBOX_STATUS, ERROR_MESSAGE_INBOX_STATUS, error)
       }
     }
   }
   
-  // MARK: - Permission Methods
-
-  @objc(setEmailPermission:withResolver:withRejecter:)
-    func setEmailPermission(isAllowed: Bool,
-                            resolve: RCTPromiseResolveBlock,
-                            reject: RCTPromiseRejectBlock) {
-      Netmera.setEmailPermission(isAllowed: isAllowed)
-      resolve(nil)
-    }
-
-    @objc(getEmailPermission:withRejecter:)
-    func getEmailPermission(resolve: @escaping RCTPromiseResolveBlock,
-                            reject: @escaping RCTPromiseRejectBlock) {
-      Netmera.getEmailPermission { result in
-        switch result {
-        case .success(let isAllowed):
-          resolve(isAllowed)
-        case .failure(let error):
-          reject(ERROR_CODE_EMAIL_PERMISSION, ERROR_MESSAGE_EMAIL_PERMISSION, error)
-        }
-      }
-    }
-
-    @objc(setSmsPermission:withResolver:withRejecter:)
-    func setSmsPermission(isAllowed: Bool,
-                          resolve: RCTPromiseResolveBlock,
-                          reject: RCTPromiseRejectBlock) {
-      Netmera.setSmsPermission(isAllowed: isAllowed)
-      resolve(nil)
-    }
-
-    @objc(getSmsPermission:withRejecter:)
-    func getSmsPermission(resolve: @escaping RCTPromiseResolveBlock,
-                          reject: @escaping RCTPromiseRejectBlock) {
-      Netmera.getSmsPermission { result in
-        switch result {
-        case .success(let isAllowed):
-          resolve(isAllowed)
-        case .failure(let error):
-          reject(ERROR_CODE_SMS_PERMISSION, ERROR_MESSAGE_SMS_PERMISSION, error)
-        }
-      }
-    }
-
-    @objc(setWhatsAppPermission:withResolver:withRejecter:)
-    func setWhatsAppPermission(isAllowed: Bool,
-                               resolve: RCTPromiseResolveBlock,
-                               reject: RCTPromiseRejectBlock) {
-      Netmera.setWhatsAppPermission(isAllowed: isAllowed)
-      resolve(nil)
-    }
-
-    @objc(getWhatsAppPermission:withRejecter:)
-    func getWhatsAppPermission(resolve: @escaping RCTPromiseResolveBlock,
-                               reject: @escaping RCTPromiseRejectBlock) {
-      Netmera.getWhatsAppPermission { result in
-        switch result {
-        case .success(let isAllowed):
-          resolve(isAllowed)
-        case .failure(let error):
-          reject(ERROR_CODE_WHATSAPP_PERMISSION, ERROR_MESSAGE_WHATSAPP_PERMISSION, error)
-        }
-      }
-    }
+  // MARK: Other methods
+  
+  @objc(getInitialURL:withRejecter:)
+  func getInitialURL(resolve: RCTPromiseResolveBlock,
+                     reject: RCTPromiseRejectBlock) {
+    resolve(RNNetmeraRCTEventEmitter.getInitialUrl())
+  }
   
 }

package/ios/RNNetmeraPushLifecycleDelegate.swift

@@ -10,25 +10,37 @@ final class RNNetmeraPushLifecycleDelegate: NSObject, NetmeraPushLifecycleDelega
 
   static let shared = RNNetmeraPushLifecycleDelegate()
 
+  private func triggerDeeplinkIfPresent(in action: NetmeraPushAction?) {
+    guard
+      let action,
+      action.actionType == .openDeeplink,
+      let deeplink = action as? NetmeraDeeplinkAction,
+      let url = deeplink.deeplinkURL
+    else { return }
+    RNNetmeraRCTEventEmitter.onDeeplinkTriggered(url)
+  }
+
   func didRegisterDeviceToken(_ deviceToken: String) {
     RNNetmeraRCTEventEmitter.onPushRegister(["pushToken": deviceToken])
   }
 
   func didReceive(_ push: NetmeraBasePush) {
-    let payload = RNNetmeraUtils.shared.getBasePushObjectMap(push)
-    guard !payload.isEmpty else { return }
+    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
     RNNetmeraRCTEventEmitter.onPushReceive(["payload": payload])
   }
 
   func didOpen(_ push: NetmeraBasePush) {
-    let payload = RNNetmeraUtils.shared.getBasePushObjectMap(push)
-    guard !payload.isEmpty else { return }
+    triggerDeeplinkIfPresent(in: push.action)
+    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
     RNNetmeraRCTEventEmitter.onPushOpen(["payload": payload])
   }
 
   func didClickActionButton(_ identifier: String, for push: NetmeraBasePush) {
-    let payload = RNNetmeraUtils.shared.getBasePushObjectMap(push)
-    guard !payload.isEmpty else { return }
+    if let interactive = push as? NetmeraInteractivePush,
+       let item = interactive.interactiveAction?.first(where: { $0.id == identifier }) {
+      triggerDeeplinkIfPresent(in: item.action)
+    }
+    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
     RNNetmeraRCTEventEmitter.onPushButtonClicked([
       "payload": payload,
       "identifier": identifier,
@@ -36,12 +48,14 @@ final class RNNetmeraPushLifecycleDelegate: NSObject, NetmeraPushLifecycleDelega
   }
 
   func didClickCarouselItem(_ identifier: String?, for push: NetmeraBasePush) {
-    let payload = RNNetmeraUtils.shared.getBasePushObjectMap(push)
-    guard !payload.isEmpty else { return }
-    var body: [String: Any] = ["payload": payload]
-    if let identifier {
-      body["identifier"] = identifier
+    if let content = push as? NetmeraContentPush,
+       let item = content.carousel?.first(where: { $0.id == identifier }) {
+      triggerDeeplinkIfPresent(in: item.action)
     }
-    RNNetmeraRCTEventEmitter.onCarouselItemClicked(body)
+    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
+    RNNetmeraRCTEventEmitter.onCarouselItemClicked([
+      "payload": payload,
+      "identifier": identifier as Any
+    ])
   }
 }