Merge pull request #162 from aarondcoleman/issue161

Issue161 - Fixing Intraday Minute
aarondcoleman · Mar 10, 2016 · 10655f4 · 10655f4
2 parents 926af4d + 21de1c5
commit 10655f4
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 6 deletions.
diff --git a/Fitbit.Portable.Tests/Fitbit.Portable.Tests.csproj b/Fitbit.Portable.Tests/Fitbit.Portable.Tests.csproj
@@ -231,6 +231,9 @@
     <None Include="SampleData\GetFriends-Multiple.json" />
     <None Include="SampleData\GetDevices-Double.json" />
     <None Include="SampleData\GetDevices-Single.json" />
+    <Content Include="SampleData\IntradayActivitiesSteps.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="SampleData\ApiError.json">

diff --git a/Fitbit.Portable.Tests/IntradayTimeSeriesTests.cs b/Fitbit.Portable.Tests/IntradayTimeSeriesTests.cs
@@ -13,7 +13,7 @@ public class IntradayTimeSeriesTests
     {
         [Test]
         [Category("Portable")]
-        public async void GetIntraDayTimeSeriesAsync_Success()
+        public async void GetIntraDayTimeSeriesCaloriesIntensityMetsAsync_Success()
         {
             DateTime expectedResult = new DateTime(2015, 3, 20, 0, 1, 0);
 
@@ -33,6 +33,36 @@ public async void GetIntraDayTimeSeriesAsync_Success()
             var response = await fitbitClient.GetIntraDayTimeSeriesAsync(IntradayResourceType.CaloriesOut, new DateTime(2015, 3, 20), new TimeSpan(24, 0, 0));
 
             response.DataSet[1].Time.Should().Be(expectedResult);
+            response.DataSet[1].METs.Should().Be("10");
+            response.DataSet[1].Level.Should().Be("0");
+            response.DataSet[1].Value.Should().Be("1.1857000589370628");
+
+        }
+
+        [Test]
+        [Category("Portable")]
+        public async void GetIntraDayTimeSeriesStepsAsync_Success()
+        {
+            DateTime expectedResult = new DateTime(2016, 3, 8, 0, 1, 0);
+
+            string content = SampleDataHelper.GetContent("IntradayActivitiesSteps.json");
+            var responseMessage = new Func<HttpResponseMessage>(() =>
+            {
+                return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent(content) };
+            });
+
+            var verification = new Action<HttpRequestMessage, CancellationToken>((message, token) =>
+            {
+                message.Method.Should().Be(HttpMethod.Get);
+                message.RequestUri.AbsoluteUri.Should().Be("https://api.fitbit.com/1/user/-/activities/steps/date/2016-03-08/1d.json");
+            });
+
+            var fitbitClient = Helper.CreateFitbitClient(responseMessage, verification);
+            var response = await fitbitClient.GetIntraDayTimeSeriesAsync(IntradayResourceType.Steps, new DateTime(2016, 3, 8), new TimeSpan(24, 0, 0));
+
+            response.DataSet[1].Time.Should().Be(expectedResult);
+            response.DataSet[1].Value.Should().Be("2");
+
         }
     }
 }
diff --git a/Fitbit.Portable.Tests/SampleData/IntradayActivitiesCalories.json b/Fitbit.Portable.Tests/SampleData/IntradayActivitiesCalories.json
diff --git a/Fitbit.Portable.Tests/SampleData/IntradayActivitiesSteps.json b/Fitbit.Portable.Tests/SampleData/IntradayActivitiesSteps.json
diff --git a/Fitbit.Portable/JsonDotNetSerializerExtensions.cs b/Fitbit.Portable/JsonDotNetSerializerExtensions.cs
@@ -154,9 +154,9 @@ internal static IntradayData GetIntradayTimeSeriesData(this JsonDotNetSerializer
                     select new IntradayDataValues
                     {
                         Time = DateTime.Parse(date + " " + item["time"]),
-                        Value = item["value"].ToString(),
-                        METs = item["value"].ToString(),
-                        Level = item["level"].ToString()
+                        Value = item["value"].ToObject<double>().ToString("R"), //converting to double is required to keep precision
+                        METs = item["mets"] != null ? item["mets"].ToString() : null,
+                        Level = item["level"] != null ? item["level"].ToString() : null
                     }).ToList()
             };
 

diff --git a/NuGet/package/Fitbit.dev.nuspec b/NuGet/package/Fitbit.dev.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Fitbit.NET</id>
-    <version>2.0.0$buildNumber$-RC2-Dev</version>
+    <version>2.1.0$buildNumber$-RC2-Dev</version>
     <title>Fitbit.NET</title>
     <authors>Fitbit.Net contributors Team -- @WestDiscGolf, @aarondcoleman, @mxa0079</authors>
     <owners></owners>