Fix TimeOfDayQuestionResult predicate comparison

ResearchKit/Common/ORKResultPredicate.m

@@ -215,7 +215,15 @@ + (NSPredicate *)predicateMatchingResultSelector:(ORKResultSelector *)resultSele
             // or part of an additional subquery predicate (for question results with an array of answers, like ORKChoiceQuestionResult).
             for (NSString *subPredicateFormat in subPredicateFormatArray) {
                 if (!areSubPredicateFormatsSubquery) {
-                    [format appendString:@" AND $z."];
+                    if ([subPredicateFormat hasPrefix:@"("]) {
+                        /*
+                           For complex queries (e.g. TimeOfDay) where nested logic is needed, we will skip the $z. prefix
+                           and allow the caller to handle. NOTE: caller will need to prefix any key references with '$z'
+                         */
+                        [format appendString:@" AND "];
+                    } else {
+                        [format appendString:@" AND $z."];
+                    }
                     [format appendString:subPredicateFormat];
                 } else {
                     [format appendString:@" AND SUBQUERY($z."];
@@ -399,14 +407,14 @@ + (NSPredicate *)predicateForTimeOfDayQuestionResultWithResultSelector:(ORKResul
                                                    maximumExpectedHour:(NSInteger)maximumExpectedHour
                                                  maximumExpectedMinute:(NSInteger)maximumExpectedMinute {
     return [self predicateMatchingResultSelector:resultSelector
-                         subPredicateFormatArray:@[ @"answer.hour >= %@",
-                                                    @"answer.minute >= %@",
-                                                    @"answer.hour <= %@",
-                                                    @"answer.minute <= %@" ]
+                         subPredicateFormatArray:@[ @"($z.answer.hour > %@ OR ($z.answer.hour == %@ AND $z.answer.minute >= %@)) AND ($z.answer.hour < %@ OR ($z.answer.hour == %@ AND $z.answer.minute <= %@))" ]
                  subPredicateFormatArgumentArray:@[ @(minimumExpectedHour),
+                                                    @(minimumExpectedHour),
                                                     @(minimumExpectedMinute),
                                                     @(maximumExpectedHour),
+                                                    @(maximumExpectedHour),
                                                     @(maximumExpectedMinute) ]];
+
 }
 
 + (NSPredicate *)predicateForTimeIntervalQuestionResultWithResultSelector:(ORKResultSelector *)resultSelector

ResearchKitTests/ORKTaskTests.m

@@ -1297,6 +1297,17 @@ - (void)testResultPredicatesWithTaskIdentifier:(NSString *)taskIdentifier
                                                                           maximumExpectedHour:expectedDateComponentsMaximum.hour
                                                                         maximumExpectedMinute:expectedDateComponentsMaximum.minute] evaluateWithObject:taskResults substitutionVariables:substitutionVariables]);
 
+    expectedDateComponentsMinimum.hour = 6;
+    expectedDateComponentsMinimum.minute = 0;
+    expectedDateComponentsMaximum.hour = 7;
+    expectedDateComponentsMaximum.minute = 0;
+    XCTAssertTrue([[ORKResultPredicate predicateForTimeOfDayQuestionResultWithResultSelector:resultSelector
+                                                                          minimumExpectedHour:expectedDateComponentsMinimum.hour
+                                                                        minimumExpectedMinute:expectedDateComponentsMinimum.minute
+                                                                          maximumExpectedHour:expectedDateComponentsMaximum.hour
+                                                                        maximumExpectedMinute:expectedDateComponentsMaximum.minute] evaluateWithObject:taskResults substitutionVariables:substitutionVariables]);
+
+
     // ORKTimeIntervalQuestionResult
     resultSelector.resultIdentifier = FloatNumericStepIdentifier;
     XCTAssertTrue([[ORKResultPredicate predicateForTimeIntervalQuestionResultWithResultSelector:resultSelector

ResearchKitTests/ORKTestResultPredicateType.swift

@@ -44,7 +44,7 @@ enum TestPredicateFormat: String {
     case timeMax = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer <= 100).@count > 0).@count > 0).@count > 0"
     case timeMin = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer >= 16).@count > 0).@count > 0).@count > 0"
     case timeMinAndMax = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer >= 10 AND $z.answer <= 1000).@count > 0).@count > 0).@count > 0"
-    case timeOfDay = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer.hour >= 2 AND $z.answer.minute >= 30 AND $z.answer.hour <= 10 AND $z.answer.minute <= 10).@count > 0).@count > 0).@count > 0"
+    case timeOfDay = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND ($z.answer.hour > 2 OR ($z.answer.hour == 2 AND $z.answer.minute >= 30)) AND ($z.answer.hour < 10 OR ($z.answer.hour == 10 AND $z.answer.minute <= 10))).@count > 0).@count > 0).@count > 0"
     case boolean = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer == 1).@count > 0).@count > 0).@count > 0"
     case nilPredicate = "SUBQUERY(SELF, $x, $x.identifier == $ORK_TASK_IDENTIFIER AND SUBQUERY($x.results, $y, $y.identifier == %@ AND $y.isPreviousResult == 0 AND SUBQUERY($y.results, $z, $z.identifier == %@ AND $z.answer == nil).@count > 0).@count > 0).@count > 0"
 }