Moved usage model guid/date.

They should be in both the `Measures` and `Dimensions`.

Author: grokys

src/GitHub.Exports/Models/UsageModel.cs

@@ -4,24 +4,30 @@ namespace GitHub.Models
 {
     public class UsageModel
     {
-        public Guid Guid { get; set; }
-        public DateTimeOffset Date { get; set; }
         public DimensionsModel Dimensions { get; set; }
         public MeasuresModel Measures { get; set; }
 
         public static UsageModel Create(Guid guid)
         {
             return new UsageModel
             {
-                Guid = guid,
-                Date = DateTime.Now,
-                Dimensions = new DimensionsModel(),
-                Measures = new MeasuresModel(),
+                Dimensions = new DimensionsModel
+                {
+                    Guid = guid,
+                    Date = DateTime.Now,
+                },
+                Measures = new MeasuresModel
+                {
+                    Guid = guid,
+                    Date = DateTime.Now,
+                },
             };
         }
 
         public class DimensionsModel
         {
+            public Guid Guid { get; set; }
+            public DateTimeOffset Date { get; set; }
             public string AppVersion { get; set; }
             public string VSVersion { get; set; }
             public string Lang { get; set; }
@@ -31,6 +37,8 @@ public class DimensionsModel
 
         public class MeasuresModel
         {
+            public Guid Guid { get; set; }
+            public DateTimeOffset Date { get; set; }
             public int NumberOfStartups { get; set; }
             public int NumberOfUpstreamPullRequests { get; set; }
             public int NumberOfClones { get; set; }

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -98,7 +98,7 @@ async Task TimerTick()
 
             for (var i = data.Reports.Count - 1; i >= 0; --i)
             {
-                if (data.Reports[i].Date.Date != DateTimeOffset.Now.Date)
+                if (data.Reports[i].Dimensions.Date.Date != DateTimeOffset.Now.Date)
                 {
                     try
                     {
@@ -121,7 +121,7 @@ async Task TimerTick()
 
         async Task<UsageModel> GetCurrentReport(UsageData data)
         {
-            var current = data.Reports.FirstOrDefault(x => x.Date.Date == DateTimeOffset.Now.Date);
+            var current = data.Reports.FirstOrDefault(x => x.Dimensions.Date.Date == DateTimeOffset.Now.Date);
 
             if (current == null)
             {