streamline making the query and params for the search

ppy · Sep 18, 2024 · 50135d9 · 50135d9
1 parent 50f0d75
commit 50135d9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/app/Models/BeatmapDiscussion.php b/app/Models/BeatmapDiscussion.php
@@ -73,14 +73,8 @@ class BeatmapDiscussion extends Model
     // FIXME: This and other static search functions should be extracted out.
     public static function search($rawParams = [])
     {
-        $pagination = static::pagination(cursor_from_params($rawParams) ?? $rawParams);
+        [$query, $params] = static::searchQueryAndParams(cursor_from_params($rawParams) ?? $rawParams);
 
-        $params = [
-            'limit' => $pagination['limit'],
-            'page' => $pagination['page'],
-        ];
-
-        $query = static::limit($params['limit'])->offset($pagination['offset']);
         $isModerator = $rawParams['is_moderator'] ?? false;
 
         if (present($rawParams['user'] ?? null)) {

diff --git a/app/Models/BeatmapDiscussionPost.php b/app/Models/BeatmapDiscussionPost.php
@@ -42,14 +42,8 @@ class BeatmapDiscussionPost extends Model implements Traits\ReportableInterface
 
     public static function search($rawParams = [])
     {
-        $pagination = static::pagination(cursor_from_params($rawParams) ?? $rawParams);
+        [$query, $params] = static::searchQueryAndParams(cursor_from_params($rawParams) ?? $rawParams);
 
-        $params = [
-            'limit' => $pagination['limit'],
-            'page' => $pagination['page'],
-        ];
-
-        $query = static::limit($params['limit'])->offset($pagination['offset']);
         $isModerator = $rawParams['is_moderator'] ?? false;
 
         if (isset($rawParams['user'])) {

diff --git a/app/Models/BeatmapDiscussionVote.php b/app/Models/BeatmapDiscussionVote.php
@@ -59,14 +59,8 @@ public static function recentlyGivenByUser($userId, $timeframeMonths = 3)
 
     public static function search($rawParams = [])
     {
-        $pagination = static::pagination(cursor_from_params($rawParams) ?? $rawParams);
+        [$query, $params] = static::searchQueryAndParams(cursor_from_params($rawParams) ?? $rawParams);
 
-        $params = [
-            'limit' => $pagination['limit'],
-            'page' => $pagination['page'],
-        ];
-
-        $query = static::limit($params['limit'])->offset($pagination['offset']);
         $isModerator = $rawParams['is_moderator'] ?? false;
 
         if (isset($rawParams['user'])) {

diff --git a/app/Models/BeatmapsetEvent.php b/app/Models/BeatmapsetEvent.php
@@ -85,14 +85,8 @@ public static function log($type, $user, $object, $extraData = [])
 
     public static function search($rawParams = [])
     {
-        $pagination = static::pagination($rawParams);
+        [$query, $params] = static::searchQueryAndParams($rawParams);
 
-        $params = [
-            'limit' => $pagination['limit'],
-            'page' => $pagination['page'],
-        ];
-
-        $query = static::limit($params['limit'])->offset($pagination['offset']);
         $searchByUser = present($rawParams['user'] ?? null);
         $isModerator = $rawParams['is_moderator'] ?? false;
 

diff --git a/app/Models/Model.php b/app/Models/Model.php
@@ -35,15 +35,17 @@ public static function booted()
         static::addGlobalScope(new MacroableModelScope());
     }
 
-    public static function pagination($params)
+    protected static function searchQueryAndParams(array $params)
     {
         $limit = clamp(get_int($params['limit'] ?? null) ?? static::PER_PAGE, 5, 50);
         $page = max(get_int($params['page'] ?? null), 1);
 
         $offset = max_offset($page, $limit);
         $page = 1 + $offset / $limit;
 
-        return compact('limit', 'page', 'offset');
+        $query = static::limit($limit)->offset($offset);
+
+        return [$query, compact('limit', 'page')];
     }
 
     public function getForeignKey()