Skip to content

Exclude deleted groups and events from redirects #458

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 5, 2026
+30 −20
Merged

Exclude deleted groups and events from redirects #458

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
7 changes: 5 additions & 2 deletions database/migrations/functions/common/list_redirects.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ returns table (
new_path text
) as $$
with redirect_candidates as (
-- Load active group redirect targets
-- Load active, non-deleted group redirect targets
select
c.name as community_name,
coalesce(
Expand All @@ -28,11 +28,12 @@ returns table (
join community c using (community_id)
where c.active = true
and g.active = true
and g.deleted = false
and g.legacy_url is not null

union all

-- Load published event redirect targets
-- Load published, non-deleted event redirect targets
select
c.name as community_name,
coalesce(
Expand All @@ -56,6 +57,8 @@ returns table (
join community c using (community_id)
where c.active = true
and g.active = true
and g.deleted = false
and e.deleted = false
and e.published = true
and e.legacy_url is not null
)
Expand Down
43 changes: 25 additions & 18 deletions database/tests/functions/common/list_redirects.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ select plan(7);
\set activeGroupNullLegacyID '00000000-0000-0000-0000-000000000208'
\set duplicateEventID '00000000-0000-0000-0000-000000000102'
\set duplicateEventOnlyID '00000000-0000-0000-0000-000000000103'
\set deletedEventID '00000000-0000-0000-0000-000000000108'
\set deletedGroupID '00000000-0000-0000-0000-000000000211'
\set duplicateGroupID '00000000-0000-0000-0000-000000000202'
\set duplicateGroupOnlyID '00000000-0000-0000-0000-000000000203'
\set inactiveGroupID '00000000-0000-0000-0000-000000000204'
Expand Down Expand Up @@ -74,17 +76,20 @@ insert into "group" (
name,
slug,
description,
active,
deleted,
legacy_url
) values
(:'activeGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group', 'active-group', 'A group with a unique legacy URL', 'https://legacy.example.org/groups/active?source=legacy'),
(:'activeGroupSlashID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group Slash', 'active-group-slash', 'A group with a trailing-slash legacy URL', 'https://legacy.example.org/groups/active-slash/'),
(:'activeGroupNullLegacyID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group Null Legacy', 'active-group-null-legacy', 'A group without a legacy URL', null),
(:'duplicateGroupID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Duplicate Group', 'duplicate-group', 'A group sharing a legacy URL', 'https://legacy.example.org/group-duplicate'),
(:'duplicateGroupOnlyID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Duplicate Group Only', 'duplicate-group-only', 'Another group sharing the same legacy URL', 'https://legacy.example.org/group-duplicate'),
(:'inactiveGroupID', :'inactiveCommunityID', :'inactiveGroupCategoryID', 'Inactive Group', 'inactive-group', 'A group under an inactive community', 'https://legacy.example.org/inactive-group'),
(:'rootGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Root Group', 'root-group', 'A group using the site root as legacy URL', 'https://legacy.example.org'),
(:'scopedDuplicateGroupID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Scoped Duplicate Group', 'scoped-duplicate-group', 'A group sharing a legacy URL path across communities', 'https://legacy-duplicate.example.org/groups/active'),
(:'sharedPathGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Shared Path Group', 'shared-path-group', 'A group sharing a path with an event', 'https://legacy.example.org/shared-path');
(:'activeGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group', 'active-group', 'A group with a unique legacy URL', true, false, 'https://legacy.example.org/groups/active?source=legacy'),
(:'activeGroupSlashID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group Slash', 'active-group-slash', 'A group with a trailing-slash legacy URL', true, false, 'https://legacy.example.org/groups/active-slash/'),
(:'activeGroupNullLegacyID', :'activeCommunityID', :'activeGroupCategoryID', 'Active Group Null Legacy', 'active-group-null-legacy', 'A group without a legacy URL', true, false, null),
(:'deletedGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Deleted Group', 'deleted-group', 'A deleted group with a legacy URL', false, true, 'https://legacy.example.org/deleted-group'),
(:'duplicateGroupID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Duplicate Group', 'duplicate-group', 'A group sharing a legacy URL', true, false, 'https://legacy.example.org/group-duplicate'),
(:'duplicateGroupOnlyID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Duplicate Group Only', 'duplicate-group-only', 'Another group sharing the same legacy URL', true, false, 'https://legacy.example.org/group-duplicate'),
(:'inactiveGroupID', :'inactiveCommunityID', :'inactiveGroupCategoryID', 'Inactive Group', 'inactive-group', 'A group under an inactive community', true, false, 'https://legacy.example.org/inactive-group'),
(:'rootGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Root Group', 'root-group', 'A group using the site root as legacy URL', true, false, 'https://legacy.example.org'),
(:'scopedDuplicateGroupID', :'duplicateCommunityID', :'duplicateGroupCategoryID', 'Scoped Duplicate Group', 'scoped-duplicate-group', 'A group sharing a legacy URL path across communities', true, false, 'https://legacy-duplicate.example.org/groups/active'),
(:'sharedPathGroupID', :'activeCommunityID', :'activeGroupCategoryID', 'Shared Path Group', 'shared-path-group', 'A group sharing a path with an event', true, false, 'https://legacy.example.org/shared-path');

-- Events
insert into event (
Expand All @@ -96,16 +101,18 @@ insert into event (
slug,
description,
timezone,
deleted,

legacy_url,
published
) values
(:'activeEventID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event', 'active-event', 'A published event with a unique legacy URL', 'UTC', 'https://legacy.example.org/events/active?ref=legacy', true),
(:'activeEventSlashID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event Slash', 'active-event-slash', 'A published event with a trailing-slash legacy URL', 'UTC', 'https://legacy.example.org/events/active-slash/', true),
(:'activeEventNullLegacyID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event Null Legacy', 'active-event-null-legacy', 'A published event without a legacy URL', 'UTC', null, true),
(:'duplicateEventID', :'duplicateEventCategoryID', 'virtual', :'duplicateGroupID', 'Duplicate Event', 'duplicate-event', 'A published event sharing a legacy URL', 'UTC', 'https://legacy.example.org/events/duplicate', true),
(:'duplicateEventOnlyID', :'duplicateEventCategoryID', 'virtual', :'duplicateGroupID', 'Duplicate Event Only', 'duplicate-event-only', 'Another published event sharing the same legacy URL', 'UTC', 'https://legacy.example.org/events/duplicate', true),
(:'sharedPathEventID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Shared Path Event', 'shared-path-event', 'A published event sharing a path with a group', 'UTC', 'https://legacy.example.org/shared-path', true);
(:'activeEventID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event', 'active-event', 'A published event with a unique legacy URL', 'UTC', false, 'https://legacy.example.org/events/active?ref=legacy', true),
(:'activeEventSlashID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event Slash', 'active-event-slash', 'A published event with a trailing-slash legacy URL', 'UTC', false, 'https://legacy.example.org/events/active-slash/', true),
(:'activeEventNullLegacyID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Active Event Null Legacy', 'active-event-null-legacy', 'A published event without a legacy URL', 'UTC', false, null, true),
(:'deletedEventID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Deleted Event', 'deleted-event', 'A deleted event with a legacy URL', 'UTC', true, 'https://legacy.example.org/events/deleted', false),
(:'duplicateEventID', :'duplicateEventCategoryID', 'virtual', :'duplicateGroupID', 'Duplicate Event', 'duplicate-event', 'A published event sharing a legacy URL', 'UTC', false, 'https://legacy.example.org/events/duplicate', true),
(:'duplicateEventOnlyID', :'duplicateEventCategoryID', 'virtual', :'duplicateGroupID', 'Duplicate Event Only', 'duplicate-event-only', 'Another published event sharing the same legacy URL', 'UTC', false, 'https://legacy.example.org/events/duplicate', true),
(:'sharedPathEventID', :'activeEventCategoryID', 'virtual', :'activeGroupID', 'Shared Path Event', 'shared-path-event', 'A published event sharing a path with a group', 'UTC', false, 'https://legacy.example.org/shared-path', true);

-- ============================================================================
-- TESTS
Expand Down Expand Up @@ -184,14 +191,14 @@ select ok(
'Should exclude normalized paths shared by events and groups'
);

-- Should exclude inactive and null legacy URL records
-- Should exclude inactive, deleted, and null legacy URL records
select ok(
not exists(
select 1
from list_redirects()
where legacy_path in ('/inactive-group', '/events/active-event-null-legacy')
where legacy_path in ('/deleted-group', '/events/deleted', '/inactive-group', '/events/active-event-null-legacy')
),
'Should exclude inactive and null legacy URL records'
'Should exclude inactive, deleted, and null legacy URL records'
);

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