Fix double reaction bug (#13329)

Indexing was getting stalled from the previous fix because the primary
key would already exist.

This change reverts #13282 and fixes it a different way by moving the
check for existing deleted comments to the validation logic, and adding
the code to handle that case in the reaction creation logic.

Also adds commands for `audius-cmd` and tested locally.

**NOTE**: Re-liking a comment will _not_ trigger a new notification.
Made a call that we probably don't want to spam notifs every time it
toggles.

Author: rickyrombo

packages/commands/src/comments/create-comment.ts

@@ -0,0 +1,61 @@
+import chalk from 'chalk'
+import { Command } from '@commander-js/extra-typings'
+
+import { getCurrentUserId, initializeAudiusSdk } from '../utils.js'
+import { decodeHashId, EntityType } from '@audius/sdk'
+import { outputFormatOption } from '../common-options.js'
+
+export const createCommentCommand = new Command('create')
+  .description('Create a new comment')
+  .argument('<entityId>', 'The ID of the entity to comment on', (value) => {
+    return decodeHashId(value)!
+  })
+  .argument('[comment]', 'The content of the comment', 'This is a comment')
+  .option(
+    '-t, --entity-type <entityType>',
+    'The type of entity to comment on',
+    (value) => value as EntityType,
+    EntityType.TRACK
+  )
+  .option(
+    '-p, --parent-comment-id <parentCommentId>',
+    'The ID of the parent comment',
+    (value) => {
+      return decodeHashId(value)!
+    }
+  )
+  .option(
+    '-m, --mentions <mentions...>',
+    'List of user IDs to mention',
+    (values) => {
+      return values.split(',').map((value) => decodeHashId(value)!)
+    }
+  )
+  .option('-f, --from <from>', 'The account to create the comment from')
+  .addOption(outputFormatOption)
+  .action(
+    async (
+      entityId,
+      comment,
+      { from, entityType, parentCommentId, mentions }
+    ) => {
+      const audiusSdk = await initializeAudiusSdk({ handle: from })
+      const userId = await getCurrentUserId()
+
+      const commentId = await audiusSdk.comments.postComment({
+        userId: decodeHashId(userId)!,
+        entityId,
+        entityType,
+        body: comment,
+        parentCommentId,
+        mentions
+      })
+      console.log(chalk.green('Success!'))
+      console.log(chalk.yellow.bold(`Comment ID:  `), commentId)
+      console.log(
+        chalk.yellow.bold(`Comment ID #:   `),
+        decodeHashId(commentId!)
+      )
+      console.log(chalk.yellow.bold(`Comment Body:   `), comment)
+    }
+  )

packages/commands/src/comments/index.ts

@@ -0,0 +1,8 @@
+import { Command } from '@commander-js/extra-typings'
+import { createCommentCommand } from './create-comment'
+import { reactCommentCommand } from './react-comment'
+
+export const commentCommand = new Command('comment')
+  .description('Commands for creating and managing comments')
+  .addCommand(createCommentCommand)
+  .addCommand(reactCommentCommand)

packages/commands/src/comments/react-comment.ts

@@ -0,0 +1,39 @@
+import chalk from 'chalk'
+import { Command } from '@commander-js/extra-typings'
+
+import {
+  getCurrentUserId,
+  initializeAudiusSdk,
+  parseBoolean
+} from '../utils.js'
+import { decodeHashId } from '@audius/sdk'
+import { outputFormatOption } from '../common-options.js'
+
+export const reactCommentCommand = new Command('react')
+  .description('React to a comment')
+  .argument('<commentId>', 'The ID of the comment to react to', (value) => {
+    return decodeHashId(value)!
+  })
+  .argument('entityId', 'The ID of the entity to comment on', (value) => {
+    return decodeHashId(value)!
+  })
+  .argument(
+    '[isLiked]',
+    'Whether to like (true) or dislike (false) the comment',
+    parseBoolean,
+    true
+  )
+  .option('-f, --from <from>', 'The account to create the comment from')
+  .addOption(outputFormatOption)
+  .action(async (commentId, entityId, isLiked, { from }) => {
+    const audiusSdk = await initializeAudiusSdk({ handle: from })
+    const userId = await getCurrentUserId()
+    await audiusSdk.comments.reactComment({
+      userId: decodeHashId(userId)!,
+      commentId,
+      isLiked,
+      trackId: entityId
+    })
+    console.log(chalk.green('Success!'))
+    console.log(chalk.yellow.bold(`Comment Liked:  `), isLiked)
+  })

packages/commands/src/index.ts

@@ -21,6 +21,7 @@ import { userCommand } from './user/index.js'
 import { albumCommand } from './album/index.js'
 import { entropyCommand } from './misc/entropy.js'
 import { aaoCommand } from './misc/aao.js'
+import { commentCommand } from './comments/index.js'
 
 async function main() {
   program.name('audius-cmd')
@@ -31,6 +32,7 @@ async function main() {
   program.addCommand(trackCommand)
   program.addCommand(playlistCommand)
   program.addCommand(albumCommand)
+  program.addCommand(commentCommand)
   program.addCommand(managerCommand)
   program.addCommand(authHeadersCommand)
   program.addCommand(claimRewardCommand)

packages/discovery-provider/src/tasks/entity_manager/entities/comment.py

@@ -533,6 +533,9 @@ def validate_comment_reaction_tx(params: ManageEntityParameters):
         params.action == Action.REACT
         and (user_id, comment_id)
         in params.existing_records[EntityType.COMMENT_REACTION.value]
+        and not params.existing_records[EntityType.COMMENT_REACTION.value][
+            (user_id, comment_id)
+        ].is_delete
     ):
         raise IndexingValidationError(
             f"User {user_id} already reacted to comment {comment_id}"
@@ -555,6 +558,25 @@ def react_comment(params: ManageEntityParameters):
     entity_id = metadata.get("entity_id")
     entity_type = metadata.get("entity_type", EntityType.TRACK.value)
 
+    existing_reaction = params.existing_records[EntityType.COMMENT_REACTION.value].get(
+        (user_id, comment_id)
+    )
+    if existing_reaction and existing_reaction.is_delete:
+        reactivated_reaction = copy_record(
+            existing_reaction,
+            params.block_number,
+            params.event_blockhash,
+            params.txhash,
+            params.block_datetime,
+        )
+        reactivated_reaction.is_delete = False
+        params.add_record(
+            (user_id, comment_id),
+            reactivated_reaction,
+            EntityType.COMMENT_REACTION,
+        )
+        return
+
     comment_reaction_record = CommentReaction(
         comment_id=comment_id,
         user_id=user_id,

packages/discovery-provider/src/tasks/entity_manager/entity_manager.py

@@ -1394,7 +1394,7 @@ def fetch_existing_entities(session: Session, entities_to_fetch: EntitiesToFetch
                 CommentReaction,
                 literal_column(f"row_to_json({CommentReaction.__tablename__})"),
             )
-            .filter(or_(*or_queries), CommentReaction.is_delete == False)
+            .filter(or_(*or_queries))
             .all()
         )
         existing_entities[EntityType.COMMENT_REACTION] = {
@@ -1441,7 +1441,7 @@ def fetch_existing_entities(session: Session, entities_to_fetch: EntitiesToFetch
                 CommentMention,
                 literal_column(f"row_to_json({CommentMention.__tablename__})"),
             )
-            .filter(or_(*or_queries), CommentMention.is_delete == False)
+            .filter(or_(*or_queries))
             .all()
         )
 
@@ -1473,7 +1473,7 @@ def fetch_existing_entities(session: Session, entities_to_fetch: EntitiesToFetch
                 MutedUser,
                 literal_column(f"row_to_json({MutedUser.__tablename__})"),
             )
-            .filter(or_(*or_queries), MutedUser.is_delete == False)
+            .filter(or_(*or_queries))
             .all()
         )
         existing_entities[EntityType.MUTED_USER] = {
@@ -1506,7 +1506,7 @@ def fetch_existing_entities(session: Session, entities_to_fetch: EntitiesToFetch
                 CommentReport,
                 literal_column(f"row_to_json({CommentReport.__tablename__})"),
             )
-            .filter(or_(*or_queries), CommentReport.is_delete == False)
+            .filter(or_(*or_queries))
             .all()
         )
         existing_entities[EntityType.COMMENT_REPORT] = {