Grouping data records by GitHub for Unity version and Unity version

Author: StanleyGoldman

src/GitHub.Api/Metrics/UsageModel.cs

@@ -32,12 +32,18 @@ class UsageModel
 
         private Usage currentUsage;
 
-        public Usage GetCurrentUsage()
+        public Usage GetCurrentUsage(string appVersion, string unityVersion)
         {
+            Guard.ArgumentNotNullOrWhiteSpace(appVersion, "appVersion");
+            Guard.ArgumentNotNullOrWhiteSpace(unityVersion, "unityVersion");
+
             var date = DateTime.UtcNow.Date;
             if (currentUsage == null)
             {
-                currentUsage = Reports.FirstOrDefault(usage => usage.Date == date);
+                currentUsage = Reports
+                    .FirstOrDefault(usage => usage.Date == date 
+                        && usage.AppVersion == appVersion
+                        && usage.UnityVersion == unityVersion);
             }
 
             if (currentUsage?.Date == date)
@@ -48,7 +54,12 @@ public Usage GetCurrentUsage()
             }
             else
             {
-                currentUsage = new Usage { Date = date, Guid = Guid };
+                currentUsage = new Usage {
+                    Date = date,
+                    Guid = Guid,
+                    AppVersion = appVersion,
+                    UnityVersion = unityVersion,
+                };
                 Reports.Add(currentUsage);
             }
 

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -154,10 +154,8 @@ private async Task SendUsage()
 
         private Usage GetCurrentUsage(UsageStore usageStore)
         {
-            var usage = usageStore.Model.GetCurrentUsage();
-            usage.UnityVersion = unityVersion;
+            var usage = usageStore.Model.GetCurrentUsage(AppConfiguration.AssemblyName.Version.ToString(), unityVersion);
             usage.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
-            usage.AppVersion = AppConfiguration.AssemblyName.Version.ToString();
             usage.CurrentLang = CultureInfo.CurrentCulture.IetfLanguageTag;
             return usage;
         }