Fix cumulative time sort on enrollment report

cmu-sei · Feb 17, 2025 · 9280a14 · 9280a14
1 parent c7f895a
commit 9280a14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/Gameboard.Api/Features/Game/ImportExport/GameImportExportService.cs b/src/Gameboard.Api/Features/Game/ImportExport/GameImportExportService.cs
@@ -52,9 +52,10 @@ await _store
             .Where(b => b.Id == exportBatchId)
             .ExecuteDeleteAsync(cancellationToken);
 
-        if (File.Exists(GetExportBatchPackagePath(exportBatchId)))
+        var packagePath = GetExportBatchPackagePath(exportBatchId);
+        if (File.Exists(packagePath))
         {
-            File.Delete(GetExportBatchPackagePath(exportBatchId));
+            File.Delete(packagePath);
         }
     }
 
@@ -396,18 +397,16 @@ public async Task<ImportedGame[]> ImportPackage(byte[] package, CancellationToke
 
         using (var tempArchiveStream = File.OpenRead(tempArchivePath))
         {
-            using (var reader = ReaderFactory.Open(tempArchiveStream))
+            using var reader = ReaderFactory.Open(tempArchiveStream);
+            while (reader.MoveToNextEntry())
             {
-                while (reader.MoveToNextEntry())
+                if (!reader.Entry.IsDirectory)
                 {
-                    if (!reader.Entry.IsDirectory)
+                    reader.WriteEntryToDirectory(GetImportBatchRoot(importBatchId), new ExtractionOptions()
                     {
-                        reader.WriteEntryToDirectory(GetImportBatchRoot(importBatchId), new ExtractionOptions()
-                        {
-                            ExtractFullPath = true,
-                            Overwrite = true
-                        });
-                    }
+                        ExtractFullPath = true,
+                        Overwrite = true
+                    });
                 }
             }
         }
@@ -585,12 +584,7 @@ await _store.SaveAddRange
 
         await _store.SaveAddRange(importedGames);
 
-        return importedGames.Select(g => new ImportedGame
-        {
-            Id = g.Id,
-            Name = g.Name
-        })
-        .ToArray();
+        return [.. importedGames.Select(g => new ImportedGame { Id = g.Id, Name = g.Name })];
     }
 
     private string GetExportBatchPackageName(string exportBatchId)

diff --git a/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportSummary.cs b/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportSummary.cs
@@ -65,7 +65,7 @@ public async Task<ReportResults<EnrollmentReportRecord>> Handle(EnrollmentReport
                     records = records.Sort(r => r.Game.Name, sortDirection);
                     break;
                 case "time":
-                    records = records.Sort(r => r.PlayTime, sortDirection);
+                    records = records.Sort(r => r.PlayTime.DurationMs, sortDirection);
                     break;
             }