Merge branch 'page-url-whitespace' of https://github.com/AllanKoder/ComputerScienceResources.com into page-url-whitespace

Author: AllanKoder

app/Http/Controllers/ResourceEditsController.php

@@ -5,7 +5,6 @@
 use App\Http\Requests\StoreResourceEdit;
 use App\Models\ComputerScienceResource;
 use App\Models\ResourceEdits;
-use App\Services\DataNormalizationService;
 use App\Services\ResourceEditsService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;

app/Models/ResourceEdits.php

@@ -6,6 +6,7 @@
 use App\Services\ResourceEditsService;
 use App\Traits\HasComments;
 use App\Traits\HasVotes;
+use App\Utilities\UrlUtilities;
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -14,7 +15,6 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
-use App\Utilities\UrlUtilities;
 use Illuminate\Support\Facades\Storage;
 use ShiftOneLabs\LaravelCascadeDeletes\CascadesDeletes;
 use Spatie\Activitylog\LogOptions;
@@ -94,6 +94,7 @@ protected function proposedChanges(): Attribute
                 if (array_key_exists('page_url', $value) && is_string($value['page_url'])) {
                     $value['page_url'] = UrlUtilities::normalize($value['page_url']);
                 }
+
                 return json_encode($value);
             }
         );

app/Services/ComputerScienceResourceService.php

@@ -110,7 +110,7 @@ public function getShowResourceData(Request $request, string $slug, string $tab
 
         $validTabs = ['reviews', 'discussion', 'edits'];
         if (! in_array($tab, $validTabs)) {
-            throw new ResourceInvalidTabException('Invalid tab: ' . $tab);
+            throw new ResourceInvalidTabException('Invalid tab: '.$tab);
         }
 
         $data = [
@@ -145,7 +145,7 @@ function () use ($computerScienceResource, $sortBy, $request) {
             );
         } elseif ($tab === 'discussion') {
             $data['discussion'] = Inertia::defer(
-                fn() => $this->commentService->getPaginatedComments('resource', $computerScienceResource->id, 0, 150, $sortBy)
+                fn () => $this->commentService->getPaginatedComments('resource', $computerScienceResource->id, 0, 150, $sortBy)
             );
         }
 

app/Services/DataNormalizationService.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Services;
+
 use App\Utilities\UrlUtilities;
 
 class DataNormalizationService

app/Services/ResourceEditsService.php

@@ -2,8 +2,8 @@
 
 namespace App\Services;
 
-use App\Models\ResourceEdits;
 use App\Models\ComputerScienceResource;
+use App\Models\ResourceEdits;
 use App\Utilities\UrlUtilities;
 
 class ResourceEditsService

tests/Feature/ComputerScienceResourceTest.php

@@ -155,7 +155,7 @@ public function test_posting_duplicate_resource_returns_existing_resource()
         $this->postJson(route('resources.store'), $formData);
 
         // Try to create the same resource again, with a slighly different URL
-        $formData['page_url'] = $formData['page_url'] . "   ";
+        $formData['page_url'] = $formData['page_url'].'   ';
         $response = $this->postJson(route('resources.store'), $formData);
 
         $response->assertStatus(200);