Fix module filter not returning empty list when option is null

Typiqally · May 26, 2023 · 3341acf · 3341acf
1 parent 23df346
commit 3341acf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Epsilon.Canvas.Abstractions/ICanvasModuleCollectionFetcher.cs b/Epsilon.Canvas.Abstractions/ICanvasModuleCollectionFetcher.cs
@@ -4,5 +4,5 @@ namespace Epsilon.Canvas.Abstractions;
 
 public interface ICanvasModuleCollectionFetcher
 {
-    public IAsyncEnumerable<ModuleOutcomeResultCollection> GetAll(int courseId, String[] allowedModules);
+    public IAsyncEnumerable<ModuleOutcomeResultCollection> GetAll(int courseId, IEnumerable<string>? allowedModules);
 }
diff --git a/Epsilon.Canvas/CanvasModuleCollectionFetcher.cs b/Epsilon.Canvas/CanvasModuleCollectionFetcher.cs
@@ -21,7 +21,7 @@ IOutcomeHttpService outcomeService
         _outcomeService = outcomeService;
     }
 
-    public async IAsyncEnumerable<ModuleOutcomeResultCollection> GetAll(int courseId, string[] allowedModules)
+    public async IAsyncEnumerable<ModuleOutcomeResultCollection> GetAll(int courseId, IEnumerable<string>? allowedModules)
     {
         var response = await _outcomeService.GetResults(courseId, new[] { "outcomes", "alignments" });
         var modules = await _moduleService.GetAll(courseId, new[] { "items" });
@@ -31,7 +31,7 @@ public async IAsyncEnumerable<ModuleOutcomeResultCollection> GetAll(int courseId
 
         foreach (var module in modules.ToArray())
         {
-            if (allowedModules.Length == 0 || allowedModules.Contains(module.Name))
+            if (allowedModules == null || !allowedModules.Any() || allowedModules.Contains(module.Name))
             {
                 Debug.Assert(module.Items != null, "module.Items != null");
 

diff --git a/Epsilon.Cli/Startup.cs b/Epsilon.Cli/Startup.cs
@@ -62,7 +62,7 @@ private async Task ExecuteAsync()
                 return;
             }
 
-            var modules = _exportOptions.Modules.Split(",");
+            var modules = _exportOptions.Modules?.Split(",");
             _logger.LogInformation("Targeting Canvas course: {CourseId}, at {Url}", _canvasSettings.CourseId,
                 _canvasSettings.ApiUrl);
             _logger.LogInformation("Downloading results, this may take a few seconds...");

diff --git a/Epsilon/Export/ExportOptions.cs b/Epsilon/Export/ExportOptions.cs
@@ -5,8 +5,8 @@ public class ExportOptions
     public string OutputName { get; set; } = $"{Constants.ProjectName}-Export-{{DateTime}}";
 
     public string Formats { get; set; } = "console";
-    
-    public string Modules { get; set; } = "";
+
+    public string? Modules { get; set; } = null;
 
     public string FormattedOutputName => OutputName
         .Replace("{DateTime}", DateTime.Now.ToString("ddMMyyyyHHmmss"));