Skip to content

Upcoming events: include virtual with no location #447

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

Merged
tegioz merged 1 commit into from
May 4, 2026
Merged

Upcoming events: include virtual with no location #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion database/migrations/functions/community/get_community_upcoming_events.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ returns json as $$
and g.active = true
and e.published = true
and e.event_kind_id = any(p_event_kind_ids)
and (g.city is not null or e.venue_city is not null)
and e.starts_at is not null
and e.starts_at > now()
and e.canceled = false
Expand Down
1 change: 0 additions & 1 deletion database/migrations/functions/site/get_site_upcoming_events.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ returns json as $$
where g.active = true
and e.published = true
and e.event_kind_id = any(p_event_kind_ids)
and (g.city is not null or e.venue_city is not null)
and e.starts_at is not null
and e.starts_at > now()
and e.canceled = false
Expand Down
37 changes: 31 additions & 6 deletions database/tests/functions/community/get_community_upcoming_events.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- ============================================================================

begin;
select plan(4);
select plan(5);

-- ============================================================================
-- VARIABLES
Expand All @@ -17,8 +17,10 @@ select plan(4);
\set event4ID '00000000-0000-0000-0000-000000000044'
\set event5ID '00000000-0000-0000-0000-000000000045'
\set event6ID '00000000-0000-0000-0000-000000000046'
\set event7ID '00000000-0000-0000-0000-000000000047'
\set eventCategory1ID '00000000-0000-0000-0000-000000000021'
\set group1ID '00000000-0000-0000-0000-000000000031'
\set group2ID '00000000-0000-0000-0000-000000000032'

-- ============================================================================
-- SEED DATA
Expand Down Expand Up @@ -51,6 +53,9 @@ values (:'category1ID', 'Technology', :'communityID');
insert into "group" (group_id, name, slug, community_id, group_category_id, city, state, country_code, country_name, logo_url)
values (:'group1ID', 'Test Group', 'test-group', :'communityID', :'category1ID', 'New York', 'NY', 'US', 'United States', 'https://example.com/group-logo.png');

insert into "group" (group_id, name, slug, community_id, group_category_id, logo_url)
values (:'group2ID', 'Virtual Group', 'virtual-group', :'communityID', :'category1ID', 'https://example.com/virtual-group-logo.png');

-- Event Category
insert into event_category (event_category_id, name, community_id)
values (:'eventCategory1ID', 'Tech Talks', :'communityID');
Expand Down Expand Up @@ -88,11 +93,17 @@ insert into event (
(:'event4ID', 'Canceled Future Event', 'canceled-future-event', 'A canceled event', 'UTC',
:'eventCategory1ID', 'in-person', :'group1ID', false,
now() + interval '2 weeks', now() + interval '2 weeks' + interval '2 hours', true, null),
-- Future event 4 (no logo - should be filtered out)
-- Future event 4 (uses group logo fallback)
(:'event5ID', 'No Logo Event', 'no-logo-event', 'An event without logo', 'UTC',
:'eventCategory1ID', 'in-person', :'group1ID', true,
now() + interval '1 month' + interval '1 day', now() + interval '1 month' + interval '1 day' + interval '2 hours',
false, null);
false, null),
-- Future event 5 (virtual event for a group without location data)
(:'event7ID', 'Locationless Virtual Event', 'locationless-virtual-event',
'A virtual event for a group without location data', 'UTC',
:'eventCategory1ID', 'virtual', :'group2ID', true,
now() + interval '3 months', now() + interval '3 months' + interval '2 hours',
false, 'https://example.com/locationless-virtual-event-logo.png');

-- ============================================================================
-- TESTS
Expand All @@ -103,7 +114,8 @@ select is(
get_community_upcoming_events('00000000-0000-0000-0000-000000000001'::uuid, array['in-person', 'virtual', 'hybrid'])::jsonb,
jsonb_build_array(
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event5ID'::uuid)::jsonb
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event5ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group2ID'::uuid, :'event7ID'::uuid)::jsonb
),
'Should return published future events'
);
Expand All @@ -113,7 +125,8 @@ delete from event where event_id = :'event5ID';
select is(
get_community_upcoming_events('00000000-0000-0000-0000-000000000001'::uuid, array['in-person', 'virtual', 'hybrid'])::jsonb,
jsonb_build_array(
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group2ID'::uuid, :'event7ID'::uuid)::jsonb
),
'Should return only published future events'
);
Expand Down Expand Up @@ -164,10 +177,22 @@ select is(
get_community_upcoming_events(:'communityID'::uuid, array['virtual'])::jsonb
) event_item
),
jsonb_build_array(:'event2ID', :'event6ID'),
jsonb_build_array(:'event2ID', :'event6ID', :'event7ID'),
'Should order tied future events by event ID'
);

-- Should include virtual events for groups without location data
select ok(
exists (
select 1
from jsonb_array_elements(
get_community_upcoming_events(:'communityID'::uuid, array['virtual'])::jsonb
) event_item
where event_item->>'event_id' = :'event7ID'
),
'Should include virtual events for groups without location data'
);

-- ============================================================================
-- CLEANUP
-- ============================================================================
Expand Down
35 changes: 29 additions & 6 deletions database/tests/functions/site/get_site_upcoming_events.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- ============================================================================

begin;
select plan(4);
select plan(5);

-- ============================================================================
-- VARIABLES
Expand All @@ -17,8 +17,10 @@ select plan(4);
\set event4ID '00000000-0000-0000-0000-000000000044'
\set event5ID '00000000-0000-0000-0000-000000000045'
\set event6ID '00000000-0000-0000-0000-000000000046'
\set event7ID '00000000-0000-0000-0000-000000000047'
\set eventCategory1ID '00000000-0000-0000-0000-000000000021'
\set group1ID '00000000-0000-0000-0000-000000000031'
\set group2ID '00000000-0000-0000-0000-000000000032'

-- ============================================================================
-- SEED DATA
Expand Down Expand Up @@ -51,6 +53,9 @@ values (:'category1ID', 'Technology', :'communityID');
insert into "group" (group_id, name, slug, community_id, group_category_id, city, state, country_code, country_name, logo_url)
values (:'group1ID', 'Test Group', 'test-group', :'communityID', :'category1ID', 'New York', 'NY', 'US', 'United States', 'https://example.com/group-logo.png');

insert into "group" (group_id, name, slug, community_id, group_category_id, logo_url)
values (:'group2ID', 'Virtual Group', 'virtual-group', :'communityID', :'category1ID', 'https://example.com/virtual-group-logo.png');

-- Event Category
insert into event_category (event_category_id, name, community_id)
values (:'eventCategory1ID', 'Tech Talks', :'communityID');
Expand Down Expand Up @@ -88,11 +93,17 @@ insert into event (
(:'event4ID', 'Canceled Future Event', 'canceled-future-event', 'A canceled event', 'UTC',
:'eventCategory1ID', 'in-person', :'group1ID', false,
now() + interval '2 weeks', now() + interval '2 weeks' + interval '2 hours', true, null),
-- Future event 4 (no logo - should be filtered out)
-- Future event 4 (uses group logo fallback)
(:'event5ID', 'No Logo Event', 'no-logo-event', 'An event without logo', 'UTC',
:'eventCategory1ID', 'in-person', :'group1ID', true,
now() + interval '1 month' + interval '1 day', now() + interval '1 month' + interval '1 day' + interval '2 hours',
false, null);
false, null),
-- Future event 5 (virtual event for a group without location data)
(:'event7ID', 'Locationless Virtual Event', 'locationless-virtual-event',
'A virtual event for a group without location data', 'UTC',
:'eventCategory1ID', 'virtual', :'group2ID', true,
now() + interval '3 months', now() + interval '3 months' + interval '2 hours',
false, 'https://example.com/locationless-virtual-event-logo.png');

-- ============================================================================
-- TESTS
Expand All @@ -103,7 +114,8 @@ select is(
get_site_upcoming_events(array['in-person', 'virtual', 'hybrid'])::jsonb,
jsonb_build_array(
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event5ID'::uuid)::jsonb
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event5ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group2ID'::uuid, :'event7ID'::uuid)::jsonb
),
'Should return published future events'
);
Expand All @@ -113,7 +125,8 @@ delete from event where event_id = :'event5ID';
select is(
get_site_upcoming_events(array['in-person', 'virtual', 'hybrid'])::jsonb,
jsonb_build_array(
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb
get_event_summary(:'communityID'::uuid, :'group1ID'::uuid, :'event2ID'::uuid)::jsonb,
get_event_summary(:'communityID'::uuid, :'group2ID'::uuid, :'event7ID'::uuid)::jsonb
),
'Should return only published future events'
);
Expand Down Expand Up @@ -162,10 +175,20 @@ select is(
select jsonb_agg(event_item->>'event_id')
from jsonb_array_elements(get_site_upcoming_events(array['virtual'])::jsonb) event_item
),
jsonb_build_array(:'event2ID', :'event6ID'),
jsonb_build_array(:'event2ID', :'event6ID', :'event7ID'),
'Should order tied future events by event ID'
);

-- Should include virtual events for groups without location data
select ok(
exists (
select 1
from jsonb_array_elements(get_site_upcoming_events(array['virtual'])::jsonb) event_item
where event_item->>'event_id' = :'event7ID'
),
'Should include virtual events for groups without location data'
);

-- ============================================================================
-- CLEANUP
-- ============================================================================
Expand Down
Loading