Fix top_listeners restx schema (#7157)

AudiusProject · Jan 12, 2024 · 3d602d6 · 3d602d6
1 parent aab456d
commit 3d602d6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/packages/discovery-provider/integration_tests/queries/test_get_user_listening_history.py b/packages/discovery-provider/integration_tests/queries/test_get_user_listening_history.py
@@ -355,9 +355,9 @@ def test_track_top_listeners(app):
     with db.scoped_session() as session:
         top_listeners = _get_top_listeners_for_track(session, {"track_id": 2})
         assert len(top_listeners) == 2
-        assert top_listeners[0]["user"]["user_id"] == 2
+        assert top_listeners[0]["user"]["user_id"] == 1
         assert top_listeners[0]["count"] == 1
-        assert top_listeners[1]["user"]["user_id"] == 1
+        assert top_listeners[1]["user"]["user_id"] == 2
         assert top_listeners[1]["count"] == 1
 
         top_listeners = _get_top_listeners_for_track(session, {"track_id": 1})

diff --git a/packages/discovery-provider/src/api/v1/tracks.py b/packages/discovery-provider/src/api/v1/tracks.py
@@ -1004,14 +1004,18 @@ def get(self, track_id):
         return success_response(users)
 
 
-top_listener_response_full = full_ns.model(
+top_listener_item = full_ns.model(
     "full_top_listener",
     {
         "count": fields.Integer(required=True),
         "user": fields.Nested(user_model_full, required=True),
     },
 )
 
+top_listener_response_full = make_response(
+    "full_top_listener", full_ns, fields.List(fields.Nested(top_listener_item))
+)
+
 
 @full_ns.route("/<string:track_id>/top_listeners")
 class FullTrackTopListeners(Resource):

diff --git a/packages/discovery-provider/src/queries/get_top_listeners_for_track.py b/packages/discovery-provider/src/queries/get_top_listeners_for_track.py
@@ -46,7 +46,7 @@ def _get_top_listeners_for_track(session, args):
         select *
         from counted
         left join aggregate_user using (user_id)
-        order by play_count, follower_count, counted.user_id desc
+        order by play_count desc, follower_count desc, counted.user_id asc
         limit :limit
         offset :offset
         """

diff --git a/packages/libs/src/sdk/api/generated/full/models/FullTopListener.ts b/packages/libs/src/sdk/api/generated/full/models/FullTopListener.ts
@@ -14,13 +14,6 @@
  */
 
 import { exists, mapValues } from '../runtime';
-import type { UserFull } from './UserFull';
-import {
-    UserFullFromJSON,
-    UserFullFromJSONTyped,
-    UserFullToJSON,
-} from './UserFull';
-
 /**
  * 
  * @export
@@ -29,25 +22,17 @@ import {
 export interface FullTopListener {
     /**
      * 
-     * @type {number}
-     * @memberof FullTopListener
-     */
-    count: number;
-    /**
-     * 
-     * @type {UserFull}
+     * @type {Array<FullTopListener>}
      * @memberof FullTopListener
      */
-    user: UserFull;
+    data?: Array<FullTopListener>;
 }
 
 /**
  * Check if a given object implements the FullTopListener interface.
  */
 export function instanceOfFullTopListener(value: object): boolean {
     let isInstance = true;
-    isInstance = isInstance && "count" in value;
-    isInstance = isInstance && "user" in value;
 
     return isInstance;
 }
@@ -62,8 +47,7 @@ export function FullTopListenerFromJSONTyped(json: any, ignoreDiscriminator: boo
     }
     return {
 
-        'count': json['count'],
-        'user': UserFullFromJSON(json['user']),
+        'data': !exists(json, 'data') ? undefined : ((json['data'] as Array<any>).map(FullTopListenerFromJSON)),
     };
 }
 
@@ -76,8 +60,7 @@ export function FullTopListenerToJSON(value?: FullTopListener | null): any {
     }
     return {
 
-        'count': value.count,
-        'user': UserFullToJSON(value.user),
+        'data': value.data === undefined ? undefined : ((value.data as Array<any>).map(FullTopListenerToJSON)),
     };
 }