Merge pull request #32 from davewalker5/FR-121-Job-Status-Pagination

Fixup job status report pagination
davewalker5 · Jan 1, 2024 · 8b95222 · 8b95222
2 parents fd5a076 + 68e75ad
commit 8b95222
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/dotnet/core/aspnet:latest
-COPY flightrecorder.api-1.8.0.0 /opt/flightrecorder.api-1.8.0.0
-WORKDIR /opt/flightrecorder.api-1.8.0.0/bin
+COPY flightrecorder.api-1.9.0.0 /opt/flightrecorder.api-1.9.0.0
+WORKDIR /opt/flightrecorder.api-1.9.0.0/bin
 ENTRYPOINT [ "./FlightRecorder.Api" ]
diff --git a/src/FlightRecorder.Api/Controllers/ReportsController.cs b/src/FlightRecorder.Api/Controllers/ReportsController.cs
@@ -188,7 +188,6 @@ public async Task<ActionResult<List<JobStatus>>> GetJobsAsync(string start, stri
                                         .ListAsync(x => (x.Start >= startDate) && ((x.End == null) || (x.End <= endDate)),
                                                    pageNumber,
                                                    pageSize)
-                                        .OrderByDescending(x => x.Start)
                                         .ToListAsync();
 
             if (!results.Any())

diff --git a/src/FlightRecorder.Api/FlightRecorder.Api.csproj b/src/FlightRecorder.Api/FlightRecorder.Api.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
-    <FileVersion>1.8.0.0</FileVersion>
-    <ProductVersion>1.8.0</ProductVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
+    <FileVersion>1.9.0.0</FileVersion>
+    <ProductVersion>1.9.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/FlightRecorder.BusinessLogic/Database/JobStatusManager.cs b/src/FlightRecorder.BusinessLogic/Database/JobStatusManager.cs
@@ -44,13 +44,19 @@ public IAsyncEnumerable<JobStatus> ListAsync(Expression<Func<JobStatus, bool>> p
             if (predicate == null)
             {
                 results = _context.JobStatuses
+                                  .OrderByDescending(x => x.Start)
                                   .Skip((pageNumber - 1) * pageSize)
                                   .Take(pageSize)
                                   .AsAsyncEnumerable();
             }
             else
             {
-                results = _context.JobStatuses.Where(predicate).AsAsyncEnumerable();
+                results = _context.JobStatuses
+                                  .Where(predicate)
+                                  .OrderByDescending(x => x.Start)
+                                  .Skip((pageNumber - 1) * pageSize)
+                                  .Take(pageSize)
+                                  .AsAsyncEnumerable();
             }
 
             return results;

diff --git a/src/FlightRecorder.BusinessLogic/FlightRecorder.BusinessLogic.csproj b/src/FlightRecorder.BusinessLogic/FlightRecorder.BusinessLogic.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <PackageId>FlightRecorder.BusinessLogic</PackageId>
-    <PackageVersion>1.6.0.0</PackageVersion>
+    <PackageVersion>1.7.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/FlightRecorder.Data/FlightRecorder.Data.csproj b/src/FlightRecorder.Data/FlightRecorder.Data.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <PackageId>FlightRecorder.Data</PackageId>
-    <PackageVersion>1.6.0.0</PackageVersion>
+    <PackageVersion>1.7.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/FlightRecorder.DataExchange/FlightRecorder.DataExchange.csproj b/src/FlightRecorder.DataExchange/FlightRecorder.DataExchange.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <PackageId>FlightRecorder.DataExchange</PackageId>
-    <PackageVersion>1.6.0.0</PackageVersion>
+    <PackageVersion>1.7.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/FlightRecorder.Entities/FlightRecorder.Entities.csproj b/src/FlightRecorder.Entities/FlightRecorder.Entities.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <PackageId>FlightRecorder.Entities</PackageId>
-    <PackageVersion>1.6.0.0</PackageVersion>
+    <PackageVersion>1.7.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/FlightRecorder.Manager/FlightRecorder.Manager.csproj b/src/FlightRecorder.Manager/FlightRecorder.Manager.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
-    <FileVersion>1.6.0.0</FileVersion>
-    <ProductVersion>1.6.0.0</ProductVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
+    <FileVersion>1.7.0.0</FileVersion>
+    <ProductVersion>1.7.0.0</ProductVersion>
     <Configurations>Release;Debug</Configurations>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/FlightRecorder.Tests/FlightRecorder.Tests.csproj b/src/FlightRecorder.Tests/FlightRecorder.Tests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>1.6.0.0</ReleaseVersion>
+    <ReleaseVersion>1.7.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>