Prevent printing deleted items

gaepdit · Dec 20, 2024 · 52e2172 · 52e2172
1 parent 73ca550
commit 52e2172
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/IaipDataService/SourceTests/IaipSourceTestService.cs b/src/IaipDataService/SourceTests/IaipSourceTestService.cs
@@ -19,9 +19,8 @@ public class IaipSourceTestService(
     public async Task<BaseSourceTestReport?> FindAsync(int referenceNumber)
     {
         var getDocumentTypeTask = GetDocumentTypeAsync(referenceNumber);
-        var getSourceTestExistsTask = SourceTestExistsAsync(referenceNumber);
 
-        if (!await getSourceTestExistsTask) return null;
+        if (!await SourceTestExistsAsync(referenceNumber)) return null;
 
         return await getDocumentTypeTask switch
         {

diff --git a/src/WebApp/Pages/Print/Acc/Index.cshtml.cs b/src/WebApp/Pages/Print/Acc/Index.cshtml.cs
@@ -17,7 +17,8 @@ public async Task<ActionResult> OnGetAsync(
         [FromRoute] int id)
     {
         Report = await workEntryService.FindAsync(id) as AccViewDto;
-        if (Report == null) return NotFound();
+        if (Report == null || Report.IsDeleted) return NotFound();
+
         Facility = await facilityService.FindFacilityDetailsAsync((FacilityId?)Report!.FacilityId);
         if (Facility == null) return NotFound();
 

diff --git a/src/WebApp/Pages/Print/Fce/Index.cshtml.cs b/src/WebApp/Pages/Print/Fce/Index.cshtml.cs
@@ -19,7 +19,8 @@ public async Task<ActionResult> OnGetAsync(
         CancellationToken token = default)
     {
         Report = await fceService.FindAsync(id, token);
-        if (Report == null) return NotFound();
+        if (Report == null || Report.IsDeleted) return NotFound();
+
         Facility = await facilityService.FindFacilityDetailsAsync((FacilityId?)Report!.FacilityId);
         if (Facility == null) return NotFound();
 

diff --git a/src/WebApp/Pages/Print/SourceTest/Index.cshtml.cs b/src/WebApp/Pages/Print/SourceTest/Index.cshtml.cs
@@ -26,8 +26,7 @@ public async Task<ActionResult> OnGetAsync(
             if (!activeUser) return Challenge();
         }
 
-        var sourceTestTask = sourceTestService.FindAsync(referenceNumber);
-        Report = await sourceTestTask;
+        Report = await sourceTestService.FindAsync(referenceNumber);
         if (Report?.Facility == null) return NotFound();
 
         Report = includeConfidentialInfo ? Report : Report.RedactedStackTestReport();