Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes bug where querying by chatId results in no records #1716

Merged
merged 4 commits into from
Feb 15, 2024
Merged

fixes bug where querying by chatId results in no records #1716

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55c2a86
fixes bug where querying by chatId results in no records
Jaredude Feb 13, 2024
6de1e8a
handles invalid values for startDate, endDate
Jaredude Feb 13, 2024
4d7c7d6
Changes getMessage date logic from Between to >= and <= to fix issue …
Jaredude Feb 13, 2024
e86c15e
Merge branch 'main' into bugfix/chatmessage-query-by-chatId-memoryTyp…
Jaredude Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions packages/server/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import logger from './utils/logger'
import { expressRequestLogger } from './utils/logger'
import { v4 as uuidv4 } from 'uuid'
import OpenAI from 'openai'
import { Between, IsNull, FindOptionsWhere } from 'typeorm'
import { FindOptionsWhere, MoreThanOrEqual, LessThanOrEqual } from 'typeorm'
import {
IChatFlow,
IncomingInput,
Expand Down Expand Up @@ -1445,20 +1445,30 @@ export class App {
endDate?: string,
messageId?: string
): Promise<ChatMessage[]> {
const setDateToStartOrEndOfDay = (dateTimeStr: string, setHours: 'start' | 'end') => {
const date = new Date(dateTimeStr)
if (isNaN(date.getTime())) {
return undefined
}
setHours === 'start' ? date.setHours(0, 0, 0, 0) : date.setHours(23, 59, 59, 999)
return date
}

let fromDate
if (startDate) fromDate = new Date(startDate)
if (startDate) fromDate = setDateToStartOrEndOfDay(startDate, 'start')

let toDate
if (endDate) toDate = new Date(endDate)
if (endDate) toDate = setDateToStartOrEndOfDay(endDate, 'end')

return await this.AppDataSource.getRepository(ChatMessage).find({
where: {
chatflowid,
chatType,
chatId,
memoryType: memoryType ?? (chatId ? IsNull() : undefined),
memoryType: memoryType ?? undefined,
Jaredude marked this conversation as resolved.
Show resolved Hide resolved
sessionId: sessionId ?? undefined,
createdDate: toDate && fromDate ? Between(fromDate, toDate) : undefined,
...(fromDate && { createdDate: MoreThanOrEqual(fromDate) }),
...(toDate && { createdDate: LessThanOrEqual(toDate) }),
id: messageId ?? undefined
},
order: {
Expand Down
Loading