Merge branch 'hotfix/0.3.1'

openmhealth · Oct 6, 2015 · 07d482c · 07d482c
2 parents 155fec0 + 68c0051
commit 07d482c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ subprojects {
 
     ext {
         javaVersion = 1.8
-        shimmerVersion = '0.3.0.SNAPSHOT'
+        shimmerVersion = '0.3.1'
         omhSchemaSdkVersion = '1.0.3'
     }
 

diff --git a/shim-server/src/main/java/org/openmhealth/shim/jawbone/JawboneShim.java b/shim-server/src/main/java/org/openmhealth/shim/jawbone/JawboneShim.java
@@ -162,8 +162,10 @@ protected ResponseEntity<ShimDataResponse> getData(OAuth2RestOperations restTemp
                 today.minusDays(1) : shimDataRequest.getStartDateTime();
         long startTimeInEpochSecond = startDateTime.toEpochSecond();
 
+        // We are inclusive of the last day, so we need to add an extra day since we are dealing with start of day,
+        // and would miss the activities that occurred during the last day within going to midnight of that day
         OffsetDateTime endDateTime = shimDataRequest.getEndDateTime() == null ?
-                today.plusDays(1) : shimDataRequest.getEndDateTime();
+                today.plusDays(1) : shimDataRequest.getEndDateTime().plusDays(1);
         long endTimeInEpochSecond = endDateTime.toEpochSecond();
 
         UriComponentsBuilder uriComponentsBuilder =