series as collection of samples

Author: kvs-coder

Example/HealthKitReporter/ViewController.swift

@@ -93,10 +93,10 @@ class ViewController: UIViewController {
         let manager = reporter?.manager
         let reader = reporter?.reader
         do {
-            if let seriesQuery = try reader?.heartbeatSeriesQuery(dataHandler: { heartbeatSeries, error in
+            if let seriesQuery = try reader?.heartbeatSeriesQuery(resultsHandler: { samples, error in
                 if error == nil {
                     do {
-                        print(try heartbeatSeries.encoded())
+                        print(try samples.encoded())
                     } catch {
                         print(error)
                     }

Sources/HealthKitReporter.swift

@@ -86,8 +86,8 @@ public typealias AnchoredResultsHandler = (
     - error: error (optional)
  */
 @available(iOS 13.0, *)
-public typealias HeartbeatSeriesDataHandler = (
-    _ sample: HeartbeatSeriesSample?,
+public typealias HeartbeatSeriesResultsDataHandler = (
+    _ samples: [HeartbeatSeriesSample],
     _ error: Error?
 ) -> Void
 /**

Sources/Service/HealthKitReader.swift

@@ -486,7 +486,7 @@ public class HealthKitReader {
      - Parameter predicate: **NSPredicate** predicate (optional). allSamples by default
      - Parameter sortDescriptors: array of **NSSortDescriptor** sort descriptors. By default sorting by startData without ascending
      - Parameter limit: **Int** limit of the elements. HKObjectQueryNoLimit by default
-     - Parameter dataHandler: returns a block with heartbeat series for each
+     - Parameter resultsHandler: returns a block with heartbeat series for each
      iteration until **done** of **HeartbeatSeries**  is True.
      - Throws: HealthKitError.invalidType
      */
@@ -500,14 +500,14 @@ public class HealthKitReader {
             )
         ],
         limit: Int = HKObjectQueryNoLimit,
-        dataHandler: @escaping HeartbeatSeriesDataHandler
+        resultsHandler: @escaping HeartbeatSeriesResultsDataHandler
     ) throws -> SampleQuery {
         return try SeriesSampleRetriever().makeHeartbeatSeriesQuery(
             healthStore: healthStore,
             predicate: predicate,
             sortDescriptors: sortDescriptors,
             limit: limit,
-            dataHandler: dataHandler
+            resultsHandler: resultsHandler
         )
     }
     /**

Sources/Service/Retriever/SeriesSampleRetriever.swift

@@ -16,7 +16,7 @@ class SeriesSampleRetriever {
         predicate: NSPredicate?,
         sortDescriptors: [NSSortDescriptor],
         limit: Int,
-        dataHandler: @escaping HeartbeatSeriesDataHandler
+        resultsHandler: @escaping HeartbeatSeriesResultsDataHandler
     ) throws -> HKSampleQuery {
         let heartbeatSeries = SeriesType.heartbeatSeries
         guard
@@ -36,25 +36,30 @@ class SeriesSampleRetriever {
                 error == nil,
                 let result = data
             else {
-                dataHandler(nil, error)
+                resultsHandler([], error)
                 return
             }
+            var samples = [HeartbeatSeriesSample]()
+            var seriesError: Error?
+            let group = DispatchGroup()
             for element in result {
                 guard let seriesSample = element as? HKHeartbeatSeriesSample else {
-                    dataHandler(
-                        nil,
+                    resultsHandler(
+                        [],
                         HealthKitError.invalidType(
                             "Sample \(element) is not HKHeartbeatSeriesSample"
                         )
                     )
                     return
                 }
                 var series = [HeartbeatSeries]()
+                group.enter()
                 let heartbeatSeriesQuery = HKHeartbeatSeriesQuery(
                     heartbeatSeries: seriesSample
                 ) { (_, timeSinceSeriesStart, precededByGap, done, error) in
                     guard error == nil else {
-                        dataHandler(nil, error)
+                        seriesError = error
+                        group.leave()
                         return
                     }
                     let heartbeatSeries = HeartbeatSeries(
@@ -65,11 +70,15 @@ class SeriesSampleRetriever {
                     series.append(heartbeatSeries)
                     if done {
                         let sample = HeartbeatSeriesSample(sample: seriesSample, series: series)
-                        dataHandler(sample, nil)
+                        samples.append(sample)
+                        group.leave()
                     }
                 }
                 healthStore.execute(heartbeatSeriesQuery)
             }
+            group.notify(queue: .global()) {
+                resultsHandler(samples, seriesError)
+            }
         }
         return query
     }