Enable the capability to request a group using its slugified name

Resolves #97
gloggi · Feb 19, 2024 · 7ca6680 · 7ca6680
1 parent 86af518
commit 7ca6680
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/api/app/Http/Controllers/GroupController.php b/api/app/Http/Controllers/GroupController.php
@@ -36,10 +36,19 @@ public function store(StoreGroupRequest $request)
         return response()->json($group, 201);
     }
 
-    public function show($id)
+    public function show($idOrRoute)
     {
-        $group = Group::with(['section', 'file', 'predecessors', 'successors', 'parent', 'headerImages', 'files'])
-            ->find($id);
+        $query = Group::with(['section', 'file', 'predecessors', 'successors', 'parent', 'headerImages', 'files']);
+        if (is_numeric($idOrRoute)) {
+            $group = $query->find($idOrRoute);
+        } else {
+            $groups = $query->get();
+            $filteredGroups = $groups->filter(function ($group) use ($idOrRoute) {
+                return $group->route == $idOrRoute;
+            });
+
+            $group = $filteredGroups->first();
+        }
 
         if (!$group) {
             return response()->json(['message' => 'Group not found'], 404);
@@ -56,7 +65,7 @@ public function update(UpdateGroupRequest $request, $id)
             return response()->json(['message' => 'Group not found'], 404);
         }
         $user = Auth::user();
-        if($user->hasRole('unitleader') && !$user->groups->contains($group)){
+        if ($user->hasRole('unitleader') && !$user->groups->contains($group)) {
             return response()->json(['message' => 'You are not allowed to update this group'], 403);
         }
 

diff --git a/api/app/Models/Group.php b/api/app/Models/Group.php
@@ -2,12 +2,13 @@
 
 namespace App\Models;
 
+use App\Traits\TransformTrait;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Group extends Model
 {
-    use HasFactory;
+    use HasFactory, TransformTrait;
 
     protected $fillable = [
         'name',
@@ -23,6 +24,14 @@ class Group extends Model
         'enable_group_page',
     ];
 
+    protected $appends = ['route'];
+
+    public function getRouteAttribute()
+    {
+        return $this->toCamelCase($this->name);
+    }
+
+
     public function headerImages()
     {
         return $this->belongsToMany(File::class, 'group_headers');

diff --git a/frontend/src/components/main/FooterComponent.vue b/frontend/src/components/main/FooterComponent.vue
@@ -9,7 +9,7 @@
           <template v-for="group in transformedGroups" :key="group.id">
             <li v-if="!group.parentId" class="pl-6">
               <router-link
-                :to="group.enableGroupPage ? `/group/${group.id}` : '#'"
+                :to="group.enableGroupPage ? `/group/${group.route}` : '#'"
                 >{{ group.name }}</router-link
               >
               <ul
@@ -22,7 +22,7 @@
                   class="pl-6"
                 >
                   <router-link
-                    :to="child.enableGroupPage ? `/group/${child.id}` : '#'"
+                    :to="child.enableGroupPage ? `/group/${child.route}` : '#'"
                     >{{ child.name }}</router-link
                   >
                 </li>

diff --git a/frontend/src/components/main/GroupDropdown.vue b/frontend/src/components/main/GroupDropdown.vue
@@ -16,7 +16,7 @@
           >
             <router-link
               @click="showDropdown = false"
-              :to="`/group/${group.id}`"
+              :to="`/group/${group.route}`"
               >{{ group.name }}</router-link
             >
           </li>

diff --git a/frontend/src/components/main/GroupsItem.vue b/frontend/src/components/main/GroupsItem.vue
@@ -120,7 +120,7 @@
           </p>
         </div>
         <BasicButton>
-          <router-link :to="`/group/${currentGroup.id}`" class="w-full"
+          <router-link :to="`/group/${currentGroup.route}`" class="w-full"
             >Zur Gruppenseite</router-link
           >
         </BasicButton>