Fix result ordering

Author: Ategon

contracts/api-registry.json

@@ -368,6 +368,14 @@
             "minimum": 1,
             "maximum": 50
           }
+        },
+        {
+          "name": "cursor",
+          "in": "query",
+          "schema": {
+            "type": "string",
+            "format": "date-time"
+          }
         }
       ],
       "auth": {
@@ -509,17 +517,45 @@
       "summary": "Return jam results",
       "parameters": [
         {
-          "name": "jamSlug",
+          "name": "jam",
           "in": "query",
           "schema": {
             "type": "string"
           }
         },
         {
-          "name": "jamId",
+          "name": "category",
           "in": "query",
           "schema": {
-            "type": "integer"
+            "type": "string"
+          }
+        },
+        {
+          "name": "contentType",
+          "in": "query",
+          "schema": {
+            "type": "string"
+          }
+        },
+        {
+          "name": "sort",
+          "in": "query",
+          "schema": {
+            "type": "string"
+          }
+        },
+        {
+          "name": "preview",
+          "in": "query",
+          "schema": {
+            "type": "string"
+          }
+        },
+        {
+          "name": "recap",
+          "in": "query",
+          "schema": {
+            "type": "string"
           }
         }
       ],
@@ -2161,6 +2197,20 @@
       "path": "/radio",
       "tag": "Music",
       "summary": "Return synchronized music radio state",
+      "parameters": [
+        {
+          "name": "station",
+          "in": "query",
+          "schema": {
+            "type": "string",
+            "enum": [
+              "all",
+              "safe"
+            ],
+            "default": "all"
+          }
+        }
+      ],
       "auth": {
         "required": false,
         "optional": true,
@@ -2180,6 +2230,10 @@
       "tag": "Music",
       "summary": "Vote for the next music radio track",
       "requestBody": true,
+      "requestExample": {
+        "trackId": 123,
+        "station": "all"
+      },
       "auth": {
         "required": true,
         "optional": false,
@@ -2196,13 +2250,43 @@
         "header": "Idempotency-Key"
       }
     },
+    {
+      "sdkName": "reportRadioTrackDuration",
+      "method": "POST",
+      "path": "/radio/duration",
+      "tag": "Music",
+      "summary": "Report the actual audio duration for the current radio track",
+      "requestBody": true,
+      "requestExample": {
+        "trackId": 123,
+        "durationSeconds": 142.5,
+        "station": "all"
+      },
+      "auth": {
+        "required": false,
+        "optional": false,
+        "kind": "none",
+        "label": "Public"
+      },
+      "visibility": "public",
+      "rateLimit": {
+        "documented": true,
+        "headers": true
+      }
+    },
     {
       "sdkName": "sendRadioEmote",
       "method": "POST",
       "path": "/radio/emote",
       "tag": "Music",
       "summary": "Send an ephemeral music radio emote",
       "requestBody": true,
+      "requestExample": {
+        "emote": "jam",
+        "station": "all",
+        "x": 0.8,
+        "y": 0.9
+      },
       "auth": {
         "required": true,
         "optional": false,
@@ -2225,6 +2309,20 @@
       "path": "/radio/events",
       "tag": "Music",
       "summary": "Subscribe to music radio server-sent events",
+      "parameters": [
+        {
+          "name": "station",
+          "in": "query",
+          "schema": {
+            "type": "string",
+            "enum": [
+              "all",
+              "safe"
+            ],
+            "default": "all"
+          }
+        }
+      ],
       "auth": {
         "required": false,
         "optional": true,

features/games/scoring.service.ts

@@ -40,6 +40,56 @@ function ratingBelongsToScoreVersion(rating: RatingCategoryRef, version: PageVer
   return ratingVersion === version;
 }
 
+function categoryScore(
+  game: { id: number; categoryAverages: CategoryAverage[] },
+  categoryId: number,
+  categoryName?: string,
+) {
+  const categoryAverage = game.categoryAverages.find((avg) =>
+    categoryId >= 0
+      ? avg.categoryId === categoryId
+      : avg.categoryName === categoryName,
+  );
+  return categoryAverage?.averageScore ?? 0;
+}
+
+function categoryRatingCount(
+  game: { id: number; categoryAverages: CategoryAverage[] },
+  categoryId: number,
+  categoryName?: string,
+) {
+  const categoryAverage = game.categoryAverages.find((avg) =>
+    categoryId >= 0
+      ? avg.categoryId === categoryId
+      : avg.categoryName === categoryName,
+  );
+  return categoryAverage?.ratingCount ?? 0;
+}
+
+function compareGamesByRawCategoryScore(
+  a: { id: number; categoryAverages: CategoryAverage[] },
+  b: { id: number; categoryAverages: CategoryAverage[] },
+  categoryId: number,
+  categoryName?: string,
+) {
+  const scoreDiff =
+    categoryScore(b, categoryId, categoryName) -
+    categoryScore(a, categoryId, categoryName);
+  if (scoreDiff !== 0) return scoreDiff;
+
+  const countDiff =
+    categoryRatingCount(b, categoryId, categoryName) -
+    categoryRatingCount(a, categoryId, categoryName);
+  if (countDiff !== 0) return countDiff;
+
+  const overallDiff =
+    categoryScore(b, -1, OVERALL_RATING_CATEGORY_NAME) -
+    categoryScore(a, -1, OVERALL_RATING_CATEGORY_NAME);
+  if (overallDiff !== 0) return overallDiff;
+
+  return a.id - b.id;
+}
+
 export async function buildVersionScores({
   game,
   version,
@@ -276,19 +326,18 @@ export async function buildVersionScores({
     rankedGames.forEach((entry) => {
       entry.categoryAverages.forEach((category: CategoryAverage) => {
         const rankedGamesInCategory = rankedGames
-          .map((candidate) => {
-            const categoryAvg = candidate.categoryAverages.find(
-              (cat: CategoryAverage) => cat.categoryId === category.categoryId,
-            );
-            return {
-              gameId: candidate.id,
-              score: categoryAvg ? categoryAvg.averageScore : 0,
-            };
-          })
-          .sort((a, b) => b.score - a.score);
+          .slice()
+          .sort((a, b) =>
+            compareGamesByRawCategoryScore(
+              a,
+              b,
+              category.categoryId,
+              category.categoryName,
+            ),
+          );
 
         const gamePlacement = rankedGamesInCategory.findIndex(
-          (rankedGame) => rankedGame.gameId === entry.id,
+          (rankedGame) => rankedGame.id === entry.id,
         );
 
         category.placement = gamePlacement + 1;