Merge branch 'chore/ReflectPrompt-phase1' into chore/ReflectPrompt-ph…

…ase2
ParabolInc · Sep 10, 2024 · d18a710 · d18a710
2 parents a38beb4 + 21fc97c
commit d18a710
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/server/database/types/RetrospectivePrompt.ts b/packages/server/database/types/RetrospectivePrompt.ts
@@ -8,7 +8,7 @@ interface Input {
   description: string
   groupColor: string
   removedAt: Date | null
-  parentPromptId?: string
+  parentPromptId?: string | null
 }
 
 export default class RetrospectivePrompt {
@@ -22,7 +22,7 @@ export default class RetrospectivePrompt {
   question: string
   removedAt: Date | null
   updatedAt = new Date()
-  parentPromptId?: string
+  parentPromptId?: string | null
 
   constructor(input: Input) {
     const {
@@ -43,6 +43,6 @@ export default class RetrospectivePrompt {
     this.description = description || ''
     this.groupColor = groupColor
     this.removedAt = removedAt
-    this.parentPromptId = parentPromptId
+    this.parentPromptId = parentPromptId || null
   }
 }
diff --git a/packages/server/graphql/mutations/updateTemplateScope.ts b/packages/server/graphql/mutations/updateTemplateScope.ts
@@ -5,7 +5,6 @@ import {RDatum} from '../../database/stricterR'
 import {SharingScopeEnum as ESharingScope} from '../../database/types/MeetingTemplate'
 import PokerTemplate from '../../database/types/PokerTemplate'
 import ReflectTemplate from '../../database/types/ReflectTemplate'
-import RetrospectivePrompt from '../../database/types/RetrospectivePrompt'
 import generateUID from '../../generateUID'
 import getKysely from '../../postgres/getKysely'
 import {analytics} from '../../utils/analytics/analytics'
@@ -89,12 +88,17 @@ const updateTemplateScope = {
       const activePrompts = prompts.filter(({removedAt}) => !removedAt)
       const promptIds = activePrompts.map(({id}) => id)
       const clonedPrompts = activePrompts.map((prompt) => {
-        return new RetrospectivePrompt({
-          ...prompt,
+        return {
+          id: generateUID(),
+          teamId: prompt.teamId,
           templateId: clonedTemplateId!,
           parentPromptId: prompt.id,
+          sortOrder: prompt.sortOrder,
+          question: prompt.question,
+          description: prompt.description,
+          groupColor: prompt.groupColor,
           removedAt: null
-        })
+        }
       })
       await Promise.all([
         pg

diff --git a/packages/server/graphql/public/types/ReflectPhase.ts b/packages/server/graphql/public/types/ReflectPhase.ts
@@ -1,5 +1,4 @@
 import MeetingRetrospective from '../../../database/types/MeetingRetrospective'
-import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt'
 import {ReflectPhaseResolvers} from '../resolverTypes'
 
 const ReflectPhase: ReflectPhaseResolvers = {
@@ -15,7 +14,7 @@ const ReflectPhase: ReflectPhaseResolvers = {
     // only show prompts that were created before the meeting and
     // either have not been removed or they were removed after the meeting was created
     return prompts.filter(
-      (prompt: RetrospectivePrompt) =>
+      (prompt) =>
         prompt.createdAt < meeting.createdAt &&
         (!prompt.removedAt || meeting.createdAt < prompt.removedAt)
     )