Merge pull request #11999 from notbakaneko/feature/beatmap-user-tags-path

Update setting beatmap tags to use path param

Author: nanaya

Diff for: app/Http/Controllers/BeatmapTagsController.php

@@ -19,8 +19,8 @@ public function __construct()
 
         $this->middleware('auth', [
             'only' => [
-                'store',
                 'destroy',
+                'update',
             ],
         ]);
     }
@@ -35,20 +35,18 @@ public function destroy($beatmapId, $tagId)
         return response()->noContent();
     }
 
-    public function store($beatmapId)
+    public function update($beatmapId, $tagId)
     {
-        $tagId = get_int(request('tag_id'));
-
         $beatmap = Beatmap::findOrFail($beatmapId);
         priv_check('BeatmapTagStore', $beatmap)->ensureCan();
 
         $tag = Tag::findOrFail($tagId);
 
-        $user = \Auth::user();
-
         $tag
             ->beatmapTags()
-            ->firstOrCreate(['beatmap_id' => $beatmapId, 'user_id' => $user->getKey()]);
+            ->firstOrCreate(['beatmap_id' => $beatmapId, 'user_id' => \Auth::user()->getKey()]);
+
+        $beatmap->expireTopTagIds();
 
         return response()->noContent();
     }

Diff for: app/Models/Beatmap.php

@@ -251,6 +251,11 @@ public function canBeConvertedTo(int $rulesetId)
         return $this->playmode === static::MODES['osu'] || $this->playmode === $rulesetId;
     }
 
+    public function expireTopTagIds()
+    {
+        \Cache::delete("beatmap_top_tag_ids:{$this->getKey()}");
+    }
+
     public function getAttribute($key)
     {
         return match ($key) {
@@ -378,10 +383,9 @@ public function topTagIds()
         // TODO: Add option to multi query when beatmapset requests all tags for beatmaps?
         return $this->memoize(
             __FUNCTION__,
-            fn () => cache_remember_mutexed(
+            fn () => \Cache::remember(
                 "beatmap_top_tag_ids:{$this->getKey()}",
                 $GLOBALS['cfg']['osu']['tags']['beatmap_tags_cache_duration'],
-                [],
                 fn () => $this->beatmapTags()->topTagIds()->limit(50)->get()->toArray(),
             ),
         );

Diff for: routes/web.php

@@ -436,7 +436,7 @@
                     });
                 });
 
-                Route::apiResource('tags', 'BeatmapTagsController', ['only' => ['store', 'destroy']]);
+                Route::apiResource('tags', 'BeatmapTagsController', ['only' => ['destroy', 'update']]);
             });
         });
 

Diff for: tests/Controllers/BeatmapTagsControllerTest.php

@@ -30,7 +30,7 @@ public function testStore(): void
 
         $this->actAsScopedUser($user);
         $this
-            ->post(route('api.beatmaps.tags.store', ['beatmap' => $this->beatmap->getKey()]), ['tag_id' => $this->tag->getKey()])
+            ->put(route('api.beatmaps.tags.update', ['beatmap' => $this->beatmap->getKey(), 'tag' => $this->tag->getKey()]))
             ->assertSuccessful();
     }
 
@@ -40,7 +40,7 @@ public function testStoreNoScore(): void
 
         $this->actAsScopedUser(User::factory()->create());
         $this
-            ->post(route('api.beatmaps.tags.store', ['beatmap' => $this->beatmap->getKey()]), ['tag_id' => $this->tag->getKey()])
+            ->put(route('api.beatmaps.tags.update', ['beatmap' => $this->beatmap->getKey(), 'tag' => $this->tag->getKey()]))
             ->assertForbidden();
     }
 

Diff for: tests/api_routes.json

@@ -174,11 +174,12 @@
         "scopes": []
     },
     {
-        "uri": "api/v2/beatmaps/{beatmap}/tags",
+        "uri": "api/v2/beatmaps/{beatmap}/tags/{tag}",
         "methods": [
-            "POST"
+            "PATCH",
+            "PUT"
         ],
-        "controller": "App\\Http\\Controllers\\BeatmapTagsController@store",
+        "controller": "App\\Http\\Controllers\\BeatmapTagsController@update",
         "middlewares": [
             "App\\Http\\Middleware\\ThrottleRequests:1200,1,api:",
             "App\\Http\\Middleware\\RequireScopes",
@@ -719,6 +720,22 @@
             "forum.write"
         ]
     },
+    {
+        "uri": "api/v2/forums/topics",
+        "methods": [
+            "GET",
+            "HEAD"
+        ],
+        "controller": "App\\Http\\Controllers\\Forum\\TopicsController@index",
+        "middlewares": [
+            "App\\Http\\Middleware\\ThrottleRequests:1200,1,api:",
+            "App\\Http\\Middleware\\RequireScopes",
+            "App\\Http\\Middleware\\RequireScopes:public"
+        ],
+        "scopes": [
+            "public"
+        ]
+    },
     {
         "uri": "api/v2/forums/topics",
         "methods": [
@@ -735,22 +752,6 @@
             "forum.write"
         ]
     },
-    {
-      "uri": "api/v2/forums/topics",
-      "methods": [
-          "GET",
-          "HEAD"
-      ],
-      "controller": "App\\Http\\Controllers\\Forum\\TopicsController@index",
-      "middlewares": [
-          "App\\Http\\Middleware\\ThrottleRequests:1200,1,api:",
-          "App\\Http\\Middleware\\RequireScopes",
-          "App\\Http\\Middleware\\RequireScopes:public"
-      ],
-      "scopes": [
-          "public"
-      ]
-    },
     {
         "uri": "api/v2/forums/topics/{topic}",
         "methods": [