add getWorkoutPlanId function

example/ios/Podfile.lock

@@ -76,7 +76,7 @@ PODS:
   - hermes-engine (0.71.8):
     - hermes-engine/Pre-built (= 0.71.8)
   - hermes-engine/Pre-built (0.71.8)
-  - kingstinct-react-native-healthkit (6.1.0):
+  - kingstinct-react-native-healthkit (7.0.6):
     - React
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.1100)
@@ -609,7 +609,7 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
-  kingstinct-react-native-healthkit: dccae4f18de0566a64eb4e5a108e0b0942600602
+  kingstinct-react-native-healthkit: f4205a19d97fd5fa2839a8361c91294cad298896
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
@@ -648,4 +648,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 765d5dfe48aadc2d21be923b71fd2b906d2f703b
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

ios/Constants.swift

@@ -25,4 +25,4 @@ let HKDataTypeIdentifierHeartbeatSeries = "HKDataTypeIdentifierHeartbeatSeries"
 
 let SpeedUnit =  HKUnit(from: "m/s") // HKUnit.meter().unitDivided(by: HKUnit.second())
 // Support for MET data: HKAverageMETs 8.24046 kcal/hr·kg
-let METUnit = HKUnit(from: "kcal/hr·kg")
+let METUnit = HKUnit(from: "kcal/hr·kg")

ios/ReactNativeHealthkit.m

@@ -146,6 +146,7 @@ @interface RCT_EXTERN_MODULE(ReactNativeHealthkit, RCTEventEmitter)
                   quantities:(NSArray)quantities
                   start:(NSDate)start
                   end:(NSDate)end
+                  totals:(NSDictionary)totals
                   metadata:(NSDictionary)metadata
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
@@ -211,7 +212,7 @@ @interface RCT_EXTERN_MODULE(ReactNativeHealthkit, RCTEventEmitter)
                   reject:(RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN_METHOD(getWorkoutRoutes:(NSString)workoutUUID
+RCT_EXTERN_METHOD(getWorkoutPlanById:(NSString)workoutUUID
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 )

ios/ReactNativeHealthkit.swift

@@ -17,7 +17,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
         self._runningQueries = [String: HKQuery]()
         self._dateFormatter = ISO8601DateFormatter()
         self._dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-
         if HKHealthStore.isHealthDataAvailable() {
             self._store = HKHealthStore.init()
         }
@@ -297,7 +296,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
                 if let type = HKSampleType.categoryType(forIdentifier: typeId) {
                     let value = sample["value"] as! Int
                     let metadata = sample["metadata"] as? [String: Any]
-
                     let categorySample = HKCategorySample.init(type: type, value: value, start: start, end: end, metadata: metadata)
                     initializedSamples.insert(categorySample)
                 }
@@ -315,8 +313,8 @@ class ReactNativeHealthkit: RCTEventEmitter {
         }
     }
 
-    @objc(saveWorkoutSample:quantities:start:end:metadata:resolve:reject:)
-    func saveWorkoutSample(typeIdentifier: UInt, quantities: [[String: Any]], start: Date, end: Date, metadata: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    @objc(saveWorkoutSample:quantities:start:end:totals:metadata:resolve:reject:)
+    func saveWorkoutSample(typeIdentifier: UInt, quantities: [[String: Any]], start: Date, end: Date, totals: [String: Any], metadata: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let store = _store else {
             return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
         }
@@ -337,7 +335,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
         var totalDistance: HKQuantity?
         var totalSwimmingStrokeCount: HKQuantity?
         var totalFlightsClimbed: HKQuantity?
-
         // generating quantity samples
         for quantity in quantities {
             let typeId = HKQuantityTypeIdentifier.init(rawValue: quantity["quantityType"] as! String)
@@ -362,7 +359,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
                 if typeId == HKQuantityTypeIdentifier.flightsClimbed {
                     totalFlightsClimbed = quantity
                 }
-
                 if let quantityStart, let quantityEnd {
                     let quantityStartDate = self._dateFormatter.date(from: quantityStart) ?? start
                     let quantityEndDate = self._dateFormatter.date(from: quantityEnd) ?? end
@@ -376,6 +372,17 @@ class ReactNativeHealthkit: RCTEventEmitter {
             }
         }
 
+        // if totals are provided override samples
+        let rawTotalDistance = totals["distance"] as? Double ?? 0.0
+        let rawTotalEnergy = totals["energyBurned"] as? Double ?? 0.0
+
+        if rawTotalDistance != 0.0 {
+            totalDistance = HKQuantity(unit: .meter(), doubleValue: rawTotalDistance)
+        }
+        if rawTotalEnergy != 0.0 {
+            totalEnergyBurned = HKQuantity(unit: .kilocalorie(), doubleValue: rawTotalEnergy)
+        }
+
         // creating workout
         var workout: HKWorkout?
 
@@ -405,6 +412,10 @@ class ReactNativeHealthkit: RCTEventEmitter {
                 return
             }
 
+            if initializedSamples.isEmpty {
+                return resolve(workout.uuid.uuidString)
+            }
+
             store.add(initializedSamples, to: workout) { (_, error: Error?) in
                 guard error == nil else {
                     reject(GENERIC_ERROR, error!.localizedDescription, error)
@@ -454,7 +465,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
                         if clLocations.isEmpty {
                             return reject(GENERIC_ERROR, "No locations provided", nil)
                         }
-
                         // create route
                         let routeBuilder = HKWorkoutRouteBuilder(healthStore: store, device: nil)
                         try await routeBuilder.insertRouteData(clLocations)
@@ -706,7 +716,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
 
     @objc(queryWorkoutSamples:distanceUnitString:from:to:limit:ascending:resolve:reject:)
     func queryWorkoutSamples(energyUnitString: String, distanceUnitString: String, from: Date, to: Date, limit: Int, ascending: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-
         guard let store = _store else {
             return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
         }
@@ -797,21 +806,6 @@ class ReactNativeHealthkit: RCTEventEmitter {
                             dict.setValue(serializeQuantity(unit: HKUnit.count(), quantity: workout.totalFlightsClimbed), forKey: "totalFlightsClimbed")
                         }
 
-                        #if canImport(WorkoutKit)
-                        if #available(iOS 17.0, *) {
-                            Task {
-                                do {
-                                    let workoutplan = try await workout.workoutPlan
-                                    if let workoutplanId = workoutplan?.id {
-                                        dict["workoutPlanId"] = workoutplanId.uuidString
-                                    }
-                                } catch {
-                                    // handle error
-                                }
-                            }
-                        }
-                        #endif
-
                         arr.add(dict)
                     }
                 }
@@ -1263,6 +1257,63 @@ class ReactNativeHealthkit: RCTEventEmitter {
         return allRoutes
     }
 
+    @available(iOS 17.0.0, *)
+    func getWorkoutPlan(workout: HKWorkout) async -> [String: Any]? {
+        #if canImport(WorkoutKit)
+        do {
+            let workoutPlan = try await workout.workoutPlan
+
+            var dict = [String: Any]()
+            if (workoutPlan?.id) != nil {
+                dict["id"] = workoutPlan?.id.uuidString
+
+            }
+            if (workoutPlan?.workout.activity) != nil {
+                dict["activityType"] = workoutPlan?.workout.activity.rawValue
+            }
+
+            if dict.isEmpty {
+                return nil
+            }
+            return dict
+        } catch {
+            return nil
+        }
+        #else
+        return nil
+        #endif
+    }
+
+    @objc(getWorkoutPlanById:resolve:reject:)
+    func getWorkoutPlanById(workoutUUID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        if #available(iOS 17.0, *) {
+            #if canImport(WorkoutKit)
+            guard let store = _store else {
+                return reject(INIT_ERROR, INIT_ERROR_MESSAGE, nil)
+            }
+
+            Task {
+                if let uuid = UUID(uuidString: workoutUUID) {
+                    let workout = await self.getWorkoutByID(store: store, workoutUUID: uuid)
+                    if let workout {
+                        let workoutPlan = await self.getWorkoutPlan(workout: workout)
+
+                        return resolve(workoutPlan)
+                    } else {
+                        return reject(GENERIC_ERROR, "No workout found", nil)
+                    }
+                } else {
+                    return reject(GENERIC_ERROR, "Invalid UUID", nil)
+                }
+            }
+            #else
+                return resolve(nil)
+            #endif
+        } else {
+            return resolve(nil)
+        }
+    }
+
     func serializeLocation(location: CLLocation, previousLocation: CLLocation?) -> [String: Any] {
         var distance: CLLocationDistance?
         if let previousLocation = previousLocation {

src/index.ios.tsx

@@ -16,6 +16,7 @@ import getMostRecentWorkout from './utils/getMostRecentWorkout'
 import getPreferredUnit from './utils/getPreferredUnit'
 import getPreferredUnits from './utils/getPreferredUnits'
 import getRequestStatusForAuthorization from './utils/getRequestStatusForAuthorization'
+import getWorkoutPlanById from './utils/getWorkoutPlanById'
 import queryCategorySamples from './utils/queryCategorySamples'
 import queryCategorySamplesWithAnchor from './utils/queryCategorySamplesWithAnchor'
 import queryCorrelationSamples from './utils/queryCorrelationSamples'
@@ -150,6 +151,7 @@ export default {
   * @see {@link https://developer.apple.com/documentation/healthkit/hkworkoutroutequery HKWorkoutRouteQuery (Apple Docs)}
    */
   getWorkoutRoutes,
+  getWorkoutPlanById,
 
   getPreferredUnit,
   getPreferredUnits,

src/index.tsx

@@ -77,6 +77,7 @@ const Healthkit = {
   requestAuthorization: UnavailableFn(Promise.resolve(false)),
   deleteQuantitySample: UnavailableFn(Promise.resolve(false)),
   deleteSamples: UnavailableFn(Promise.resolve(false)),
+  getWorkoutPlanById: UnavailableFn(Promise.resolve(null)),
   saveCategorySample: UnavailableFn(Promise.resolve(false)),
   saveCorrelationSample: UnavailableFn(Promise.resolve(false)),
   saveQuantitySample: UnavailableFn(Promise.resolve(false)),

src/jest.setup.ts

@@ -2,7 +2,7 @@ import { NativeModule, NativeModules } from 'react-native'
 
 import type Native from './native-types'
 
-const mockModule: (NativeModule & typeof Native) = {
+const mockModule: NativeModule & typeof Native = {
   isHealthDataAvailable: jest.fn(),
   addListener: jest.fn(),
   removeListeners: jest.fn(),
@@ -40,6 +40,7 @@ const mockModule: (NativeModule & typeof Native) = {
   // Todo [>8]: Remove to align with Apple function name (isProtectedDataAvailable)
   canAccessProtectedData: jest.fn(),
   saveWorkoutRoute: jest.fn(),
+  getWorkoutPlanById: jest.fn(),
 }
 
 NativeModules.ReactNativeHealthkit = mockModule