1.6.1 preps, returning a collection of HR series

Author: kvs-coder

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.6.1] - 15.10.2021.
+
+* return HeartbeatSeries as a collection of samples, each has own collection of measurements
+
 ## [1.6.0] - 12.10.2021.
 
 * heartbeatSeriesQuery changed as HeartbeatSeries now is a valid sample with a set of beat by beat measurements

Example/HealthKitReporter.xcodeproj/project.pbxproj

@@ -474,7 +474,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -525,7 +525,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/HealthKitReporter_Example.entitlements

@@ -6,5 +6,7 @@
 	<true/>
 	<key>com.apple.developer.healthkit.access</key>
 	<array/>
+	<key>com.apple.developer.healthkit.background-delivery</key>
+	<true/>
 </dict>
 </plist>

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name                  = 'HealthKitReporter'
-  s.version               = '1.6.0'
+  s.version               = '1.6.1'
   s.summary               = 'HealthKitReporter. A wrapper for HealthKit framework.'
   s.swift_versions        = '5.3'
   s.description           = 'Helps to write or read data from Apple Health via HealthKit framework.'

HealthKitReporter.podspec

@@ -305,7 +305,7 @@ pod 'HealthKitReporter'
 or 
 
 ```ruby
-pod 'HealthKitReporter', '~> 1.6.0'
+pod 'HealthKitReporter', '~> 1.6.1'
 ```
 
 ### Swift Package Manager
@@ -315,7 +315,7 @@ To install it, simply add the following lines to your Package.swift file
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/VictorKachalov/HealthKitReporter.git", from: "1.6.0")
+    .package(url: "https://github.com/VictorKachalov/HealthKitReporter.git", from: "1.6.1")
 ]
 ```
 
@@ -324,7 +324,7 @@ dependencies: [
 Add the line in your cartfile 
 
 ```ruby
-github "VictorKachalov/HealthKitReporter" "1.6.0"
+github "VictorKachalov/HealthKitReporter" "1.6.1"
 ```
 
 ## Author

README.md

@@ -10,12 +10,12 @@ import HealthKit
 
 @available(iOS 13.0, *)
 extension HKHeartbeatSeriesSample {
-    typealias Harmonized = HeartbeatSeriesSample.Harmonized
+    typealias Harmonized = HeartbeatSeries.Harmonized
 
-    func harmonize(series: [HeartbeatSeries]) -> Harmonized {
+    func harmonize(measurements: [HeartbeatSeries.Measurement]) -> Harmonized {
         Harmonized(
             count: count,
-            series: series,
+            measurements: measurements,
             metadata: metadata?.compactMapValues { String(describing: $0) }
         )
     }

Sources/Decorator/Extensions+HKHeartbeatSeriesSample.swift

@@ -82,12 +82,12 @@ public typealias AnchoredResultsHandler = (
 ) -> Void
 /**
  - Parameters:
-    - series: heartbeat serie.
+    - series: heartbeat series.
     - error: error (optional)
  */
 @available(iOS 13.0, *)
 public typealias HeartbeatSeriesResultsDataHandler = (
-    _ samples: [HeartbeatSeriesSample],
+    _ series: [HeartbeatSeries],
     _ error: Error?
 ) -> Void
 /**

Sources/HealthKitReporter.swift

@@ -2,23 +2,88 @@
 //  HeartbeatSeries.swift
 //  HealthKitReporter
 //
-//  Created by Victor on 25.09.20.
+//  Created by Kachalov, Victor on 12.10.21.
 //
 
 import Foundation
+import HealthKit
 
-public struct HeartbeatSeries: Codable {
-    public let timeSinceSeriesStart: Double
-    public let precededByGap: Bool
-    public let done: Bool
+@available(iOS 13.0, *)
+public struct HeartbeatSeries: Identifiable, Sample {
+    public struct Measurement: Codable {
+        public let timeSinceSeriesStart: Double
+        public let precededByGap: Bool
+        public let done: Bool
+        public init(
+            timeSinceSeriesStart: Double,
+            precededByGap: Bool,
+            done: Bool
+        ) {
+            self.timeSinceSeriesStart = timeSinceSeriesStart
+            self.precededByGap = precededByGap
+            self.done = done
+        }
+    }
+
+    public struct Harmonized: Codable {
+        public let count: Int
+        public let measurements: [Measurement]
+        public let metadata: [String: String]?
+
+        public init(
+            count: Int,
+            measurements: [Measurement],
+            metadata: [String: String]?
+        ) {
+            self.count = count
+            self.measurements = measurements
+            self.metadata = metadata
+        }
 
+        public func copyWith(
+            count: Int? = nil,
+            measurements: [Measurement]? = nil,
+            metadata: [String: String]? = nil
+        ) -> Harmonized {
+            return Harmonized(
+                count: count ?? self.count,
+                measurements: measurements ?? self.measurements,
+                metadata: metadata ?? self.metadata
+            )
+        }
+    }
+
+    public let uuid: String
+    public let identifier: String
+    public let startTimestamp: Double
+    public let endTimestamp: Double
+    public let device: Device?
+    public let sourceRevision: SourceRevision
+    public let harmonized: Harmonized
+    
     public init(
-        timeSinceSeriesStart: Double,
-        precededByGap: Bool,
-        done: Bool
+        identifier: String,
+        startTimestamp: Double,
+        endTimestamp: Double,
+        device: Device?,
+        sourceRevision: SourceRevision,
+        harmonized: Harmonized
     ) {
-        self.timeSinceSeriesStart = timeSinceSeriesStart
-        self.precededByGap = precededByGap
-        self.done = done
+        self.uuid = UUID().uuidString
+        self.identifier = identifier
+        self.startTimestamp = startTimestamp
+        self.endTimestamp = endTimestamp
+        self.device = device
+        self.sourceRevision = sourceRevision
+        self.harmonized = harmonized
+    }
+    init(sample: HKHeartbeatSeriesSample, measurements: [Measurement]) {
+        self.uuid = sample.uuid.uuidString
+        self.identifier = sample.sampleType.identifier
+        self.startTimestamp = sample.startDate.timeIntervalSince1970
+        self.endTimestamp = sample.endDate.timeIntervalSince1970
+        self.device = Device(device: sample.device)
+        self.sourceRevision = SourceRevision(sourceRevision: sample.sourceRevision)
+        self.harmonized = sample.harmonize(measurements: measurements)
     }
 }