Edits

Author: AllanKoder

app/Http/Controllers/ComputerScienceResourceController.php

@@ -17,6 +17,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use Inertia\Inertia;
 use Throwable;
 
@@ -127,6 +128,18 @@ public function store(StoreResourceRequest $request)
             return response()->json($resource);
         } catch (Throwable $e) {
             DB::rollBack();
+            // Attempt to remove the uploaded image if it was stored
+            if (isset($path) && $path) {
+                try {
+                    Storage::disk('public')->delete($path);
+                } catch (Throwable $removeEx) {
+                    Log::warning('Failed to remove image after exception', [
+                        'user_id' => Auth::id(),
+                        'image_path' => $path,
+                        'error' => $removeEx->getMessage(),
+                    ]);
+                }
+            }
             Log::critical('Failed to create resource', [
                 'error' => $e->getMessage(),
                 'trace' => $e->getTraceAsString(),

app/Http/Controllers/ResourceEditsController.php

@@ -122,7 +122,11 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
             }
 
             if (array_key_exists('image_path', $changes)) {
-                // TODO: Removed code to delete photo, will be handled in a cron job
+                // TODO: Remove the old photo resource photo, will be handled in a cron job,
+                //
+                // photo image_url history can be viewed via activity log.
+                //
+
                 $destPath = null;
                 if (isset($changes['image_path'])) {
                     // Copy the new file from 'resource-edits' to 'resource' (do not delete the old one)
@@ -131,7 +135,7 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
                     $newFileName = Str::random(40).'.'.$fileExtension;
                     $destPath = 'resource/'.$newFileName;
 
-                    Storage::disk('public')->copy($sourcePath, $destPath);
+                    Storage::disk('public')->move($sourcePath, $destPath);
                 }
 
                 // Update image_path in DB

resources/js/Components/Form/TagSelector.vue

@@ -47,6 +47,12 @@ function updateDropdownPosition() {
         position: "absolute",
     };
 }
+// Watch selectedTags and update dropdown position when tags change and dropdown is open
+watch(selectedTags, () => {
+    if (showDropdown.value) {
+        nextTick(updateDropdownPosition);
+    }
+});
 
 watch(showDropdown, (val) => {
     if (val) {
@@ -191,14 +197,6 @@ function onKeydown(event) {
         searchInput.value?.blur();
         return;
     }
-
-    if (
-        event.key === "Backspace" &&
-        !searchQuery.value &&
-        selectedTags.value.length > 0
-    ) {
-        removeTag(selectedTags.value[selectedTags.value.length - 1]);
-    }
 }
 
 function onBlur() {

resources/js/Components/Resources/ResourceEdit/ResourceEditsFAQ.vue

@@ -113,7 +113,8 @@ import FrequentlyAskedQuestion from "@/Components/FrequentlyAskedQuestion.vue";
                                         class="border border-gray-300 dark:border-gray-600 px-4 py-2"
                                     >
                                         Since there are no existing votes (positive or negative), the entire community can merge any edits.<th></th>
-                                        The reasoning is that someone could've make a typo and needed a quick fix.
+                                        The reasoning is that someone could've made a typo and needed a quick fix.<th></th>
+                                        Everyone automatically upvotes their own resources. So, you must unvote your newly created resource to reach 0 votes.
                                     </td>
                                 </tr>
                                 <tr>

…omputerScienceResourceControllerTest.php …/Feature/ComputerScienceResourceTest.phptests/Feature/ComputerScienceResourceControllerTest.php renamed to tests/Feature/ComputerScienceResourceTest.php tests/Feature/ComputerScienceResourceControllerTest.php renamed to tests/Feature/ComputerScienceResourceTest.php

@@ -13,7 +13,7 @@
 use Tests\RequestFactories\ComputerScienceResource\StoreResourceRequestFactory;
 use Tests\TestCase;
 
-class ComputerScienceResourceControllerTest extends TestCase
+class ComputerScienceResourceTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -112,4 +112,34 @@ public function test_cannot_post_resource_with_invalid_fields(string $field, mix
             "Failed asserting that a resource with name '{$validData['name']}' was not created in the database. Invalid field: $field"
         );
     }
+
+    public function test_image_is_removed_if_resource_creation_fails()
+    {
+        Storage::fake('public');
+        $this->actingAs($this->user);
+
+        // Create valid form data but set an invalid field to force failure
+        $formData = StoreResourceRequestFactory::new()->create();
+        $formData['image_file'] = UploadedFile::fake()->image('fail_image.jpg');
+        $formData['name'] = str_repeat('a', 101); // Invalid name, will fail validation
+
+        $response = $this->postJson(route('resources.store'), $formData);
+        $response->assertStatus(422); // Validation error
+
+        // The image should not exist in storage
+        Storage::disk('public')->assertMissing('resource/' . $formData['image_file']->hashName());
+    }
+
+    public function test_model_removes_image_upon_deletion()
+    {
+        $resource = ComputerScienceResource::factory()->create();
+
+        $imagePath = $resource->image_path;
+
+        Storage::disk('public')->assertExists($imagePath);
+
+        $resource->delete();
+
+        Storage::disk('public')->assertMissing($imagePath);
+    }
 }

tests/Feature/ResourceEditsTest.php

@@ -148,13 +148,13 @@ public function test_merged_edit_reflects_changes_on_original_resource(): void
         $resource = ComputerScienceResource::factory()->create();
         $this->actingAs($this->user);
 
-        $mergeAttempts = 10;
+        $mergeAttempts = 5;
 
         for ($i = 0; $i < $mergeAttempts; $i++) {
             $changes = [
                 'name' => "Resource Name Edited {$i}",
                 'description' => "Resource Description Changed {$i}",
-                'image_file' => UploadedFile::fake()->image('resource.jpg'),
+                'image_file' => UploadedFile::fake()->image("resource_{$i}.jpg"),
                 'page_url' => "http://{$i}.com",
                 'difficulty' => fake()->randomElement(config('computerScienceResource.difficulties')),
                 'platforms' => fake()->randomElements(config('computerScienceResource.platforms'), fake()->numberBetween(1, 3)),
@@ -164,14 +164,17 @@ public function test_merged_edit_reflects_changes_on_original_resource(): void
                 'general_tags' => ["$i-a", "$i-b", "$i-c"],
             ];
 
-            $this->makeAndApplyResourceEdits($resource->id, $changes);
+            $edit = $this->createResourceEdit($resource->id, $changes);
+            $this->approveResourceEdit($edit);
 
             // Refresh and assert
             $resource->refresh();
 
             $this->assertEquals($changes['name'], $resource->name);
             $this->assertEquals($changes['description'], $resource->description);
+
             Storage::disk('public')->assertExists($resource->image_path);
+            Storage::disk('public')->assertMissing($edit->image_path);
 
             $this->assertEquals($changes['page_url'], $resource->page_url);
             $this->assertEquals($changes['difficulty'], $resource->difficulty);