test cleanup

ErsatzTV.Core.Tests/Scheduling/BlockScheduling/EffectiveBlockTests.cs

@@ -1,9 +1,6 @@
-using Destructurama;
 using ErsatzTV.Core.Domain.Scheduling;
 using ErsatzTV.Core.Scheduling.BlockScheduling;
-using Microsoft.Extensions.Logging;
 using NUnit.Framework;
-using Serilog;
 using Shouldly;
 using TimeZoneConverter;
 
@@ -11,21 +8,6 @@ namespace ErsatzTV.Core.Tests.Scheduling.BlockScheduling;
 
 public class EffectiveBlockTests
 {
-    private static readonly ILogger<EffectiveBlock> _logger;
-
-    static EffectiveBlockTests()
-    {
-        Log.Logger = new LoggerConfiguration()
-            .MinimumLevel.Debug()
-            .WriteTo.Console()
-            .Destructure.UsingAttributes()
-            .CreateLogger();
-
-        ILoggerFactory loggerFactory = new LoggerFactory().AddSerilog(Log.Logger);
-
-        _logger = loggerFactory.CreateLogger<EffectiveBlock>();
-    }
-
     private static DateTimeOffset GetLocalDate(int year, int month, int day, TimeZoneInfo tz) =>
         new(year, month, day, 0, 0, 0, tz.GetUtcOffset(new DateTime(year, month, day)));
 
@@ -82,7 +64,7 @@ public class EffectiveBlockTests
             TimeZoneInfo tz = TimeZoneInfo.Local;
             DateTimeOffset start = GetLocalDate(2024, 1, 15, tz).AddHours(9);
 
-            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, start, tz, 5, _logger);
+            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, start, tz, 5);
 
             result.Count.ShouldBe(0);
         }
@@ -108,7 +90,7 @@ public class EffectiveBlockTests
             TimeZoneInfo tz = TimeZoneInfo.Local;
             DateTimeOffset start = GetLocalDate(2024, 1, 15, tz).AddHours(9);
 
-            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, start, tz, 5, _logger);
+            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, start, tz, 5);
 
             result.Count.ShouldBe(3);
 
@@ -146,7 +128,7 @@ public class EffectiveBlockTests
             var start = new DateTime(2024, 3, 9, 0, 0, 0, DateTimeKind.Unspecified);
             var dto = new DateTimeOffset(start, tz.GetUtcOffset(start));
 
-            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, dto, tz, 5, _logger);
+            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, dto, tz, 5);
 
             result.Count.ShouldBe(5);
 
@@ -185,7 +167,7 @@ public class EffectiveBlockTests
             var start = new DateTime(2024, 11, 2, 0, 0, 0, DateTimeKind.Unspecified);
             var dto = new DateTimeOffset(start, tz.GetUtcOffset(start));
 
-            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, dto, tz, 5, _logger);
+            List<EffectiveBlock> result = EffectiveBlock.GetEffectiveBlocks(templates, dto, tz, 5);
 
             result.Count.ShouldBe(5);
 

ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutBuilder.cs

@@ -58,8 +58,7 @@ public class BlockPlayoutBuilder(
             referenceData.PlayoutTemplates,
             start,
             TimeZoneInfo.Local,
-            daysToBuild,
-            logger);
+            daysToBuild);
 
         if (blocksToSchedule.Count == 0)
         {

ErsatzTV.Core/Scheduling/BlockScheduling/EffectiveBlock.cs

@@ -1,5 +1,4 @@
 using ErsatzTV.Core.Domain.Scheduling;
-using Microsoft.Extensions.Logging;
 
 namespace ErsatzTV.Core.Scheduling.BlockScheduling;
 
@@ -9,8 +8,7 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
         ICollection<PlayoutTemplate> templates,
         DateTimeOffset start,
         TimeZoneInfo timeZone,
-        int daysToBuild,
-        ILogger logger)
+        int daysToBuild)
     {
         DateTimeOffset finish = start.AddDays(daysToBuild);
 
@@ -21,15 +19,15 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
             Option<PlayoutTemplate> maybeTemplate = PlayoutTemplateSelector.GetPlayoutTemplateFor(templates, current);
             foreach (PlayoutTemplate playoutTemplate in maybeTemplate)
             {
-                logger.LogDebug(
-                    "Will schedule day {Date} using template {Template}",
-                    current,
-                    playoutTemplate.Template.Id);
+                // logger.LogDebug(
+                //     "Will schedule day {Date} using template {Template}",
+                //     current,
+                //     playoutTemplate.Template.Id);
 
                 DateTimeOffset today = current;
 
                 var newBlocks = playoutTemplate.Template.Items
-                    .Map(i => ToEffectiveBlock(playoutTemplate, i, today, timeZone, logger))
+                    .Map(i => ToEffectiveBlock(playoutTemplate, i, today, timeZone))
                     .Map(NormalizeGuideMode)
                     .ToList();
 
@@ -50,8 +48,7 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
         PlayoutTemplate playoutTemplate,
         TemplateItem templateItem,
         DateTimeOffset current,
-        TimeZoneInfo timeZone,
-        ILogger logger)
+        TimeZoneInfo timeZone)
     {
         var blockStartTime = new DateTime(
             current.Year,
@@ -64,10 +61,10 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
 
         var blockStart = new DateTimeOffset(blockStartTime, timeZone.GetUtcOffset(blockStartTime));
 
-        logger.LogDebug(
-            "Starting block {Block} at {BlockStart}",
-            templateItem.Block.Name,
-            blockStart);
+        // logger.LogDebug(
+        //     "Starting block {Block} at {BlockStart}",
+        //     templateItem.Block.Name,
+        //     blockStart);
 
         return new EffectiveBlock(
             templateItem.Block,