Проведен аудит. Добавлено переключение треков

PlaylistShared.Api/Controllers/PlaylistsController.cs

@@ -1,11 +1,10 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.Enums;
 using PlaylistShared.Shared.SharedPlaylist;
 using PlaylistShared.Shared.Yandex;
 
@@ -19,18 +18,15 @@ public class PlaylistsController : ControllerBase
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly SharedPlaylistService _sharedService;
     private readonly YandexMusicService _yandexService;
-    private readonly YandexApiService _yandexApiService;
 
     public PlaylistsController(
         UserManager<ApplicationUser> userManager,
         SharedPlaylistService sharedService,
-        YandexMusicService yandexService,
-        YandexApiService yandexApiService)
+        YandexMusicService yandexService)
     {
         _userManager = userManager;
         _sharedService = sharedService;
         _yandexService = yandexService;
-        _yandexApiService = yandexApiService;
     }
 
     [HttpGet]
@@ -40,29 +36,30 @@ public class PlaylistsController : ControllerBase
         var user = await _userManager.FindByIdAsync(userId.ToString());
         if (user == null) return Unauthorized();
 
-        var decryptedToken = _yandexApiService.DecryptToken(user.YandexAccessToken);
-        if (string.IsNullOrEmpty(decryptedToken))
+        if (string.IsNullOrEmpty(user.YandexAccessToken))
             return BadRequest(ApiResponse<object>.Fail(new ErrorResponse { StatusCode = 400, Message = "Токен Яндекс.Музыки не установлен или недействителен" }));
 
-        var authSuccess = await _yandexApiService.AuthAsync(decryptedToken);
-        if (!authSuccess)
-            return BadRequest(ApiResponse<object>.Fail(new ErrorResponse { StatusCode = 400, Message = "Не удалось авторизоваться в Яндекс.Музыке. Проверьте токен." }));
-
-        var favorites = await _yandexApiService.Client.Api.Playlist.FavoritesAsync();
-        var ownPlaylists = favorites.Where(p => p.Owner.Uid == _yandexApiService.Client.Account.Uid).ToList();
-
-        var sharedPlaylists = await _sharedService.GetAllByUserAsync(userId);
-
-        var result = ownPlaylists.Select(p => new YandexPlaylistShare
+        List<YandexPlaylistShare> result;
+        try
         {
-            Kind = p.Kind,
-            OwnerUid = p.Owner.Uid,
-            Title = p.Title,
-            CoverUrl = p.Cover?.GetUrl() ?? "",
-            TrackCount = p.TrackCount,
-            IsShared = sharedPlaylists.Any(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid),
-            ShareToken = sharedPlaylists.FirstOrDefault(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid)?.ShareToken,
-        }).ToList();
+            var (ownPlaylists, _) = await _yandexService.GetOwnFavoritesAsync(user);
+            var sharedPlaylists = await _sharedService.GetAllByUserAsync(userId);
+
+            result = (ownPlaylists ?? []).Select(p => new YandexPlaylistShare
+            {
+                Kind = p.Kind,
+                OwnerUid = p.Owner.Uid,
+                Title = p.Title,
+                CoverUrl = p.Cover?.GetUrl() ?? "",
+                TrackCount = p.TrackCount,
+                IsShared = sharedPlaylists.Any(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid),
+                ShareToken = sharedPlaylists.FirstOrDefault(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid)?.ShareToken,
+            }).ToList();
+        }
+        catch (Exception ex)
+        {
+            return BadRequest(ApiResponse<object>.Fail(new ErrorResponse { StatusCode = 400, Message = ex.Message }));
+        }
 
         return Ok(ApiResponse<List<YandexPlaylistShare>>.Ok(result));
     }
@@ -74,7 +71,6 @@ public class PlaylistsController : ControllerBase
         var user = await _userManager.FindByIdAsync(userId.ToString());
         if (user == null) return Unauthorized();
 
-        // Проверяем, что плейлист действительно принадлежит пользователю
         var playlist = await _yandexService.GetPlaylistAsync(user, request.OwnerUid, request.Kind);
         if (playlist == null)
             return BadRequest(ApiResponse<object>.Fail(new ErrorResponse { StatusCode = 404, Message = "Плейлист не найден" }));
@@ -86,13 +82,13 @@ public class PlaylistsController : ControllerBase
             YandexPlaylistOwnerUid = request.OwnerUid,
             Title = playlist.Title,
             Description = playlist.Description,
-            ViewPermission = ViewPermission.Everyone,
-            PlayPermission = ViewPermission.Everyone,
-            AddPermission = EditPermission.AuthorizedOnly,
-            RemovePermission = EditPermission.AddedByUserOnly,
+            ViewPermission = Shared.Enums.ViewPermission.Everyone,
+            PlayPermission = Shared.Enums.ViewPermission.Everyone,
+            AddPermission = Shared.Enums.EditPermission.AuthorizedOnly,
+            RemovePermission = Shared.Enums.EditPermission.AddedByUserOnly,
         };
 
         var result = await _sharedService.CreateAsync(userId, dto);
         return Ok(ApiResponse<SharedPlaylistDto>.Ok(result));
     }
-}
+}