Unique URL bugfix

stanislawfortonski · Apr 10, 2021 · c3fb3af · c3fb3af
1 parent aaec9fc
commit c3fb3af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/app/Http/Controllers/Admin/CategoriesController.php b/app/Http/Controllers/Admin/CategoriesController.php
@@ -52,7 +52,8 @@ public function create()
      */
     public function store(CategoryStoreRequest $request)
     {
-        $this->validateContentUrl($request);
+        if (!$this->validateContentUrl($request))
+            return redirect()->back()->withError(__('This url already exists.'));
 
         DB::beginTransaction();
         try {
@@ -100,10 +101,12 @@ public function update(CategoryStoreRequest $request, Category $category)
     {
         $content = $category->content()->first();
         if (!empty($content)){
-            $this->validateContentUrlWithoutOne($request, $content);
+            if (!$this->validateContentUrlWithoutOne($request, $content))
+                return redirect()->back()->withError(__('This url already exists.'));
         }
         else {
-            $this->validateContentUrl($request);
+            if (!$this->validateContentUrl($request))
+                return redirect()->back()->withError(__('This url already exists.'));
         }
 
         DB::beginTransaction();

diff --git a/app/Http/Controllers/Admin/PostsController.php b/app/Http/Controllers/Admin/PostsController.php
@@ -53,7 +53,8 @@ public function create()
      */
     public function store(PostStoreRequest $request)
     {
-        $this->validateContentUrl($request);
+        if (!$this->validateContentUrl($request))
+            return redirect()->back()->withError(__('This url already exists.'));
 
         DB::beginTransaction();
         try {
@@ -106,10 +107,12 @@ public function update(PostStoreRequest $request, Post $post)
     {
         $content = $post->content()->first();
         if (!empty($content)){
-            $this->validateContentUrlWithoutOne($request, $content);
+            if (!$this->validateContentUrlWithoutOne($request, $content))
+                return redirect()->back()->withError(__('This url already exists.'));
         }
         else {
-            $this->validateContentUrl($request);
+            if (!$this->validateContentUrl($request))
+                return redirect()->back()->withError(__('This url already exists.'));
         }
 
         if ($post->user_id == auth()->user()->id || auth()->user()->hasOneOfRoles(['admin', 'mod'])){

diff --git a/app/Services/ContentUrlValidator.php b/app/Services/ContentUrlValidator.php
@@ -8,10 +8,11 @@
 trait ContentUrlValidator
 {
     public function validateContentUrlWithoutOne($request, Content $content){
-        $this->validate($request, ['content.url' => Rule::unique('contents', 'url')->ignore($content->id)]);
+        return Content::where('url', '=', $request->content['url'])->where('lang', '=', app()->getLocale())->where('id', '!=', $content->id)->count() == 0;
     }
 
     public function validateContentUrl($request){
-        $this->validate($request, ['content.url' => Rule::unique('contents', 'url')]);
+        return Content::where('url', '=', $request->content['url'])->where('lang', '=', app()->getLocale())->count() == 0;
     }
 }
+
diff --git a/database/migrations/2020_12_16_000001_create_contents_table.php b/database/migrations/2020_12_16_000001_create_contents_table.php
@@ -18,7 +18,7 @@ public function up()
             $table->string('lang', 2);
             $table->string('title');
             $table->text('content');
-            $table->string('url')->unique();
+            $table->string('url');
             $table->timestamps();
         });
     }

diff --git a/resources/lang/pl.json b/resources/lang/pl.json
@@ -125,5 +125,6 @@
     "No users.": "Brak użytkowników.",
     "Tags": "Tagi",
     "Other posts that may interest you": "Inne posty ktore mogą cię zainteresować",
-    "Toggle navigation": "Przełącz nawigację"
+    "Toggle navigation": "Przełącz nawigację",
+    "This url already exists.": "Taki link już istnieje."
 }