no useful category rewriting

CESNET · Aug 2, 2024 · fb934bd · fb934bd
1 parent 2f41f13
commit fb934bd
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 39 deletions.
diff --git a/app/Http/Controllers/EntityCategoryController.php b/app/Http/Controllers/EntityCategoryController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Category;
+use App\Models\Entity;
+
+class EntityCategoryController extends Controller
+{
+    public function store(Entity $entity)
+    {
+        $this->authorize('do-everything');
+
+        if (empty(request('category'))) {
+            return redirect()
+                ->back()
+                ->with('status', __('categories.no_category_selected'))
+                ->with('color', 'red');
+        }
+
+        $category = Category::findOrFail(request('category'));
+        $entity->category()->associate($category);
+        $entity->save();
+
+        // TODO work with category (not  ready)
+        /*                Bus::chain([
+                            new GitDeleteFromCategory($old_category, $entity, Auth::user()),
+                            new GitAddToCategory($category, $entity, Auth::user()),
+                            function () use ($entity, $category) {
+                                $admins = User::activeAdmins()->select('id', 'email')->get();
+                                Notification::send($admins, new IdpCategoryChanged($entity, $category));
+                            },
+                        ])->dispatch();*/
+
+        if (! $entity->wasChanged()) {
+            return redirect()
+                ->back();
+        }
+
+        return redirect()
+            ->route('entities.show', $entity)
+            ->with('status', __('entities.category_updated'));
+
+    }
+}
diff --git a/app/Http/Controllers/EntityController.php b/app/Http/Controllers/EntityController.php
@@ -3,9 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreEntity;
-use App\Jobs\GitAddToCategory;
 use App\Jobs\GitAddToHfd;
-use App\Jobs\GitDeleteFromCategory;
 use App\Jobs\GitDeleteFromHfd;
 use App\Ldap\CesnetOrganization;
 use App\Ldap\EduidczOrganization;
@@ -19,7 +17,6 @@
 use App\Notifications\EntityDestroyed;
 use App\Notifications\EntityRequested;
 use App\Notifications\EntityUpdated;
-use App\Notifications\IdpCategoryChanged;
 use App\Traits\DumpFromGit\EntitiesHelp\DeleteFromEntity;
 use App\Traits\DumpFromGit\EntitiesHelp\UpdateEntity;
 use App\Traits\GitTrait;
@@ -293,42 +290,6 @@ function () use ($entity) {
 
                 break;
 
-            case 'category':
-                $this->authorize('do-everything');
-
-                if (empty(request('category'))) {
-                    return redirect()
-                        ->back()
-                        ->with('status', __('categories.no_category_selected'))
-                        ->with('color', 'red');
-                }
-
-                $old_category = $entity->category ?? null;
-                $category = Category::findOrFail(request('category'));
-                $entity->category()->associate($category);
-                $entity->save();
-
-                // TODO work with category (not  ready)
-                /*                Bus::chain([
-                                    new GitDeleteFromCategory($old_category, $entity, Auth::user()),
-                                    new GitAddToCategory($category, $entity, Auth::user()),
-                                    function () use ($entity, $category) {
-                                        $admins = User::activeAdmins()->select('id', 'email')->get();
-                                        Notification::send($admins, new IdpCategoryChanged($entity, $category));
-                                    },
-                                ])->dispatch();*/
-
-                if (! $entity->wasChanged()) {
-                    return redirect()
-                        ->back();
-                }
-
-                return redirect()
-                    ->route('entities.show', $entity)
-                    ->with('status', __('entities.category_updated'));
-
-                break;
-
             case 'hfd':
                 $this->authorize('do-everything');
 

diff --git a/routes/web.php b/routes/web.php
@@ -4,6 +4,7 @@
 use App\Http\Controllers\CategoryManagementController;
 use App\Http\Controllers\DashboardController;
 use App\Http\Controllers\EduidczStatisticController;
+use App\Http\Controllers\EntityCategoryController;
 use App\Http\Controllers\EntityController;
 use App\Http\Controllers\EntityEduGainController;
 use App\Http\Controllers\EntityFederationController;
@@ -109,6 +110,8 @@
     Route::post('{entity}/rs', [EntityRsController::class, 'store'])->name('rs.store');
     Route::patch('{entity}/rs', [EntityRsController::class, 'rsState'])->name('rs.state')->withTrashed();
 
+    Route::post('{entity}/category', [EntityCategoryController::class, 'store'])->name('category.store');
+
     Route::get('{entity}/metadata', [EntityMetadataController::class, 'store'])->name('metadata');
     Route::get('{entity}/showmetadata', [EntityMetadataController::class, 'show'])->name('showmetadata');
     Route::get('{entity}/previewmetadata', [EntityPreviewMetadataController::class, 'show'])->name('previewmetadata');