added missing grouping clone

Author: shukriadams

src/Tetrifact.Core/PruneBracketProcess.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Bson;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Tetrifact.Core
@@ -9,8 +8,8 @@ public class PruneBracketProcess : PruneBracket
         public IList<Manifest> Keep { get ; set; } = new List<Manifest>();
 
         public IList<Manifest> Prune { get; set; }  = new List<Manifest>();
-
-        public TimeSpan Coverage { get; set; }
+
+        public int Found { get; set; }
 
         /// <summary>
         /// Days back in time from Now that bracket covers. Calculated at start of a given prune run.
@@ -36,7 +35,8 @@ public static PruneBracketProcess FromPruneBracket(PruneBracket pruneBracket)
             return new PruneBracketProcess 
             { 
                 Amount = pruneBracket.Amount,
-                Days = pruneBracket.Days
+                Days = pruneBracket.Days,
+                Grouping = pruneBracket.Grouping
             };
         }
     }

src/Tetrifact.Core/PruneService.cs

@@ -2,7 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
+using System.Text;
+
 namespace Tetrifact.Core
 {
     public class PruneService : IPruneService
@@ -17,10 +18,10 @@ public class PruneService : IPruneService
 
         ITimeProvideer _timeprovider;
 
-        IProcessLockManager _processLock;
+        IProcessLockManager _processLock;
 
         #endregion
-
+
         #region CTORS
 
         public PruneService(ISettings settings, IProcessLockManager processLock, ITimeProvideer timeprovider, IIndexReadService indexReader, ILogger<IPruneService> log)
@@ -137,6 +138,8 @@ public PrunePlan GeneratePrunePlan()
                     continue;
                 }
 
+                matchingBracket.Found++;
+
                 // try to find reasons to keep package
 
                 // packages can be tagged to never be deleted. This ignores keep count, but will push out packages that are not tagged
@@ -162,9 +165,9 @@ public PrunePlan GeneratePrunePlan()
                 {
                     int code = manifest.CreatedUtc.ToDayCode();
                     int kept = matchingBracket.Keep.Count(m => m.CreatedUtc.ToDayCode() == code);
-                    if (kept < matchingBracket.Amount) 
+                    if (kept < matchingBracket.Amount)
                     {
-                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket.Days} had {matchingBracket.Amount - kept} slots left for day {code}.");
+                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket}::day {code} had {matchingBracket.Amount - kept} slots left.");
                         matchingBracket.Keep.Add(manifest);
                         continue;
                     }
@@ -177,7 +180,7 @@ public PrunePlan GeneratePrunePlan()
                     int kept = matchingBracket.Keep.Count(m => m.CreatedUtc.ToWeekCode() == code);
                     if (kept < matchingBracket.Amount)
                     {
-                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket.Days} had {matchingBracket.Amount - kept} slots left for week {code}.");
+                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket}::week {code} had {matchingBracket.Amount - kept} slots left.");
                         matchingBracket.Keep.Add(manifest);
                         continue;
                     }
@@ -190,7 +193,7 @@ public PrunePlan GeneratePrunePlan()
                     int kept = matchingBracket.Keep.Count(m => m.CreatedUtc.ToMonthCode() == code);
                     if (kept < matchingBracket.Amount)
                     {
-                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket.Days} had {matchingBracket.Amount - kept} slots left for month {code}.");
+                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket}::month {code} had {matchingBracket.Amount - kept} slots left.");
                         matchingBracket.Keep.Add(manifest);
                         continue;
                     }
@@ -203,7 +206,7 @@ public PrunePlan GeneratePrunePlan()
                     int kept = matchingBracket.Keep.Count(m => m.CreatedUtc.Year == code);
                     if (kept < matchingBracket.Amount)
                     {
-                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket.Days} had {matchingBracket.Amount - kept} slots left for year {code}.");
+                        report.Add($"Package \"{packageId}\" marked for keep, bracket {matchingBracket}::year {code} had {matchingBracket.Amount - kept} slots left.");
                         matchingBracket.Keep.Add(manifest);
                         continue;
                     }
@@ -229,6 +232,7 @@ public PrunePlan GeneratePrunePlan()
                 totalKeep += p.Keep.Count;
                 totalPrune += p.Prune.Count;
                 report.Add($"Bracket {p}.");
+                report.Add($"Found {p.Found} packages falling in this date range.");
                 report.Add($"Keeping {p.Keep.Count}{FlattenList(p.Keep.Select(p => p.Id))}.");
                 report.Add($"Pruning {p.Prune.Count}{FlattenList(p.Prune.Select(p => p.Id))}.");
                 report.Add(string.Empty);
@@ -257,8 +261,8 @@ private string FlattenList(IEnumerable<object> packages)
                 return string.Empty;
 
             return $" ({string.Join(",", packages)})";
-        }
-
+        }
+
         #endregion
     }
 }