react-native-mytatva-rn-sdk 1.2.93 → 1.2.94

package/ios/Support/Converter/DataConverter.swift

@@ -7,43 +7,76 @@
 
 import Foundation
 
+// MARK: - POC safe accessors: use SDK value when present, otherwise default
+
+private func pocInt(_ value: NSNumber?) -> Int {
+    value?.intValue ?? 0
+}
+
+private func pocInt32(_ value: NSNumber?) -> Int32 {
+    value?.int32Value ?? 0
+}
+
+private func pocFloat(_ value: NSNumber?) -> Float {
+    value?.floatValue ?? 0
+}
+
+private func pocName(from data: GlucoseData) -> String {
+    data.device?.advertise?.localName ?? ""
+}
+
+private func pocTimeInMillis(from data: GlucoseData) -> Double {
+    if let receiveDateTime = data.receiveDateTime,
+       let date = KLTDateFormatter.shared.getDateFromWholeString(receiveDateTime) {
+        return date.timeIntervalSince1970 * 1000
+    }
+    return Date().timeIntervalSince1970 * 1000
+}
+
+private func pocErrorId(from data: GlucoseData) -> Int {
+    let fromError = pocInt(data.error)
+    if fromError != 0 {
+        return fromError
+    }
+    return pocInt(data.errorCode)
+}
+
 func ReceiveDataToLog(data: GlucoseData) -> CGMLog {
-    let cgmLogs = CGMLog(
-        timeInMillis: Double(Date().timeIntervalSince1970 * 1000),
-        countdownMinutes: (data.countdownMinutes as? Int) ?? 0,
-        countdownDays: (data.countdownDays as? Int) ?? 0,
-        hypoglycemiaEarlyWarnMinutes: 0,  // still missing, you can map if available
-        showGlucoseMG: (data.gluADC as? Int) ?? 0,
-        glucoseId: Int(truncating: data.glucoseId ?? 0),
-        name: data.device?.advertise?.localName ?? "",
-        bytes: [],  // still missing: need raw data source
-        showGlucose: (data.glu as? Float) ?? 0,
-        Ib: (data.blankCurrent as? Float) ?? 0,
-        Iw: (data.operatingCurrent as? Float) ?? 0,
-        countdownHours: (data.countdownHours as? Int) ?? 0,
-        T: (data.temperature as? Float) ?? 0.0,
-        year: (data.year as? Int32) ?? 0,
-        month: (data.month as? Int32) ?? 0,
-        day: (data.day as? Int32) ?? 0,
-        hour: (data.hour as? Int32) ?? 0,
-        minute: (data.minute as? Int32) ?? 0,
-        
+    let trendId = pocInt(data.trend)
+    let statusId = pocInt(data.calibrationStatus)
+    let resolvedStatusId = statusId != 0 ? statusId : 1
+
+    return CGMLog(
+        timeInMillis: pocTimeInMillis(from: data),
+        countdownMinutes: pocInt(data.countdownMinutes),
+        countdownDays: pocInt(data.countdownDays),
+        hypoglycemiaEarlyWarnMinutes: 0,
+        showGlucoseMG: pocInt(data.gluADC),
+        glucoseId: pocInt(data.glucoseId),
+        name: pocName(from: data),
+        bytes: [],
+        showGlucose: pocFloat(data.glu),
+        Ib: pocFloat(data.blankCurrent),
+        Iw: pocFloat(data.operatingCurrent),
+        countdownHours: pocInt(data.countdownHours),
+        T: pocFloat(data.temperature),
+        year: pocInt32(data.year),
+        month: pocInt32(data.month),
+        day: pocInt32(data.day),
+        hour: pocInt32(data.hour),
+        minute: pocInt32(data.minute),
         trendObject: TrendObject(
-            trendId: (data.trend as? Int) ?? 0,
-            drawableId: 2103818652,  // customize if needed
+            trendId: trendId,
+            drawableId: 2103818652,
             widgetImg: -1,
-            apsChangeRate: "FLAT"  // you could map a real value if available
+            apsChangeRate: "FLAT"
         ),
-
         glucoseStatusObject: GlucoseStatusObject(
-            statusId: 1  // you may derive this from a field like `calibrationStatus`
+            statusId: resolvedStatusId
         ),
-
         errorObject: ErrorObject(
-            errorId: (data.errorCode as? Int) ?? 0,
+            errorId: pocErrorId(from: data),
             sound: "None"
         )
     )
-    
-    return cgmLogs
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mytatva-rn-sdk",
-  "version": "1.2.93",
+  "version": "1.2.94",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",