MBS-12898: Autoselect Apple Music rel for artists/labels

An Apple Music relationship type now exists for artists and labels, so as suggested in 4a89ec0 when this was originally written, I'm changing the autoselect to use it instead. Existing relationships will need to be moved with a bot.
metabrainz · Jul 26, 2023 · bec1069 · bec1069
1 parent 26d93eb
commit bec1069
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/root/static/scripts/edit/URLCleanup.js b/root/static/scripts/edit/URLCleanup.js
@@ -42,6 +42,10 @@ export const LINK_TYPES: LinkTypeMap = {
   amazon: {
     release: '4f2e710d-166c-480c-a293-2e2c8d658d87',
   },
+  applemusic: {
+    artist: '64785d6c-2eeb-4f86-9418-b6c2d6c53c13',
+    label: 'debf36e1-b0fa-4e6c-987e-4248bf050fd8',
+  },
   bandcamp: {
     artist: 'c550166e-0548-4a18-b1d4-e2ae423a3e88',
     genre: 'ad28869f-0f9e-4bd5-b786-70125cc69c3c',
@@ -824,9 +828,21 @@ const CLEANUPS: CleanupEntries = {
       new RegExp('^(https?://)?([^/]+\\.)?apple\\.co/', 'i'),
     ],
     restrict: [
-      LINK_TYPES.downloadpurchase,
-      LINK_TYPES.streamingpaid,
-      multiple(LINK_TYPES.downloadpurchase, LINK_TYPES.streamingpaid),
+      LINK_TYPES.applemusic,
+      ...anyCombinationOf(
+        'recording',
+        [
+          LINK_TYPES.downloadpurchase.recording,
+          LINK_TYPES.streamingpaid.recording,
+        ],
+      ),
+      ...anyCombinationOf(
+        'release',
+        [
+          LINK_TYPES.downloadpurchase.release,
+          LINK_TYPES.streamingpaid.release,
+        ],
+      ),
     ],
     clean: function (url) {
       url = url.replace(/^https?:\/\/(?:(?:beta|geo)\.)?music\.apple\.com\//, 'https://music.apple.com/');
@@ -859,17 +875,15 @@ const CLEANUPS: CleanupEntries = {
       if (m) {
         const prefix = m[1];
         switch (id) {
-          case LINK_TYPES.downloadpurchase.artist:
-          case LINK_TYPES.streamingpaid.artist:
+          case LINK_TYPES.applemusic.artist:
             if (prefix === 'artist') {
               return {result: true};
             }
             return {
               result: false,
               target: ERROR_TARGETS.ENTITY,
             };
-          case LINK_TYPES.downloadpurchase.label:
-          case LINK_TYPES.streamingpaid.label:
+          case LINK_TYPES.applemusic.label:
             if (prefix === 'label') {
               return {result: true};
             }

diff --git a/root/static/scripts/tests/Control/URLCleanup.js b/root/static/scripts/tests/Control/URLCleanup.js
@@ -560,32 +560,23 @@ const testData = [
   {
                      input_url: 'http://music.apple.com/artist/hangry-angry-f/id444923726',
              input_entity_type: 'artist',
-limited_link_type_combinations: [
-                                  'downloadpurchase',
-                                  'streamingpaid',
-                                  ['downloadpurchase', 'streamingpaid'],
-                                ],
+    expected_relationship_type: 'applemusic',
             expected_clean_url: 'https://music.apple.com/us/artist/444923726',
+       only_valid_entity_types: ['artist'],
   },
   {
                      input_url: 'https://beta.music.apple.com/ca/artist/imposs/205021452',
              input_entity_type: 'artist',
-limited_link_type_combinations: [
-                                  'downloadpurchase',
-                                  'streamingpaid',
-                                  ['downloadpurchase', 'streamingpaid'],
-                                ],
+    expected_relationship_type: 'applemusic',
             expected_clean_url: 'https://music.apple.com/ca/artist/205021452',
+       only_valid_entity_types: ['artist'],
   },
   {
                      input_url: 'https://music.apple.com/us/label/ghostly-international/1543968172',
              input_entity_type: 'label',
-limited_link_type_combinations: [
-                                  'downloadpurchase',
-                                  'streamingpaid',
-                                  ['downloadpurchase', 'streamingpaid'],
-                                ],
+    expected_relationship_type: 'applemusic',
             expected_clean_url: 'https://music.apple.com/us/label/1543968172',
+       only_valid_entity_types: ['label'],
   },
   {
                      input_url: 'https://music.apple.com/ee/music-video/black-and-yellow/539886832?uo=4&mt=5&app=music',