Fix review method and test to prevent review of unsubmitted storage r…

…equests Resolves #35
biigle · Dec 11, 2024 · f3a5325 · f3a5325
1 parent fc6f56f
commit f3a5325
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/Http/Controllers/Views/StorageRequestController.php b/src/Http/Controllers/Views/StorageRequestController.php
@@ -78,17 +78,17 @@ public function create(Request $request)
      */
 
      public function review($id)
-{
-    $request = StorageRequest::whereNull('expires_at')
-        ->whereNotNull('submitted_at') // Add this condition
-        ->with('files')
-        ->findOrFail($id);
-
-    $this->authorize('approve', $request);
-
-    return view('user-storage::review', [
-        'request' => $request,
-    ]);
-}
-
+     {
+         $request = StorageRequest::whereNull('expires_at')
+             ->whereNotNull('submitted_at') 
+             ->with('files')
+             ->findOrFail($id);
+     
+         $this->authorize('approve', $request);
+     
+         return view('user-storage::review', [
+             'request' => $request,
+         ]);
+     }
+     
 }
diff --git a/tests/Http/Controllers/Views/StorageRequestControllerTest.php b/tests/Http/Controllers/Views/StorageRequestControllerTest.php
@@ -50,10 +50,9 @@ public function testIndex()
             ->get('storage-requests')
             ->assertViewIs('user-storage::index');
     }
-
     public function testReview()
     {
-        $request = StorageRequest::factory()->create();
+        $request = StorageRequest::factory()->create(['submitted_at' => now()]);
         $id = $request->id;
 
         $this->get("storage-requests/{$id}/review")->assertRedirect('login');
@@ -77,7 +76,7 @@ public function testReview()
             ->get("storage-requests/{$id}/review")
             ->assertViewIs('user-storage::review');
 
-        $request->update(['expires_at' => '2022-03-28 10:40:00']);
+        $request->update(['expires_at' => now()]);
         $this->actingAs($user)
             ->get("storage-requests/{$id}/review")
             ->assertStatus(404);
@@ -88,7 +87,8 @@ public function testReview()
 
         $this->actingAs($user)
             ->get("storage-requests/{$unsubmittedRequest->id}/review")
-            ->assertStatus(404); 
+            ->assertStatus(404);
     }
 
+
 }