[DVRL-10] Ensure history uses track activity model (#7678)

AudiusProject · Feb 22, 2024 · 21f5d8e · 21f5d8e
1 parent 3a8b27a
commit 21f5d8e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/packages/discovery-provider/src/api/v1/models/activities.py b/packages/discovery-provider/src/api/v1/models/activities.py
@@ -60,16 +60,28 @@ def format(self, value):
     },
 )
 
-library_track_activity_model_full = ns.clone(
+track_activity_model = ns.model(
+    "track_activity",
+    {
+        "timestamp": fields.String(allow_null=True),
+        "item_type": fields.FormattedString("track"),
+        "item": fields.Nested(track),
+    },
+)
+
+track_activity_model_full = ns.model(
     "track_activity_full",
-    activity_model_full,
-    {"item_type": fields.FormattedString("track"), "item": fields.Nested(track_full)},
+    {
+        "timestamp": fields.String(allow_null=True),
+        "item_type": fields.FormattedString("track"),
+        "item": fields.Nested(track_full),
+    },
 )
 
-library_collection_activity_model_full = ns.clone(
+collection_activity_model_full = ns.model(
     "collection_activity_full",
-    activity_model_full,
     {
+        "timestamp": fields.String(allow_null=True),
         "item_type": fields.FormattedString("playlist"),
         "item": fields.Nested(full_playlist_without_tracks_model),
     },

diff --git a/packages/discovery-provider/src/api/v1/users.py b/packages/discovery-provider/src/api/v1/users.py
@@ -50,8 +50,9 @@
 from src.api.v1.models.activities import (
     activity_model,
     activity_model_full,
-    library_collection_activity_model_full,
-    library_track_activity_model_full,
+    collection_activity_model_full,
+    track_activity_model,
+    track_activity_model_full,
 )
 from src.api.v1.models.common import favorite
 from src.api.v1.models.developer_apps import authorized_app, developer_app
@@ -764,13 +765,13 @@ def get(self, id):
 track_library_full_response = make_full_response(
     "track_library_response_full",
     full_ns,
-    fields.List(fields.Nested(library_track_activity_model_full)),
+    fields.List(fields.Nested(track_activity_model_full)),
 )
 
 collection_library_full_response = make_full_response(
     "collection_library_response_full",
     full_ns,
-    fields.List(fields.Nested(library_collection_activity_model_full)),
+    fields.List(fields.Nested(collection_activity_model_full)),
 )
 
 
@@ -990,11 +991,13 @@ def get(self, id):
         return success_response(favorites)
 
 
-history_response = make_full_response(
-    "history_response", ns, fields.List(fields.Nested(activity_model))
+history_response = make_response(
+    "history_response", ns, fields.List(fields.Nested(track_activity_model))
 )
 history_response_full = make_full_response(
-    "history_response_full", full_ns, fields.List(fields.Nested(activity_model_full))
+    "history_response_full",
+    full_ns,
+    fields.List(fields.Nested(track_activity_model_full)),
 )
 
 USER_HISTORY_TRACKS_ROUTE = "/<string:id>/history/tracks"

diff --git a/packages/libs/src/sdk/api/generated/full/models/HistoryResponseFull.ts b/packages/libs/src/sdk/api/generated/full/models/HistoryResponseFull.ts
@@ -14,12 +14,12 @@
  */
 
 import { exists, mapValues } from '../runtime';
-import type { ActivityFull } from './ActivityFull';
+import type { TrackActivityFull } from './TrackActivityFull';
 import {
-    ActivityFullFromJSON,
-    ActivityFullFromJSONTyped,
-    ActivityFullToJSON,
-} from './ActivityFull';
+    TrackActivityFullFromJSON,
+    TrackActivityFullFromJSONTyped,
+    TrackActivityFullToJSON,
+} from './TrackActivityFull';
 import type { VersionMetadata } from './VersionMetadata';
 import {
     VersionMetadataFromJSON,
@@ -77,10 +77,10 @@ export interface HistoryResponseFull {
     version: VersionMetadata;
     /**
      * 
-     * @type {Array<ActivityFull>}
+     * @type {Array<TrackActivityFull>}
      * @memberof HistoryResponseFull
      */
-    data?: Array<ActivityFull>;
+    data?: Array<TrackActivityFull>;
 }
 
 /**
@@ -116,7 +116,7 @@ export function HistoryResponseFullFromJSONTyped(json: any, ignoreDiscriminator:
         'signature': json['signature'],
         'timestamp': json['timestamp'],
         'version': VersionMetadataFromJSON(json['version']),
-        'data': !exists(json, 'data') ? undefined : ((json['data'] as Array<any>).map(ActivityFullFromJSON)),
+        'data': !exists(json, 'data') ? undefined : ((json['data'] as Array<any>).map(TrackActivityFullFromJSON)),
     };
 }
 
@@ -136,7 +136,7 @@ export function HistoryResponseFullToJSON(value?: HistoryResponseFull | null): a
         'signature': value.signature,
         'timestamp': value.timestamp,
         'version': VersionMetadataToJSON(value.version),
-        'data': value.data === undefined ? undefined : ((value.data as Array<any>).map(ActivityFullToJSON)),
+        'data': value.data === undefined ? undefined : ((value.data as Array<any>).map(TrackActivityFullToJSON)),
     };
 }