chore(rethinkdb): Comment: Phase 3

codegen.json

@@ -84,7 +84,7 @@
           "AzureDevOpsRemoteProject": "./types/AzureDevOpsRemoteProject#AzureDevOpsRemoteProjectSource",
           "AzureDevOpsWorkItem": "../../dataloader/azureDevOpsLoaders#AzureDevOpsWorkItem",
           "BatchArchiveTasksSuccess": "./types/BatchArchiveTasksSuccess#BatchArchiveTasksSuccessSource",
-          "Comment": "../../database/types/Comment#default as CommentDB",
+          "Comment": "../../postgres/types/index#Comment as CommentDB",
           "Company": "./types/Company#CompanySource",
           "CreateGcalEventInput": "./types/CreateGcalEventInput#default",
           "CreateImposterTokenPayload": "./types/CreateImposterTokenPayload#CreateImposterTokenPayloadSource",

packages/embedder/indexing/retrospectiveDiscussionTopic.ts

@@ -1,7 +1,7 @@
-import Comment from 'parabol-server/database/types/Comment'
 import {isMeetingRetrospective} from 'parabol-server/database/types/MeetingRetrospective'
 import {DataLoaderInstance} from 'parabol-server/dataloader/RootDataLoader'
 import prettier from 'prettier'
+import {Comment} from '../../server/postgres/types'
 import {inferLanguage} from '../inferLanguage'
 import {ISO6391} from '../iso6393To1'
 
@@ -154,7 +154,7 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
       }) as Comment[]
 
     const filteredComments = sortedComments.filter(
-      (c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy)
+      (c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy!)
     )
     if (filteredComments.length) {
       markdown += `Further discussion was made:\n`

packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts

@@ -1,7 +1,6 @@
 import {SubscriptionChannel} from '../../../client/types/constEnums'
 import makeAppURL from '../../../client/utils/makeAppURL'
 import appOrigin from '../../../server/appOrigin'
-import getRethink from '../../../server/database/rethinkDriver'
 import {DataLoaderInstance} from '../../../server/dataloader/RootDataLoader'
 import {isRetroMeeting} from '../../../server/graphql/meetingTypePredicates'
 import {
@@ -54,7 +53,6 @@ export const publishSimilarRetroTopics = async (
   similarEmbeddings: {embeddingsMetadataId: number; similarity: number}[],
   dataLoader: DataLoaderInstance
 ) => {
-  const r = await getRethink()
   const pg = getKysely()
   const links = await Promise.all(
     similarEmbeddings.map((se) => makeSimilarDiscussionLink(se, dataLoader))
@@ -69,7 +67,6 @@ export const publishSimilarRetroTopics = async (
     buildCommentContentBlock('🤖 Related Discussions', `<ul>${listItems}</ul>`),
     2
   )
-  await r.table('Comment').insert(relatedDiscussionsComment).run()
   await pg
     .insertInto('Comment')
     .values({

packages/server/database/rethinkDriver.ts

@@ -3,7 +3,6 @@ import TeamInvitation from '../database/types/TeamInvitation'
 import {AnyMeeting, AnyMeetingTeamMember} from '../postgres/types/Meeting'
 import getRethinkConfig from './getRethinkConfig'
 import {R} from './stricterR'
-import Comment from './types/Comment'
 import MassInvitation from './types/MassInvitation'
 import NotificationKickedOut from './types/NotificationKickedOut'
 import NotificationMeetingStageTimeLimitEnd from './types/NotificationMeetingStageTimeLimitEnd'
@@ -21,10 +20,6 @@ import RetrospectivePrompt from './types/RetrospectivePrompt'
 import Task from './types/Task'
 
 export type RethinkSchema = {
-  Comment: {
-    type: Comment
-    index: 'discussionId'
-  }
   ReflectPrompt: {
     type: RetrospectivePrompt
     index: 'teamId' | 'templateId'

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -207,8 +207,8 @@ export const slackNotificationsByTeamId = foreignKeyLoaderMaker(
   }
 )
 
-export const _pgcommentsByDiscussionId = foreignKeyLoaderMaker(
-  '_pgcomments',
+export const commentsByDiscussionId = foreignKeyLoaderMaker(
+  'comments',
   'discussionId',
   async (discussionIds) => {
     // include deleted comments so we can replace them with tombstones

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -107,6 +107,6 @@ export const slackNotifications = primaryKeyLoaderMaker((ids: readonly string[])
   return selectSlackNotifications().where('id', 'in', ids).execute()
 })
 
-export const _pgcomments = primaryKeyLoaderMaker((ids: readonly string[]) => {
+export const comments = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectComments().where('id', 'in', ids).execute()
 })

packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts

@@ -15,23 +15,6 @@ export const activeMeetingsByTeamId = new RethinkForeignKeyLoaderMaker(
       .run()
   }
 )
-
-export const commentsByDiscussionId = new RethinkForeignKeyLoaderMaker(
-  'comments',
-  'discussionId',
-  async (discussionIds) => {
-    const r = await getRethink()
-    return (
-      r
-        .table('Comment')
-        .getAll(r.args(discussionIds), {index: 'discussionId'})
-        // include deleted comments so we can replace them with tombstones
-        // .filter({isActive: true})
-        .run()
-    )
-  }
-)
-
 export const completedMeetingsByTeamId = new RethinkForeignKeyLoaderMaker(
   'newMeetings',
   'teamId',

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -3,7 +3,6 @@ import RethinkPrimaryKeyLoaderMaker from './RethinkPrimaryKeyLoaderMaker'
 /**
  * all rethink dataloader types which also must exist in {@link rethinkDriver/RethinkSchema}
  */
-export const comments = new RethinkPrimaryKeyLoaderMaker('Comment')
 export const reflectPrompts = new RethinkPrimaryKeyLoaderMaker('ReflectPrompt')
 export const massInvitations = new RethinkPrimaryKeyLoaderMaker('MassInvitation')
 export const meetingMembers = new RethinkPrimaryKeyLoaderMaker('MeetingMember')

packages/server/graphql/mutations/helpers/addAIGeneratedContentToThreads.ts

@@ -1,8 +1,10 @@
+import {Insertable} from 'kysely'
 import {PARABOL_AI_USER_ID} from '../../../../client/utils/constants'
-import getRethink from '../../../database/rethinkDriver'
-import Comment from '../../../database/types/Comment'
+import extractTextFromDraftString from '../../../../client/utils/draftjs/extractTextFromDraftString'
 import DiscussStage from '../../../database/types/DiscussStage'
+import generateUID from '../../../generateUID'
 import getKysely from '../../../postgres/getKysely'
+import {Comment} from '../../../postgres/pg'
 import {convertHtmlToTaskContent} from '../../../utils/draftjs/convertHtmlToTaskContent'
 import {DataLoaderWorker} from '../../graphql'
 
@@ -16,27 +18,25 @@ export const buildCommentContentBlock = (
   return convertHtmlToTaskContent(html)
 }
 
-export const createAIComment = (discussionId: string, content: string, order: number) =>
-  new Comment({
-    discussionId,
-    content,
-    threadSortOrder: order,
-    createdBy: PARABOL_AI_USER_ID
-  })
+export const createAIComment = (discussionId: string, content: string, order: number) => ({
+  id: generateUID(),
+  discussionId,
+  content,
+  plaintextContent: extractTextFromDraftString(content),
+  threadSortOrder: order,
+  createdBy: PARABOL_AI_USER_ID
+})
 
 const addAIGeneratedContentToThreads = async (
   stages: DiscussStage[],
   meetingId: string,
   dataLoader: DataLoaderWorker
 ) => {
-  const [r, groups] = await Promise.all([
-    getRethink(),
-    dataLoader.get('retroReflectionGroupsByMeetingId').load(meetingId)
-  ])
+  const groups = await dataLoader.get('retroReflectionGroupsByMeetingId').load(meetingId)
   const commentPromises = stages.map(async ({discussionId, reflectionGroupId}) => {
     const group = groups.find((group) => group.id === reflectionGroupId)
     if (!group?.discussionPromptQuestion) return
-    const comments: Comment[] = []
+    const comments: Insertable<Comment>[] = []
 
     if (group.discussionPromptQuestion) {
       const topicSummaryComment = createAIComment(
@@ -46,16 +46,7 @@ const addAIGeneratedContentToThreads = async (
       )
       comments.push(topicSummaryComment)
     }
-    const pgComments = comments.map((comment) => ({
-      id: comment.id,
-      content: comment.content,
-      plaintextContent: comment.plaintextContent,
-      createdBy: comment.createdBy,
-      threadSortOrder: comment.threadSortOrder,
-      discussionId: comment.discussionId
-    }))
-    await getKysely().insertInto('Comment').values(pgComments).execute()
-    return r.table('Comment').insert(comments).run()
+    await getKysely().insertInto('Comment').values(comments).execute()
   })
   await Promise.all(commentPromises)
 }

packages/server/graphql/mutations/helpers/calculateEngagement.ts

@@ -88,7 +88,7 @@ const calculateEngagement = async (meeting: Meeting, dataLoader: DataLoaderWorke
   ])
   const threadables = [...discussions.flat(), ...tasks.flat()]
   threadables.forEach(({createdBy}) => {
-    passiveMembers.delete(createdBy)
+    createdBy && passiveMembers.delete(createdBy)
   })
 
   discussions.forEach((comments) => {

packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts

@@ -257,7 +257,7 @@ const getSlackMessageForNotification = async (
       return null
     }
     const author = await dataLoader.get('users').loadNonNull(notification.authorId)
-    const comment = await dataLoader.get('comments').load(notification.commentId)
+    const comment = await dataLoader.get('comments').loadNonNull(notification.commentId)
 
     const authorName = comment.isAnonymous ? 'Anonymous' : author.preferredName
 

packages/server/graphql/mutations/resetRetroMeetingToGroupStage.ts

@@ -104,11 +104,6 @@ const resetRetroMeetingToGroupStage = {
     reflectionGroups.forEach((rg) => (rg.voterIds = []))
 
     await Promise.all([
-      r
-        .table('Comment')
-        .getAll(r.args(discussionIdsToDelete), {index: 'discussionId'})
-        .delete()
-        .run(),
       pg.deleteFrom('Comment').where('discussionId', 'in', discussionIdsToDelete).execute(),
       r.table('Task').getAll(r.args(discussionIdsToDelete), {index: 'discussionId'}).delete().run(),
       pg

packages/server/graphql/private/mutations/generateMeetingSummary.ts

@@ -45,16 +45,16 @@ const generateMeetingSummary: MutationResolvers['generateMeetingSummary'] = asyn
     if (!discussion) return null
     const {id: discussionId} = discussion
     const rawComments = await dataLoader.get('commentsByDiscussionId').load(discussionId)
-    const humanComments = rawComments.filter((c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy))
+    const humanComments = rawComments.filter((c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy!))
     const rootComments = humanComments.filter((c) => !c.threadParentId)
     rootComments.sort((a, b) => {
       return a.createdAt.getTime() < b.createdAt.getTime() ? -1 : 1
     })
     const comments = await Promise.all(
       rootComments.map(async (comment) => {
         const {createdBy, isAnonymous, plaintextContent} = comment
-        const creator = await dataLoader.get('users').loadNonNull(createdBy)
-        const commentAuthor = isAnonymous ? 'Anonymous' : creator.preferredName
+        const creator = createdBy ? await dataLoader.get('users').loadNonNull(createdBy) : null
+        const commentAuthor = isAnonymous || !creator ? 'Anonymous' : creator.preferredName
         const commentReplies = await Promise.all(
           humanComments
             .filter((c) => c.threadParentId === comment.id)
@@ -63,8 +63,10 @@ const generateMeetingSummary: MutationResolvers['generateMeetingSummary'] = asyn
             })
             .map(async (reply) => {
               const {createdBy, isAnonymous, plaintextContent} = reply
-              const creator = await dataLoader.get('users').loadNonNull(createdBy)
-              const replyAuthor = isAnonymous ? 'Anonymous' : creator.preferredName
+              const creator = createdBy
+                ? await dataLoader.get('users').loadNonNull(createdBy)
+                : null
+              const replyAuthor = isAnonymous || !creator ? 'Anonymous' : creator.preferredName
               return {
                 text: plaintextContent,
                 author: replyAuthor

packages/server/graphql/private/mutations/hardDeleteUser.ts

@@ -75,7 +75,7 @@ const hardDeleteUser: MutationResolvers['hardDeleteUser'] = async (
   const teamDiscussionIds = discussions.rows.map(({id}) => id)
 
   // soft delete first for side effects
-  const tombstoneId = await softDeleteUser(userIdToDelete, dataLoader)
+  await softDeleteUser(userIdToDelete, dataLoader)
 
   // all other writes
   await setFacilitatedUserIdOrDelete(userIdToDelete, teamIds, dataLoader)
@@ -103,15 +103,7 @@ const hardDeleteUser: MutationResolvers['hardDeleteUser'] = async (
       .table('TeamInvitation')
       .getAll(r.args(teamIds), {index: 'teamId'})
       .filter((row: RValue) => row('acceptedBy').eq(userIdToDelete))
-      .update({acceptedBy: ''}),
-    comment: r
-      .table('Comment')
-      .getAll(r.args(teamDiscussionIds), {index: 'discussionId'})
-      .filter((row: RValue) => row('createdBy').eq(userIdToDelete))
-      .update({
-        createdBy: tombstoneId,
-        isAnonymous: true
-      })
+      .update({acceptedBy: ''})
   }).run()
 
   // now postgres, after FKs are added then triggers should take care of children