Implemented overrides for get Active/Expired subscriptions

Cajetan.OF-DL/Cajetan.OF-DL.csproj

@@ -31,7 +31,6 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.Seq" Version="7.0.1" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Akka" Version="1.5.60"/>
     <PackageReference Include="BouncyCastle.NetCore" Version="2.2.1"/>
     <PackageReference Include="HtmlAgilityPack" Version="1.12.4"/>

Cajetan.OF-DL/ProgramCajetan.cs

@@ -20,7 +20,7 @@ static async Task<ServiceCollection> ConfigureServices(string[] args)
 {
     // Set up dependency injection with LoggingService and ConfigService
     ServiceCollection services = new();
-    services.AddSingleton<ILoggingService, CajetanLoggingService>();
+    services.AddSingleton<ILoggingService, SeqLoggingService>();
     services.AddSingleton<IConfigService, ConfigService>();
     services.AddSingleton(new ExitHelper(new SpectreDownloadEventHandler()));
     ServiceProvider tempServiceProvider = services.BuildServiceProvider();

Cajetan.OF-DL/Services/CajetanApiService.cs

@@ -255,7 +255,7 @@ public class CajetanApiService(IAuthService authService, IConfigService configSe
 
             Log.Debug("Calling GetAllSubscrptions");
 
-            const int limit = 30;
+            const int limit = 25;
             int offset = 0;
 
             Dictionary<string, string> getParams = new()
@@ -295,12 +295,12 @@ public class CajetanApiService(IAuthService authService, IConfigService configSe
 
                     if (!isRestricted || isRestrictedButAllowed)
                         users.Add(item.Username, item.Id);
+
+                    if (subscriptionsDto.HasMore is false)
+                        break;
+
+                    offset += limit;
                 }
-
-                if (subscriptionsDto.HasMore is false)
-                    break;
-
-                offset += limit;
             }
 
             return users;

Cajetan.OF-DL/Services/SeqLoggingService.cs

@@ -1,11 +1,13 @@
+using OF_DL.Enumerations;
+using Serilog;
 using Serilog.Core;
 using Serilog.Events;
 
 namespace OF_DL.Services;
 
-public class CajetanLoggingService : ILoggingService
+public class SeqLoggingService : ILoggingService
 {
-    public CajetanLoggingService()
+    public SeqLoggingService()
     {
         LevelSwitch = new LoggingLevelSwitch();
         InitializeLoggerWithSeq();
@@ -33,21 +35,15 @@ public class CajetanLoggingService : ILoggingService
 
     private void InitializeLoggerWithSeq()
     {
-        LevelSwitch.MinimumLevel = LogEventLevel.Warning;
-
-        LoggerConfiguration loggerConfig = new LoggerConfiguration()
+        Log.Logger = new LoggerConfiguration()
             .Enrich.FromLogContext()
             .Enrich.WithProperty("Application", "OF_DL")
             .Enrich.WithProperty("StartTime", $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} ")
             .Enrich.WithProperty("MachineName", Environment.MachineName)
-            .MinimumLevel.Verbose()
-            .WriteTo.File("logs/OFDL.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error, levelSwitch: LevelSwitch)
-            .WriteTo.Seq("https://seq.cajetan.dk", controlLevelSwitch: LevelSwitch);
-
-        if (System.Diagnostics.Debugger.IsAttached)
-            loggerConfig.WriteTo.Debug(restrictedToMinimumLevel: LogEventLevel.Debug);
-
-        Log.Logger = loggerConfig.CreateLogger();
+            .MinimumLevel.ControlledBy(LevelSwitch)
+            .WriteTo.File("logs/OFDL.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error)
+            .WriteTo.Seq("https://seq.cajetan.dk")
+            .CreateLogger();
 
         Log.Debug("Logging service initialized");
     }