fix 500 websiteEvent

This commit is contained in:
Francis Cao committed 2026-08-03 16:02:22 -07:00
1 parent d08acc9853
commit b6b500ea4f
4 files changed
+93 -38

No files matched your search

@@ -87,13 +87,14 @@ describe('getWebsiteEvents', () => {
expect(countQuery).toContain('select count(*) as num from (select 1 from (');
expect(countQuery).not.toContain('exists(');
expect(dataQuery).toContain('with paged_events as (');
expect(dataQuery).toContain('paged_event_data as (');
expect(dataQuery).toContain('join website_event on website_event.event_id = paged_events.event_id');
expect(dataQuery).toContain('exists(');
expect(dataQuery).toContain('where event_data.website_event_id = website_event.event_id');
expect(dataQuery).toContain('and event_data.website_id = {{websiteId::uuid}}');
expect(dataQuery).toContain('join paged_events on paged_events.event_id = event_data.website_event_id');
expect(dataQuery).toContain('where event_data.website_id = {{websiteId::uuid}}');
expect(dataQuery).toContain('and event_data.created_at between {{startDate}} and {{endDate}}');
expect(dataQuery).toContain('left join paged_event_data on paged_event_data.event_id = website_event.event_id');
expect(dataQuery).toContain('order by paged_events.created_at desc');
expect(dataQuery).not.toContain('created_at between {{startDate}} and {{endDate}}) AS "hasData"');
expect(dataQuery).toContain('(paged_event_data.event_id is not null) as "hasData"');
expect(result).toEqual({
data: [{ id: 'event-1' }],
count: 25,
@@ -121,13 +122,15 @@ describe('getWebsiteEvents', () => {
expect(countQuery).toContain('select count(*) as num from (select 1 from (');
expect(countQuery).not.toContain('event_data');
expect(dataQuery).toContain('with paged_events as (');
expect(dataQuery).toContain('paged_event_data as (');
expect(dataQuery).toContain('inner join website_event on website_event.event_id = paged_events.event_id');
expect(dataQuery).toContain('where website_id = {websiteId:UUID}');
expect(dataQuery).toContain('from event_data');
expect(dataQuery).toContain('inner join paged_events on paged_events.event_id = event_data.event_id');
expect(dataQuery).toContain('and created_at between {startDate:DateTime64} and {endDate:DateTime64}');
expect(dataQuery).toContain('and event_id in (select event_id from paged_events)');
expect(dataQuery).toContain('left join paged_event_data on paged_event_data.event_id = website_event.event_id');
expect(dataQuery).toContain('order by paged_events.created_at desc');
expect(dataQuery).not.toContain('event_id IN (select event_id');
expect(dataQuery).toContain('paged_event_data.event_id is not null as hasData');
expect(result).toEqual({
data: [{ id: 'event-1' }],
count: '25',
@@ -182,7 +185,7 @@ describe('getWebsiteEvents', () => {
'and created_at between toTimezone({startDate:DateTime64},{timezone:String}) and toTimezone({endDate:DateTime64},{timezone:String})',
);
expect(dataQuery).not.toContain(
'and created_at between {startDate:DateTime64} and {endDate:DateTime64}\r\n and event_id in (select event_id from paged_events)',
'and created_at between {startDate:DateTime64} and {endDate:DateTime64}',
);
});
});