Merge pull request #4150 from thematters/fix/delete-comment-cache

fix(comment): make sure finish cache invalidation before return
thematters · Aug 21, 2024 · e1f18ff · e1f18ff
2 parents f754fae + 5dc6159
commit e1f18ff
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/src/mutations/comment/deleteComment.ts b/src/mutations/comment/deleteComment.ts
@@ -1,7 +1,8 @@
-import type { GQLMutationResolvers, Comment } from 'definitions'
+import type { GQLMutationResolvers } from 'definitions'
+
+import { invalidateFQC } from '@matters/apollo-response-cache'
 
 import {
- CACHE_KEYWORD,
  COMMENT_STATE,
  COMMENT_TYPE,
  NODE_TYPES,
@@ -18,7 +19,7 @@ import { fromGlobalId } from 'common/utils'
 const resolver: GQLMutationResolvers['deleteComment'] = async (
  _,
  { input: { id } },
- { viewer, dataSources: { atomService, notificationService } }
+ { viewer, dataSources: { atomService, notificationService, connections } }
 ) => {
  if (!viewer.id) {
  throw new AuthenticationError('visitor has no permission')
@@ -57,12 +58,8 @@ const resolver: GQLMutationResolvers['deleteComment'] = async (
  notificationService.withdraw(`put-comment:${dbId}`)
 
  // invalidate extra nodes
- ;(
- newComment as Comment & {
- [CACHE_KEYWORD]: [{ id: string; type: NODE_TYPES }]
- }
- )[CACHE_KEYWORD] = [
- {
+ await invalidateFQC({
+ node: {
  id: comment.targetId,
  type:
  comment.type === COMMENT_TYPE.article
@@ -71,7 +68,8 @@ const resolver: GQLMutationResolvers['deleteComment'] = async (
  ? NODE_TYPES.Moment
  : NODE_TYPES.Circle,
  },
- ]
+ redis: connections.redis,
+ })
 
  return newComment
 }

diff --git a/src/mutations/comment/putComment.ts b/src/mutations/comment/putComment.ts
@@ -8,6 +8,7 @@ import type {
  Moment,
 } from 'definitions'
 
+import { invalidateFQC } from '@matters/apollo-response-cache'
 import { stripHtml } from '@matters/ipns-site-generator'
 import {
  normalizeCommentHTML,
@@ -20,7 +21,6 @@ import {
  ARTICLE_ACCESS_TYPE,
  ARTICLE_STATE,
  BUNDLED_NOTICE_TYPE,
- CACHE_KEYWORD,
  COMMENT_TYPE,
  COMMENT_STATE,
  NOTICE_TYPE,
@@ -67,6 +67,7 @@ const resolver: GQLMutationResolvers['putComment'] = async (
  articleService,
  notificationService,
  userService,
+ connections,
  },
  }
 ) => {
@@ -583,14 +584,34 @@ const resolver: GQLMutationResolvers['putComment'] = async (
  })
 
  // invalidate extra nodes
- ;(newComment as Comment & { [CACHE_KEYWORD]: any })[CACHE_KEYWORD] = [
- parentComment ? { id: parentComment.id, type: NODE_TYPES.Comment } : {},
- replyToComment ? { id: replyToComment.id, type: NODE_TYPES.Comment } : {},
- {
- id: article ? article.id : circle?.id,
- type: article ? NODE_TYPES.Article : NODE_TYPES.Circle,
- },
- ]
+ if (parentComment) {
+ await invalidateFQC({
+ node: { id: parentComment.id, type: NODE_TYPES.Comment },
+ redis: connections.redis,
+ })
+ }
+ if (replyToComment) {
+ await invalidateFQC({
+ node: { id: replyToComment.id, type: NODE_TYPES.Comment },
+ redis: connections.redis,
+ })
+ }
+
+ const node = isArticleType
+ ? {
+ id: article?.id as string,
+ type: NODE_TYPES.Article,
+ }
+ : isMoment
+ ? {
+ id: moment?.id as string,
+ type: NODE_TYPES.Moment,
+ }
+ : {
+ id: circle?.id as string,
+ type: NODE_TYPES.Circle,
+ }
+ await invalidateFQC({ node, redis: connections.redis })
 
  return newComment
 }

diff --git a/src/mutations/comment/updateCommentsState.ts b/src/mutations/comment/updateCommentsState.ts
@@ -74,7 +74,7 @@ const resolver: GQLMutationResolvers['updateCommentsState'] = async (
  })
 
  if (comment.type === COMMENT_TYPE.article) {
- invalidateFQC({
+ await invalidateFQC({
  node: { type: NODE_TYPES.Article, id: comment.targetId },
  redis: connections.redis,
  })