Adding private playlists to track collections

bcc-code · Sep 30, 2024 · c4493e8 · c4493e8
1 parent d716f9a
commit c4493e8
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 9 deletions.
diff --git a/BMM.Api/Framework/HTTP/ApiUris.cs b/BMM.Api/Framework/HTTP/ApiUris.cs
@@ -33,6 +33,7 @@ public class ApiUris
         public static string TrackCollection = "track_collection/{id}";
         public static string TrackCollectionAlbum = "track_collection/{id}/album/{albumId}";
         public static string TrackCollectionPlaylist = "track_collection/{id}/playlist/{playlistId}";
+        public static string TrackCollectionTrackCollection = "track_collection/{id}/track_collection/{playlistId}";
         public static string TrackCollectionResetShare = "track_collection/{id}/reset-share";
         public static string TrackCollectionUnfollow = "track_collection/{id}/unfollow";
         public static string TrackCollectionTopSongs = "track_collection/top-songs";

diff --git a/BMM.Api/Implementation/Clients/Contracts/ITrackCollectionClient.cs b/BMM.Api/Implementation/Clients/Contracts/ITrackCollectionClient.cs
@@ -13,6 +13,8 @@ public interface ITrackCollectionClient
         Task AddAlbumToTrackCollection(int id, int albumId);
 
         Task AddPlaylistToTrackCollection(int id, int playlistId);
+
+        Task AddTrackCollectionToTrackCollection(int id, int trackCollectionId);
 
         /// <summary>Deletes the track collection.</summary>
         Task<bool> Delete(int id);

diff --git a/BMM.Api/Implementation/Clients/TrackCollectionClient.cs b/BMM.Api/Implementation/Clients/TrackCollectionClient.cs
@@ -44,6 +44,16 @@ public async Task AddPlaylistToTrackCollection(int id, int playlistId)
             await RequestIsSuccessful(request);
         }
 
+        public async Task AddTrackCollectionToTrackCollection(int id, int trackCollectionId)
+        {
+            var uri = new UriTemplate(ApiUris.TrackCollectionTrackCollection);
+            uri.SetParameter("id", id);
+            uri.SetParameter("playlistId", trackCollectionId);
+
+            var request = BuildRequest(uri, HttpMethod.Post);
+            await RequestIsSuccessful(request);
+        }
+
         public async Task<bool> Delete(int id)
         {
             var uri = new UriTemplate(ApiUris.TrackCollection);

diff --git a/BMM.Core/Extensions/ActionSheetConfigExtensions.cs b/BMM.Core/Extensions/ActionSheetConfigExtensions.cs
@@ -0,0 +1,20 @@
+using Acr.UserDialogs;
+using BMM.Core.Constants;
+using BMM.Core.Helpers;
+using BMM.Core.Implementations.Localization;
+using BMM.Core.Implementations.Localization.Interfaces;
+using BMM.Core.Translation;
+
+namespace BMM.Core.Extensions;
+
+public static class ActionSheetConfigExtensions
+{
+    private static IBMMLanguageBinder TextSource => BMMLanguageBinderLocator.TextSource;
+
+    public static ActionSheetConfig AddOptionForAddToTrackCollection(this ActionSheetConfig actionSheetConfig, Func<Task> action)
+    {
+        return actionSheetConfig.AddHandled(TextSource[Translations.UserDialogs_AddAllToPlaylist],
+            async () => await action(),
+            ImageResourceNames.IconFavorites);
+    }
+}
diff --git a/BMM.Core/Implementations/Analytics/Event.cs b/BMM.Core/Implementations/Analytics/Event.cs
@@ -38,5 +38,6 @@ public class Event
         public const string AlbumAddedToTrackCollection = "added album to track_collection";
         public const string TrackAddedToTrackCollection = "added track to track_collection";
         public const string PlaylistAddedToTrackCollection = "added playlist to track_collection";
+        public const string TrackCollectionAddedToTrackCollection = "added track collection to track_collection";
     }
 }
diff --git a/BMM.Core/Implementations/ApiClients/CachedTrackCollectionClientDecorator.cs b/BMM.Core/Implementations/ApiClients/CachedTrackCollectionClientDecorator.cs
@@ -34,6 +34,11 @@ public Task AddPlaylistToTrackCollection(int id, int playlistId)
             return _client.AddPlaylistToTrackCollection(id, playlistId);
         }
 
+        public Task AddTrackCollectionToTrackCollection(int id, int trackCollectionId)
+        {
+            return _client.AddTrackCollectionToTrackCollection(id, trackCollectionId);
+        }
+
         public Task<bool> Delete(int id)
         {
             return _client.Delete(id);

diff --git a/BMM.Core/Implementations/ApiClients/MeasuringTrackCollectionClientDecorator.cs b/BMM.Core/Implementations/ApiClients/MeasuringTrackCollectionClientDecorator.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using BMM.Api.Abstraction;
+using BMM.Api.Abstraction;
 using BMM.Api.Implementation.Clients.Contracts;
 using BMM.Api.Implementation.Models;
 using BMM.Core.Implementations.Analytics;
@@ -33,6 +31,11 @@ public Task AddPlaylistToTrackCollection(int id, int playlistId)
             return _client.AddPlaylistToTrackCollection(id, playlistId);
         }
 
+        public Task AddTrackCollectionToTrackCollection(int id, int trackCollectionId)
+        {
+            return _client.AddTrackCollectionToTrackCollection(id, trackCollectionId);
+        }
+
         public Task<bool> Delete(int id)
         {
             return _client.Delete(id);

diff --git a/BMM.Core/Implementations/TrackCollections/TrackCollectionManager.cs b/BMM.Core/Implementations/TrackCollections/TrackCollectionManager.cs
@@ -95,6 +95,16 @@ public async Task AddToTrackCollection(TrackCollection trackCollection, int id,
                         {"Origin", origin}
                     });
             }
+            else if (type == DocumentType.TrackCollection)
+            {
+                await _bmmClient.TrackCollection.AddTrackCollectionToTrackCollection(trackCollection.Id, id);
+                _analytics.LogEvent(Event.TrackCollectionAddedToTrackCollection,
+                    new Dictionary<string, object>
+                    {
+                        {"TrackCollectionId", id},
+                        {"Origin", origin}
+                    });
+            }
             else
             {
                 throw new UnsupportedDocumentTypeException();

diff --git a/BMM.Core/ViewModels/Base/BaseViewModel.cs b/BMM.Core/ViewModels/Base/BaseViewModel.cs
@@ -9,6 +9,7 @@
 using BMM.Api.Framework;
 using BMM.Api.Implementation.Models;
 using BMM.Core.Constants;
+using BMM.Core.Extensions;
 using BMM.Core.GuardedActions.TrackOptions.Interfaces;
 using BMM.Core.GuardedActions.TrackOptions.Parameters;
 using BMM.Core.Helpers;
@@ -237,12 +238,9 @@ protected virtual async Task OptionsAction(Document item)
 
                     bmmUserDialogs.ActionSheet(new ActionSheetConfig()
                         .SetTitle(playlist.Title)
-                        .AddHandled(TextSource[Translations.UserDialogs_AddAllToPlaylist], 
-                            async () => 
-                                await AddToTrackCollection(
-                                    playlist.Id,
-                                    DocumentType.Playlist),
-                            ImageResourceNames.IconFavorites)
+                        .AddOptionForAddToTrackCollection(async () => await AddToTrackCollection(
+                            playlist.Id,
+                            DocumentType.Playlist))
                         .AddHandled(TextSource[Translations.TrackCollectionViewModel_SharePlaylist],
                             async () => await Mvx.IoCProvider.Resolve<IShareLink>().Share(playlist),
                             ImageResourceNames.IconShare)
@@ -268,6 +266,9 @@ private void ShowActionSheetIfSharedTrackCollection(
         {
             userDialogs.ActionSheet(new ActionSheetConfig()
                 .SetTitle(trackCollection.Name)
+                .AddOptionForAddToTrackCollection(async () => await AddToTrackCollection(
+                    trackCollection.Id,
+                    DocumentType.TrackCollection))
                 .AddHandled(
                     TextSource[Translations.TrackCollectionViewModel_RemovePlaylist],
                     async () => await RemoveSharedPlaylist(trackCollection.Id),
@@ -283,6 +284,9 @@ private void ShowActionSheetIfPrivateTrackCollection(
         {
             userDialogs.ActionSheet(new ActionSheetConfig()
                 .SetTitle(trackCollection.Name)
+                .AddOptionForAddToTrackCollection(async () => await AddToTrackCollection(
+                    trackCollection.Id,
+                    DocumentType.TrackCollection))
                 .AddHandled(TextSource[Translations.TrackCollectionViewModel_SharePlaylist],
                     async () =>
                     {