small updates

Author: Kyle-Shanks

packages/common/src/api/tan-query/comments.ts

@@ -941,7 +941,7 @@ export const useReportComment = () => {
               replies: prevData.replies?.filter(
                 (reply: ReplyComment) => reply.id !== commentId
               ),
-              replyCount: prevData.replyCount - 1
+              replyCount: prevData.replyCount ? prevData.replyCount - 1 : 0
             } as Comment
           }
         )
@@ -1047,7 +1047,7 @@ export const useMuteUser = () => {
                   // Subtract how many replies were removed from total reply count
                   // NOTE: remember that not all replies by the user may be showing due to pagination
                   rootComment.replyCount =
-                    rootComment.replyCount -
+                    (rootComment.replyCount ?? 0) -
                     (prevReplyCount - rootComment.replies.length)
                 }
 

packages/discovery-provider/src/api/v1/users.py

@@ -64,7 +64,7 @@
     track_activity_full_model,
     track_activity_model,
 )
-from src.api.v1.models.comments import base_comment_model
+from src.api.v1.models.comments import comment_mention, reply_comment_model
 from src.api.v1.models.common import favorite
 from src.api.v1.models.developer_apps import authorized_app, developer_app
 from src.api.v1.models.extensions.fields import NestedOneOf
@@ -3196,8 +3196,31 @@ def get(self, receiving_user_id, grantor_user_id):
 
 
 # Comments
+user_comment_model = ns.model(
+    "comment",
+    {
+        "id": fields.String(required=True),
+        "user_id": fields.String(required=False),
+        "message": fields.String(required=True),
+        "mentions": fields.List(
+            fields.Nested(comment_mention),
+            required=False,
+        ),
+        "track_timestamp_s": fields.Integer(required=False),
+        "react_count": fields.Integer(required=True),
+        "is_edited": fields.Boolean(required=True),
+        "is_current_user_reacted": fields.Boolean(required=False),
+        "is_artist_reacted": fields.Boolean(required=False),
+        "is_tombstone": fields.Boolean(required=False),
+        "is_muted": fields.Boolean(required=False),
+        "created_at": fields.String(required=True),
+        "updated_at": fields.String(required=False),
+        "reply_count": fields.Integer(required=False),
+        "replies": fields.List(fields.Nested(reply_comment_model), require=False),
+    },
+)
 user_comments_response = make_response(
-    "user_comments_response", ns, fields.List(fields.Nested(base_comment_model))
+    "user_comments_response", ns, fields.List(fields.Nested(user_comment_model))
 )
 
 
@@ -3220,6 +3243,12 @@ class UserComments(Resource):
     def get(self, id):
         args = pagination_with_current_user_parser.parse_args()
         decoded_id = decode_with_abort(id, ns)
-        current_user_id = args.get("user_id")
-        user_comments = get_user_comments(args, decoded_id, current_user_id)
+        current_user_id = get_current_user_id(args)
+        args = {
+            **args,
+            "target_user_id": decoded_id,
+            "current_user_id": current_user_id,
+        }
+        user_comments = get_user_comments(args)
+
         return success_response(user_comments)

packages/discovery-provider/src/queries/get_comments.py

@@ -1,4 +1,5 @@
-import logging  # pylint: disable=C0302
+import logging
+from typing import TypedDict
 
 from sqlalchemy import and_, asc, desc, func, or_
 from sqlalchemy.orm import aliased
@@ -397,11 +398,22 @@ def filter_mentions(mention):
         return track_comment_res
 
 
-def get_user_comments(args, user_id, current_user_id):
+class GetUserCommentsArgs(TypedDict):
+    sort_method: str
+    offset: int
+    limit: int
+    target_user_id: int
+    current_user_id: int
+
+
+def get_user_comments(args: GetUserCommentsArgs):
     offset, limit = format_offset(args), format_limit(
         args, default_limit=COMMENT_ROOT_DEFAULT_LIMIT
     )
 
+    user_id = args["target_user_id"]
+    current_user_id = args["current_user_id"]
+
     user_comments = []
     db = get_db_read_replica()
 
@@ -444,11 +456,6 @@ def get_user_comments(args, user_id, current_user_id):
                         mentioned_users.c.is_delete,
                     )
                 ).label("mentions"),
-                Track.owner_id.label("artist_id"),
-            )
-            .outerjoin(
-                Track,
-                Comment.entity_id == Track.track_id,
             )
             .outerjoin(
                 mentioned_users,
@@ -467,7 +474,6 @@ def get_user_comments(args, user_id, current_user_id):
                 Comment.comment_id,
                 react_count_subquery.c.react_count,
                 CommentNotificationSetting.is_muted,
-                Track.owner_id,
             )
             .filter(
                 Comment.user_id == user_id,
@@ -481,14 +487,7 @@ def get_user_comments(args, user_id, current_user_id):
         ).all()
 
         user_comments_res = []
-        for [user_comment, react_count, is_muted, mentions, artist_id] in user_comments:
-            replies = get_replies(
-                session,
-                user_comment.comment_id,
-                current_user_id,
-                artist_id,
-                limit=None,
-            )
+        for [user_comment, react_count, is_muted, mentions] in user_comments:
 
             def remove_delete(mention):
                 del mention["is_delete"]
@@ -499,7 +498,6 @@ def filter_mentions(mention):
                     mention["user_id"] is not None and mention["is_delete"] is not True
                 )
 
-            reply_count = len(replies)
             user_comments_res.append(
                 {
                     "id": encode_int_id(user_comment.comment_id),
@@ -518,11 +516,9 @@ def filter_mentions(mention):
                     "is_edited": user_comment.is_edited,
                     "track_timestamp_s": user_comment.track_timestamp_s,
                     "react_count": react_count,
-                    "reply_count": reply_count,
                     "is_current_user_reacted": get_is_reacted(
                         session, current_user_id, user_comment.comment_id
                     ),
-                    "replies": replies[:3],
                     "created_at": str(user_comment.created_at),
                     "updated_at": str(user_comment.updated_at),
                     "is_muted": is_muted if is_muted is not None else False,

packages/sdk/src/sdk/api/generated/default/models/Comment.ts

@@ -69,12 +69,6 @@ export interface Comment {
      * @memberof Comment
      */
     reactCount: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof Comment
-     */
-    replyCount: number;
     /**
      * 
      * @type {boolean}
@@ -117,6 +111,12 @@ export interface Comment {
      * @memberof Comment
      */
     updatedAt?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof Comment
+     */
+    replyCount?: number;
     /**
      * 
      * @type {Array<ReplyComment>}
@@ -133,7 +133,6 @@ export function instanceOfComment(value: object): value is Comment {
     isInstance = isInstance && "id" in value && value["id"] !== undefined;
     isInstance = isInstance && "message" in value && value["message"] !== undefined;
     isInstance = isInstance && "reactCount" in value && value["reactCount"] !== undefined;
-    isInstance = isInstance && "replyCount" in value && value["replyCount"] !== undefined;
     isInstance = isInstance && "isEdited" in value && value["isEdited"] !== undefined;
     isInstance = isInstance && "createdAt" in value && value["createdAt"] !== undefined;
 
@@ -156,14 +155,14 @@ export function CommentFromJSONTyped(json: any, ignoreDiscriminator: boolean): C
         'mentions': !exists(json, 'mentions') ? undefined : ((json['mentions'] as Array<any>).map(CommentMentionFromJSON)),
         'trackTimestampS': !exists(json, 'track_timestamp_s') ? undefined : json['track_timestamp_s'],
         'reactCount': json['react_count'],
-        'replyCount': json['reply_count'],
         'isEdited': json['is_edited'],
         'isCurrentUserReacted': !exists(json, 'is_current_user_reacted') ? undefined : json['is_current_user_reacted'],
         'isArtistReacted': !exists(json, 'is_artist_reacted') ? undefined : json['is_artist_reacted'],
         'isTombstone': !exists(json, 'is_tombstone') ? undefined : json['is_tombstone'],
         'isMuted': !exists(json, 'is_muted') ? undefined : json['is_muted'],
         'createdAt': json['created_at'],
         'updatedAt': !exists(json, 'updated_at') ? undefined : json['updated_at'],
+        'replyCount': !exists(json, 'reply_count') ? undefined : json['reply_count'],
         'replies': !exists(json, 'replies') ? undefined : ((json['replies'] as Array<any>).map(ReplyCommentFromJSON)),
     };
 }
@@ -183,14 +182,14 @@ export function CommentToJSON(value?: Comment | null): any {
         'mentions': value.mentions === undefined ? undefined : ((value.mentions as Array<any>).map(CommentMentionToJSON)),
         'track_timestamp_s': value.trackTimestampS,
         'react_count': value.reactCount,
-        'reply_count': value.replyCount,
         'is_edited': value.isEdited,
         'is_current_user_reacted': value.isCurrentUserReacted,
         'is_artist_reacted': value.isArtistReacted,
         'is_tombstone': value.isTombstone,
         'is_muted': value.isMuted,
         'created_at': value.createdAt,
         'updated_at': value.updatedAt,
+        'reply_count': value.replyCount,
         'replies': value.replies === undefined ? undefined : ((value.replies as Array<any>).map(ReplyCommentToJSON)),
     };
 }