Add sortOrder to query #10

Author: EddyVerbruggen

README.md

@@ -104,7 +104,8 @@ this.healthData.query(
       endDate: new Date(), // now
       dataType: "steps", // equal to the 'name' property of 'HealthDataType'
       unit: "count", // make sure this is compatible with the 'dataType' (see below)
-      aggregateBy: "day" // optional, one of: "hour", "day", "sourceAndDay"
+      aggregateBy: "day", // optional, one of: "hour", "day", "sourceAndDay"
+      sortOrder: "desc" // optional, default "asc"
     })
     .then(result => console.log(JSON.stringify(result)))
     .catch(error => this.resultToShow = error);

demo-ng/app/app.component.ts

@@ -50,7 +50,8 @@ export class AppComponent {
           endDate: new Date(), // now
           dataType: dataType,
           unit: unit,
-          aggregateBy: aggregateBy
+          aggregateBy: aggregateBy,
+          sortOrder: "desc"
         })
         .then(result => {
           console.log(JSON.stringify(result));

src/health-data.android.ts

@@ -78,7 +78,6 @@ export class HealthData extends Common implements HealthDataApi {
     });
   }
 
-  // TODO how does Fit deal with unit conversion? mi <----> km, and such
   query(opts: QueryRequest): Promise<Array<ResponseItem>> {
     return new Promise((resolve, reject) => {
       try {
@@ -127,6 +126,12 @@ export class HealthData extends Common implements HealthDataApi {
         result = result.concat(this.dumpDataSet(readResult.getDataSets().get(index), opts));
       }
     }
+
+    // the result is sorted asc, so reverse in case that was requested
+    if (opts.sortOrder === "desc") {
+      result = result.reverse();
+    }
+
     return result;
   }
 

src/health-data.common.ts

@@ -13,12 +13,18 @@ export interface HealthDataType {
 
 export type AggregateBy = "hour" | "day" | "sourceAndDay";
 
+export type SortOrder = "asc" | "desc";
+
 export interface QueryRequest {
   startDate: Date;
   endDate: Date;
   dataType: string;
-  aggregateBy?: AggregateBy;
   unit: string;
+  aggregateBy?: AggregateBy;
+  /**
+   * Default "asc"
+   */
+  sortOrder?: SortOrder;
 }
 
 export interface ResponseItem {
@@ -32,6 +38,7 @@ export interface ResponseItem {
   source?: string;
 }
 
+/*
 export interface ResultResponse {
   status: {
     action: string;
@@ -61,6 +68,7 @@ export function createResultResponse(action: string, message: string, type?: str
 export function createErrorResponse(action: string, description: string): ErrorResponse {
   return {action, description};
 }
+*/
 
 export interface HealthDataApi {
   isAvailable(): Promise<boolean>;

src/health-data.ios.ts

@@ -64,7 +64,7 @@ export class HealthData extends Common implements HealthDataApi {
     return new Promise((resolve, reject) => {
       let typeOfData = acceptableDataTypes[opts.dataType];
       if (quantityTypes[typeOfData] || categoryTypes[typeOfData]) {
-        this.queryForQuantityOrCategoryData(typeOfData, opts.startDate, opts.endDate, opts.aggregateBy, opts.unit, (res, error) => {
+        this.queryForQuantityOrCategoryData(typeOfData, opts, (res, error) => {
           if (error) {
             reject(error);
           } else {
@@ -92,16 +92,16 @@ export class HealthData extends Common implements HealthDataApi {
     }
   }
 
-  private queryForQuantityOrCategoryData(dataType: string, start: Date, end: Date, aggregateBy: AggregateBy, unitString: string, callback: (data: Array<ResponseItem>, error: string) => void) {
+  private queryForQuantityOrCategoryData(dataType: string, opts: QueryRequest, callback: (data: Array<ResponseItem>, error: string) => void) {
     let objectType = this.resolveDataType(dataType);
 
-    const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(start, end, HKQueryOptions.StrictStartDate);
+    const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(opts.startDate, opts.endDate, HKQueryOptions.StrictStartDate);
 
-    let endDateSortDescriptor = NSSortDescriptor.alloc().initWithKeyAscending(HKSampleSortIdentifierEndDate, true);
+    let endDateSortDescriptor = NSSortDescriptor.alloc().initWithKeyAscending(HKSampleSortIdentifierEndDate, opts.sortOrder !== "desc");
     const sortBy = NSArray.arrayWithObject<NSSortDescriptor>(endDateSortDescriptor);
 
     // note that passing an invalid 'unitString' will crash the app (can't catch that error either)
-    const unit = HKUnit.unitFromString(unitString);
+    const unit = HKUnit.unitFromString(opts.unit);
 
     let query = HKSampleQuery.alloc().initWithSampleTypePredicateLimitSortDescriptorsResultsHandler(
         objectType, predicate, null, sortBy, (query: HKSampleQuery, listResults: NSArray<HKSample>, error: NSError) => {
@@ -114,7 +114,7 @@ export class HealthData extends Common implements HealthDataApi {
 
               const resultItem = <ResponseItem>{
                 source: source.name,
-                unit: unitString,
+                unit: opts.unit,
                 start: startDate,
                 end: endDate
               };
@@ -124,14 +124,14 @@ export class HealthData extends Common implements HealthDataApi {
                 if ((<HKQuantitySample>sample).quantity.isCompatibleWithUnit(unit)) {
                   resultItem.value = (<HKQuantitySample>sample).quantity.doubleValueForUnit(unit);
                 } else {
-                  console.log("Incompatible unit passed: " + unitString + " (" + unit + ")");
+                  console.log("Incompatible unit passed: " + opts.unit + " (" + unit + ")");
                 }
               }
 
               parsedData.push(resultItem);
             }
 
-            callback(this.aggregate(parsedData, aggregateBy), null);
+            callback(this.aggregate(parsedData, opts.aggregateBy), null);
           } else {
             console.dir(error);
             callback(null, error.localizedDescription);

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-health-data",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Health Data plugin for Nativescript, using Google Fit and Apple HealthKit.",
   "main": "health-data",
   "typings": "index.d.ts",