Skip to content

MBS-14053 (server): Add ended flag to aliases #3559

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MBS-14053 (server): Add ended flag to aliases #3559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb67c3
Improve test coverage for aliases in API
reosarevok Jun 6, 2025
f2cfe47
MBS-14053: Add ended flag to aliases
reosarevok Jun 6, 2025
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: 1 addition & 0 deletions lib/MusicBrainz/Server/WebService/XMLSerializer.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ sub _serialize_alias_list
unless $al->begin_date->is_empty;
$alias_node->_setAttribute('end-date', $al->end_date->format)
unless $al->end_date->is_empty;
$alias_node->_setAttribute('ended', 'ended') if $al->ended;

$alias_node->appendText($al->name);
}
Expand Down
8 changes: 4 additions & 4 deletions t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseArtists.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ ws2_test_xml 'browse artists via recording',
<begin>1986-11-05</begin>
</life-span>
<alias-list count="5">
<alias sort-name="Beat of Angel">Beat of Angel</alias>
<alias sort-name="BoA Kwon">BoA Kwon</alias>
<alias sort-name="Beat of Angel" begin-date="1001-01-10" end-date="2002-02-20" ended="ended">Beat of Angel</alias>
<alias sort-name="BoA Kwon" ended="ended">BoA Kwon</alias>
<alias sort-name="Kwon BoA">Kwon BoA</alias>
<alias sort-name="ボア">ボア</alias>
<alias sort-name="보아">보아</alias>
<alias sort-name="ボア" type="Artist name" type-id="894afba6-2816-3c24-8072-eadb66bd04bc">ボア</alias>
<alias locale="ko" sort-name="보아" primary="primary">보아</alias>
</alias-list>
</artist>
<artist type="Group" type-id="e431f5f6-b5d2-343d-8b36-72607fffb74b" id="22dd2db3-88ea-4428-a7a8-5cd3acf23175">
Expand Down
8 changes: 4 additions & 4 deletions t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseArtists.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ test 'browse artists via recording' => sub {
type => 'Person',
'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df',
aliases => [
{ name => 'Beat of Angel', 'sort-name' => 'Beat of Angel', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'BoA Kwon', 'sort-name' => 'BoA Kwon', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'Beat of Angel', 'sort-name' => 'Beat of Angel', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => '1001-01-10', end => '2002-02-20', ended => JSON::true },
{ name => 'BoA Kwon', 'sort-name' => 'BoA Kwon', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::true },
{ name => 'Kwon BoA', 'sort-name' => 'Kwon BoA', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'ボア', 'sort-name' => 'ボア', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => '보아', 'sort-name' => '보아', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'ボア', 'sort-name' => 'ボア', locale => JSON::null, primary => JSON::null, type => 'Artist name', 'type-id' => '894afba6-2816-3c24-8072-eadb66bd04bc', begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => '보아', 'sort-name' => '보아', locale => 'ko', primary => JSON::true, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
],
ipis => [],
isnis => [],
Expand Down
8 changes: 4 additions & 4 deletions t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ test 'basic artist lookup, inc=aliases' => sub {
type => 'Person',
'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df',
aliases => [
{ name => 'Beat of Angel', 'sort-name' => 'Beat of Angel', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'BoA Kwon', 'sort-name' => 'BoA Kwon', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'Beat of Angel', 'sort-name' => 'Beat of Angel', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => '1001-01-10', end => '2002-02-20', ended => JSON::true },
{ name => 'BoA Kwon', 'sort-name' => 'BoA Kwon', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::true },
{ name => 'Kwon BoA', 'sort-name' => 'Kwon BoA', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'ボア', 'sort-name' => 'ボア', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => '보아', 'sort-name' => '보아', locale => JSON::null, primary => JSON::null, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => 'ボア', 'sort-name' => 'ボア', locale => JSON::null, primary => JSON::null, type => 'Artist name', 'type-id' => '894afba6-2816-3c24-8072-eadb66bd04bc', begin => JSON::null, end => JSON::null, ended => JSON::false },
{ name => '보아', 'sort-name' => '보아', locale => 'ko', primary => JSON::true, type => JSON::null, 'type-id' => JSON::null, begin => JSON::null, end => JSON::null, ended => JSON::false },
],
ipis => [],
isnis => [],
Expand Down
8 changes: 4 additions & 4 deletions t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ ws_test 'artist lookup, inc=aliases',
<begin>1986-11-05</begin>
</life-span>
<alias-list count="5">
<alias sort-name="Beat of Angel">Beat of Angel</alias>
<alias sort-name="BoA Kwon">BoA Kwon</alias>
<alias sort-name="Beat of Angel" begin-date="1001-01-10" end-date="2002-02-20" ended="ended">Beat of Angel</alias>
<alias sort-name="BoA Kwon" ended="ended">BoA Kwon</alias>
<alias sort-name="Kwon BoA">Kwon BoA</alias>
<alias sort-name="ボア">ボア</alias>
<alias sort-name="보아">보아</alias>
<alias sort-name="ボア" type="Artist name" type-id="894afba6-2816-3c24-8072-eadb66bd04bc">ボア</alias>
<alias locale="ko" sort-name="보아" primary="primary">보아</alias>
</alias-list>
</artist>
</metadata>';
Expand Down
16 changes: 8 additions & 8 deletions t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,11 +1432,11 @@ ws_test 'release lookup, track artists have no aliases',
<artist id="a16d1433-ba89-4f72-a47b-a370add0bb55" type="Person" type-id="b6e035f4-3ce9-331c-97df-83397230b0df">
<name>BoA</name><sort-name>BoA</sort-name>
<alias-list count="5">
<alias sort-name="Beat of Angel">Beat of Angel</alias>
<alias sort-name="BoA Kwon">BoA Kwon</alias>
<alias sort-name="Beat of Angel" begin-date="1001-01-10" end-date="2002-02-20" ended="ended">Beat of Angel</alias>
<alias sort-name="BoA Kwon" ended="ended">BoA Kwon</alias>
<alias sort-name="Kwon BoA">Kwon BoA</alias>
<alias sort-name="ボア">ボア</alias>
<alias sort-name="보아">보아</alias>
<alias sort-name="ボア" type="Artist name" type-id="894afba6-2816-3c24-8072-eadb66bd04bc">ボア</alias>
<alias locale="ko" sort-name="보아" primary="primary">보아</alias>
</alias-list>
</artist>
</name-credit>
Expand Down Expand Up @@ -1487,11 +1487,11 @@ ws_test 'release lookup, track artists have no aliases',
<artist id="a16d1433-ba89-4f72-a47b-a370add0bb55" type="Person" type-id="b6e035f4-3ce9-331c-97df-83397230b0df">
<name>BoA</name><sort-name>BoA</sort-name>
<alias-list count="5">
<alias sort-name="Beat of Angel">Beat of Angel</alias>
<alias sort-name="BoA Kwon">BoA Kwon</alias>
<alias sort-name="Beat of Angel" begin-date="1001-01-10" end-date="2002-02-20" ended="ended">Beat of Angel</alias>
<alias sort-name="BoA Kwon" ended="ended">BoA Kwon</alias>
<alias sort-name="Kwon BoA">Kwon BoA</alias>
<alias sort-name="ボア">ボア</alias>
<alias sort-name="보아">보아</alias>
<alias sort-name="ボア" type="Artist name" type-id="894afba6-2816-3c24-8072-eadb66bd04bc">ボア</alias>
<alias locale="ko" sort-name="보아" primary="primary">보아</alias>
</alias-list>
</artist>
</name-credit>
Expand Down
8 changes: 4 additions & 4 deletions t/sql/webservice.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_y
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (135345, NULL, NULL, NULL, 0, NULL, NULL, NULL, 38930, '2011-01-18 15:20:17.74049+00', NULL, 'm-flow', '0', 'm-flow', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (135345, NULL, NULL, NULL, 0, NULL, NULL, NULL, 69814, '2011-01-18 15:20:17.74049+00', NULL, 'えむふろう', '0', 'えむふろう', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (135345, NULL, NULL, NULL, 0, NULL, NULL, NULL, 69815, '2011-01-18 15:20:17.74049+00', NULL, 'エムフロウ', '0', 'エムフロウ', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 11905, '2011-01-18 15:20:17.74049+00', NULL, 'Beat of Angel', '0', 'Beat of Angel', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 70378, '2011-01-18 15:20:17.74049+00', NULL, 'ボア', '0', 'ボア', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 11902, '2011-01-18 15:20:17.74049+00', NULL, 'BoA Kwon', '0', 'BoA Kwon', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, 10, 01, 1001, 0, 20, 02, 2002, 11905, '2011-01-18 15:20:17.74049+00', NULL, 'Beat of Angel', '0', 'Beat of Angel', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 70378, '2011-01-18 15:20:17.74049+00', NULL, 'ボア', '0', 'ボア', 1);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type, ended) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 11902, '2011-01-18 15:20:17.74049+00', NULL, 'BoA Kwon', '0', 'BoA Kwon', NULL, '1');
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 11901, '2011-01-18 15:20:17.74049+00', NULL, 'Kwon BoA', '0', 'Kwon BoA', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 18652, '2011-01-18 15:20:17.74049+00', NULL, '보아', '0', '보아', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (9496, NULL, NULL, NULL, 0, NULL, NULL, NULL, 18652, '2011-01-18 15:20:17.74049+00', 'ko', '보아', '1', '보아', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (242, NULL, NULL, NULL, 0, NULL, NULL, NULL, 34446, '2011-01-18 15:20:17.74049+00', NULL, 'Chemical Brother', '0', 'Chemical Brother', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (242, NULL, NULL, NULL, 0, NULL, NULL, NULL, 381, '2011-01-18 15:20:17.74049+00', NULL, 'CHEMICAL BROTHERS', '0', 'CHEMICAL BROTHERS', NULL);
INSERT INTO artist_alias (artist, begin_date_day, begin_date_month, begin_date_year, edits_pending, end_date_day, end_date_month, end_date_year, id, last_updated, locale, name, primary_for_locale, sort_name, type) VALUES (242, NULL, NULL, NULL, 0, NULL, NULL, NULL, 2207, '2011-01-18 15:20:17.74049+00', NULL, 'Chemical Brothers', '0', 'Chemical Brothers', NULL);
Expand Down
Loading