move main_ruleset to beatmapset level

Author: notbakaneko

app/Models/Beatmapset.php

@@ -1298,6 +1298,7 @@ public function defaultDiscussionJson()
                 'discussions.posts',
                 'discussions.votes',
                 'events',
+                'main_ruleset',
                 'nominations',
                 'related_users',
                 'related_users.groups',

app/Transformers/BeatmapsetCompactTransformer.php

@@ -33,6 +33,7 @@ class BeatmapsetCompactTransformer extends TransformerAbstract
         'has_favourited',
         'language',
         'pack_tags',
+        'main_ruleset',
         'nominations',
         'ratings',
         'recent_favourites',
@@ -182,6 +183,11 @@ public function includeLanguage(Beatmapset $beatmapset)
         return $this->item($beatmapset->language, new LanguageTransformer());
     }
 
+    public function includeMainRuleset(Beatmapset $beatmapset)
+    {
+        return $this->primitive($beatmapset->mainRuleset()?->legacyName());
+    }
+
     public function includeNominations(Beatmapset $beatmapset)
     {
         $result = [

app/Transformers/BeatmapsetTransformer.php

@@ -23,7 +23,6 @@ public function transform(Beatmapset $beatmapset)
         // only for showing in BeatmapPanel.
         $nominationsSummary = [
             'current' => $beatmapset->nominations,
-            'main_ruleset' => $beatmapset->mainRuleset()?->legacyName(),
             // TODO: this is a placeholder value for now.
             'required' => $beatmapset->playmodeCount() * $GLOBALS['cfg']['osu']['beatmapset']['required_nominations'], // $this->requiredNominationCount(),
         ];

resources/js/beatmap-discussions/nominator.tsx

@@ -129,8 +129,9 @@ export class Nominator extends React.Component<Props> {
   }
 
   private get calculatedMode() {
-    return this.beatmapset.nominations_summary.main_ruleset
-      // TODO: document
+    return this.beatmapset.main_ruleset
+      // The main ruleset not being set yet implies there are either no nominations
+      // or an equal number of nominations for each ruleset, so the next selection should make it the main ruleset.
       ?? (this.selectedModes.length === 1 ? this.selectedModes[0] : null);
   }
 
@@ -258,7 +259,7 @@ export class Nominator extends React.Component<Props> {
   }
 
   private renderModalContentHybrid() {
-    const currentMode = this.beatmapset.nominations_summary.main_ruleset ?? 'undefined';
+    const currentMode = this.calculatedMode ?? 'undefined';
 
     return (
       <>

resources/js/interfaces/beatmapset-extended-json.ts

@@ -3,11 +3,9 @@
 
 import BeatmapExtendedJson from './beatmap-extended-json';
 import BeatmapsetJson, { Availability } from './beatmapset-json';
-import GameMode from './game-mode';
 
 interface NominationsSummary {
   current: number;
-  main_ruleset: GameMode | null;
   required: number;
 }
 

resources/js/interfaces/beatmapset-json.ts

@@ -85,6 +85,7 @@ interface BeatmapsetJsonAvailableIncludes {
   genre: GenreJson;
   has_favourited: boolean;
   language: LanguageJson;
+  main_ruleset: GameMode | null;
   nominations: BeatmapsetNominationsInterface;
   ratings: number[];
   recent_favourites: UserJson[];

resources/js/interfaces/beatmapset-with-discussions-json.ts

@@ -4,7 +4,7 @@
 import { BeatmapsetDiscussionJsonForShow } from './beatmapset-discussion-json';
 import BeatmapsetExtendedJson from './beatmapset-extended-json';
 
-type DiscussionsRequiredAttributes = 'beatmaps' | 'current_user_attributes' | 'events' | 'nominations' | 'related_users';
+type DiscussionsRequiredAttributes = 'beatmaps' | 'current_user_attributes' | 'events' | 'main_ruleset' | 'nominations' | 'related_users';
 type BeatmapsetWithDiscussionsJson =
   Omit<BeatmapsetExtendedJson, keyof OverrideIncludes>
   & OverrideIncludes