Use type augmentation in Next frontend

Author: gregorbg

app/controllers/api/v0/results/rankings_controller.rb

@@ -126,10 +126,14 @@ def index
 
     # TODO: move this to rankings-page-api when migration to next is done so this can be properly precompute
     rankings = Rails.cache.fetch ["rankings-page-api-next", *cache_params, record_timestamp] do
-      DbHelper.execute_cached_query(cache_params, record_timestamp, query)
-    end
+      rows = DbHelper.execute_cached_query(cache_params, record_timestamp, query)
 
-    rankings = rankings.to_a
+      # As of writing this comment, we are maintaining two frontends.
+      #   Augmenting the attempts manually (instead of clever joining)
+      #   is the most reasonable compromise for backwards-compatibility.
+      # Feel free to improve this once the React-Rails frontend is dead.
+      Result.augment_attempts(rows.as_json)
+    end
 
     render json: {
       rankings: rankings,

app/controllers/api/v0/results/records_controller.rb

@@ -50,12 +50,17 @@ def index
     # TODO: move this to records-page-api when migration to next is done so this can be properly precompute
 
     records = Rails.cache.fetch ["records-page-api-next", *cache_params, record_timestamp] do
-      DbHelper.execute_cached_query(cache_params, record_timestamp, query)
+      rows = DbHelper.execute_cached_query(cache_params, record_timestamp, query)
+
+      # As of writing this comment, we are maintaining two frontends.
+      #   Augmenting the attempts manually (instead of clever joining)
+      #   is the most reasonable compromise for backwards-compatibility.
+      # Feel free to improve this once the React-Rails frontend is dead.
+      Result.augment_attempts(rows.as_json)
     end
-    records = records.to_a
 
     render json: {
-      records: records.group_by { |r| r["event_id"] },
+      records: records.group_by { it["event_id"] },
       timestamp: record_timestamp,
     }
   end

next-frontend/openapi/schemas/results/ExtendedResult.yaml

@@ -13,11 +13,7 @@ required:
   - round_type_id
   - round_id
   - format_id
-  - value1
-  - value2
-  - value3
-  - value4
-  - value5
+  - attempts
   - best
   - average
   - regional_single_record
@@ -64,21 +60,11 @@ properties:
   format_id:
     type: string
     example: "a"
-  value1:
-    type: integer
-    example: 126
-  value2:
-    type: integer
-    example: 84
-  value3:
-    type: integer
-    example: 91
-  value4:
-    type: integer
-    example: 89
-  value5:
-    type: integer
-    example: 85
+  attempts:
+    type: array
+    items:
+      type: integer
+      example: 566
   best:
     type: integer
     example: 84

next-frontend/openapi/schemas/results/Record.yaml

@@ -13,11 +13,7 @@ required:
   - round_type_id
   - round_id
   - format_id
-  - value1
-  - value2
-  - value3
-  - value4
-  - value5
+  - attempts
   - best
   - average
   - regional_single_record
@@ -64,21 +60,11 @@ properties:
   format_id:
     type: string
     example: "a"
-  value1:
-    type: integer
-    example: 126
-  value2:
-    type: integer
-    example: 84
-  value3:
-    type: integer
-    example: 91
-  value4:
-    type: integer
-    example: 89
-  value5:
-    type: integer
-    example: 85
+  attempts:
+    type: array
+    items:
+      type: integer
+      example: 566
   best:
     type: integer
     example: 84

next-frontend/src/lib/wca/results/attempts.ts

@@ -33,11 +33,5 @@ export function recordAttempts(
     | components["schemas"]["Record"]
     | components["schemas"]["ExtendedResult"],
 ) {
-  return cleanAttempts([
-    record.value1,
-    record.value2,
-    record.value3,
-    record.value4,
-    record.value5,
-  ]);
+  return cleanAttempts(record.attempts);
 }

next-frontend/src/types/openapi.ts

@@ -1299,16 +1299,7 @@ export interface components {
             round_id: string | null;
             /** @example a */
             format_id: string;
-            /** @example 126 */
-            value1: number;
-            /** @example 84 */
-            value2: number;
-            /** @example 91 */
-            value3: number;
-            /** @example 89 */
-            value4: number;
-            /** @example 85 */
-            value5: number;
+            attempts: number[];
             /** @example 84 */
             best: number;
             /** @example 88 */
@@ -1382,16 +1373,7 @@ export interface components {
             round_id: string | null;
             /** @example a */
             format_id: string;
-            /** @example 126 */
-            value1: number;
-            /** @example 84 */
-            value2: number;
-            /** @example 91 */
-            value3: number;
-            /** @example 89 */
-            value4: number;
-            /** @example 85 */
-            value5: number;
+            attempts: number[];
             /** @example 84 */
             best: number;
             /** @example 88 */