From bff3e94fc7d8d64bd38fc7d965cfe2846428ea51 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Tue, 14 Jan 2020 16:33:50 -0700 Subject: [PATCH] Dedupe lists with different versions in metrics --- Wabbajack.BuildServer/Models/Metric.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Wabbajack.BuildServer/Models/Metric.cs b/Wabbajack.BuildServer/Models/Metric.cs index 61355831..796af29e 100644 --- a/Wabbajack.BuildServer/Models/Metric.cs +++ b/Wabbajack.BuildServer/Models/Metric.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; @@ -24,6 +25,7 @@ namespace Wabbajack.BuildServer.Models public static async Task> Report(DBContext db, string grouping) { + var regex = new Regex("\\d+\\."); var data = await db.Metrics.AsQueryable() .Where(m => m.MetricsKey != null) .Where(m => m.Action == grouping) @@ -40,7 +42,7 @@ namespace Wabbajack.BuildServer.Models var results = data .Where(d => !Guid.TryParse(d.Subject, out var _)) - .GroupBy(d => d.Subject) + .GroupBy(d => regex.Split(d.Subject).First()) .Select(by_series => { var by_day = by_series.GroupBy(d => d.Timestamp.ToString("yyyy-MM-dd"))