blsmedia/bot
2
0
Fork 0
Code Activity

🗃️ Add createdAt to sort transcript answers

Browse Source
This commit is contained in:
Baptiste Arnaud
2024-05-22 15:44:49 +02:00
parent ab9e36f68d
commit 79ad1f63de
6 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/builder/src/features/results/api/getResult.ts
View File

@ -76,12 +76,14 @@ export const getResult = authenticatedProcedure
select: {
blockId: true,
content: true,
createdAt: true,
},
},
answersV2: {
select: {
blockId: true,
content: true,
createdAt: true,
},
},
},
@ -95,7 +97,9 @@ export const getResult = authenticatedProcedure
return {
result: resultWithAnswersSchema.parse({
...result,
answers: answers.concat(answersV2),
answers: answers
.concat(answersV2)
.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime()),
}),
}
})

15
apps/builder/src/features/results/api/getResults.ts
View File

@ -109,12 +109,14 @@ export const getResults = authenticatedProcedure
select: {
blockId: true,
content: true,
createdAt: true,
},
},
answersV2: {
select: {
blockId: true,
content: true,
createdAt: true,
},
},
},
@ -127,11 +129,14 @@ export const getResults = authenticatedProcedure
}
return {
results: z
.array(resultWithAnswersSchema)
.parse(
results.map((r) => ({ ...r, answers: r.answersV2.concat(r.answers) }))
),
results: z.array(resultWithAnswersSchema).parse(
results.map((r) => ({
...r,
answers: r.answersV2
.concat(r.answers)
.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime()),
}))
),
nextCursor,
}
})

6
packages/bot-engine/blocks/logic/setVariable/executeSetVariable.ts
View File

@ -261,12 +261,14 @@ const parseResultTranscriptProps = async (
select: {
blockId: true,
content: true,
createdAt: true,
},
},
answersV2: {
select: {
blockId: true,
content: true,
createdAt: true,
},
},
setVariableHistory: {
@ -281,7 +283,9 @@ const parseResultTranscriptProps = async (
})
if (!result) return
return {
answers: result.answersV2.concat(result.answers),
answers: result.answersV2
.concat(result.answers)
.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime()),
setVariableHistory: (
result.setVariableHistory as SetVariableHistoryItem[]
).sort((a, b) => a.index - b.index),

11
packages/prisma/mysql/schema.prisma
View File

@ -320,11 +320,12 @@ model Answer {
}
model AnswerV2 {
id Int @id @default(autoincrement())
blockId String
content String @db.Text
resultId String
result Result @relation(fields: [resultId], references: [id], onDelete: Cascade)
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
blockId String
content String @db.Text
resultId String
result Result @relation(fields: [resultId], references: [id], onDelete: Cascade)
@@index([resultId])
@@index([blockId])

2
packages/prisma/postgresql/migrations/20240522133715_add_created_at_in_answerv2/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "AnswerV2" ADD COLUMN "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

11
packages/prisma/postgresql/schema.prisma
View File

@ -300,11 +300,12 @@ model Answer {
}
model AnswerV2 {
id Int @id @default(autoincrement())
blockId String
content String
resultId String
result Result @relation(fields: [resultId], references: [id], onDelete: Cascade)
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
blockId String
content String
resultId String
result Result @relation(fields: [resultId], references: [id], onDelete: Cascade)
@@index([blockId])
}