доработка api поиска треков

PlaylistShared.Api/Controllers/AudioController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared.Yandex;
 using System.Security.Claims;
 
 namespace PlaylistShared.Api.Controllers;

PlaylistShared.Api/Controllers/PlaylistsController.cs

@@ -6,7 +6,7 @@ using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Playlist;
+using PlaylistShared.Shared.Yandex;
 using PlaylistShared.Shared.SharedPlaylist;
 using YandexMusic;
 
@@ -32,7 +32,7 @@ public class PlaylistsController : ControllerBase
     }
 
     [HttpGet]
-    public async Task<ActionResult<ApiResponse<List<YandexPlaylistInfo>>>> GetMyPlaylists()
+    public async Task<ActionResult<ApiResponse<List<YandexPlaylistShare>>>> GetMyPlaylists()
     {
         var userId = User.GetUserId();
         var user = await _userManager.FindByIdAsync(userId.ToString());
@@ -52,7 +52,7 @@ public class PlaylistsController : ControllerBase
 
         var sharedPlaylists = await _sharedService.GetAllByUserAsync(userId);
 
-        var result = ownPlaylists.Select(p => new YandexPlaylistInfo
+        var result = ownPlaylists.Select(p => new YandexPlaylistShare
         {
             Kind = p.Kind,
             OwnerUid = p.Owner.Uid,
@@ -63,7 +63,7 @@ public class PlaylistsController : ControllerBase
             ShareToken = sharedPlaylists.FirstOrDefault(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid)?.ShareToken,
         }).ToList();
 
-        return Ok(ApiResponse<List<YandexPlaylistInfo>>.Ok(result));
+        return Ok(ApiResponse<List<YandexPlaylistShare>>.Ok(result));
     }
 
     [HttpPost("share")]

PlaylistShared.Api/Controllers/SharedPlaylistController.cs

@@ -5,8 +5,8 @@ using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
 using PlaylistShared.Shared.SharedPlaylist;
+using PlaylistShared.Shared.Yandex;
 using YandexMusic.API.Models.Playlist;
 
 [ApiController]

PlaylistShared.Api/Controllers/YandexSearchController.cs

@@ -5,8 +5,8 @@ using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
 using PlaylistShared.Shared.Enums;
+using PlaylistShared.Shared.Yandex;
 
 namespace PlaylistShared.Api.Controllers;
 
@@ -26,8 +26,8 @@ public class YandexSearchController : ControllerBase
         _sharedPlaylistService = sharedPlaylistService;
     }
 
-    [HttpGet("tracks")]
+    [HttpGet("search")]
-    public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchQuery(
+    public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
         [FromQuery] string query,
         [FromQuery] int limit = 20,
         [FromQuery] TrackSearchType? searchType = TrackSearchType.All,
@@ -35,7 +35,7 @@ public class YandexSearchController : ControllerBase
         [FromQuery] string? shared_id = null)
     {
         if (string.IsNullOrWhiteSpace(query))
-            return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
+            return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
             {
                 StatusCode = 400,
                 Message = "Поисковый запрос не может быть пустым."
@@ -65,13 +65,13 @@ public class YandexSearchController : ControllerBase
 
         var decryptedToken = _yandexService.DecryptToken(user.YandexAccessToken);
         if (string.IsNullOrEmpty(decryptedToken))
-            return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
+            return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
             {
                 StatusCode = 400,
                 Message = "Токен Яндекс.Музыки не установлен или недействителен."
             }));
 
-        List<YandexTrack>? results = null;
+        YandexSearchResult? results = null;
 
         if (byId)
         {
@@ -79,7 +79,7 @@ public class YandexSearchController : ControllerBase
         }
         else
         {
-            results = await _yandexService.SearchTracksAsync(user, query, searchType, limit);
+            results = await _yandexService.SearchAsync(user, query, searchType, limit);
         }
 
         return Ok(ApiResponse<List<YandexTrack>>.Ok(results));

PlaylistShared.Api/Extensions/YCoverExtensions.cs

@@ -4,14 +4,16 @@ namespace PlaylistShared.Api.Extensions;
 
 public static class YCoverExtensions
 {
-    public static string GetUrl(this YCover cover, string size = "200x200")
+    public static string GetUrl(this YCover cover)
     {
         switch (cover)
         {
             case YCoverImage img when !string.IsNullOrEmpty(img.Uri):
-                return $"https://{img.Uri.Replace("%%", size)}";
+                return img.Uri;
             case YCoverPic pic when !string.IsNullOrEmpty(pic.Uri):
-                return $"https://{pic.Uri.Replace("%%", size)}";
+                return pic.Uri;
+            case YCoverMosaic mosaic when mosaic.ItemsUri.Any():
+                return mosaic.ItemsUri.First();
             default:
                 return string.Empty;
         }

PlaylistShared.Api/Services/SharedPlaylistService.cs

@@ -3,7 +3,6 @@ using PlaylistShared.Api.Data;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Shared.Auth;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Playlist;
 using PlaylistShared.Shared.SharedPlaylist;
 
 namespace PlaylistShared.Api.Services;

PlaylistShared.Api/Services/YandexMusicService.cs

@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.DataProtection;
 using PlaylistShared.Api.Entities;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Api.Extensions;
 using PlaylistShared.Shared.Enums;
+using PlaylistShared.Shared.Yandex;
 using YandexMusic;
 using YandexMusic.API.Extensions.API;
 using YandexMusic.API.Models.Playlist;
@@ -108,7 +109,7 @@ public class YandexMusicService
         }
     }
 
-    public async Task<List<YandexTrack>> SearchTracksAsync(
+    public async Task<YandexSearchResult> SearchAsync(
         ApplicationUser user,
         string query,
         TrackSearchType? searchType = TrackSearchType.All,
@@ -116,7 +117,7 @@ public class YandexMusicService
         )
     {
         var client = await CreateClientAsync(user);
-        if (client == null) return new List<YandexTrack>();
+        if (client == null) return new YandexSearchResult();
 
         var ySerchType = searchType switch
         {
@@ -128,19 +129,56 @@ public class YandexMusicService
         };
 
         var searchResult = await client.SearchAsync(query, ySerchType, page: 0, pageSize: limit);
-        if (searchResult?.Tracks?.Results == null) return new List<YandexTrack>();
+        if (searchResult?.Tracks?.Results == null) return new YandexSearchResult();
 
-        return searchResult.Tracks.Results.Select(t => new YandexTrack
+        return new YandexSearchResult
+        {
+            Tracks = searchResult.Tracks.Results.Select(t => new YandexTrack
             {
                 TrackId = t.Id,
                 Title = t.Title,
                 Artists = t.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
-            CoverUri = t.CoverUri ?? string.Empty,
+                CoverUri = t.CoverUri,
                 DurationMs = t.DurationMs,
-        }).ToList();
+            }).ToList(),
+
+            Playlists = searchResult.Playlists?.Results.Select(p => new YandexPlaylist
+            {
+                Uuid = p.PlaylistUuid,
+                Kind = p.Kind,
+                OwnerUid = p.Owner?.Uid ?? string.Empty,
+                Title = p.Title,
+                Description = p.Description,
+                CoverUrl = p.CoverUri,
+                TrackCount = p.TrackCount,
+            }).ToList(),
+
+            Artists = searchResult.Artists?.Results.Select(a => new YandexArtist
+            {
+                Id = a.Id,
+                Name = a.Name,
+                CoverUrl = a.Cover.GetUrl(),
+                Description = a.Description.Text,
+            }).ToList(),
+
+            Albums = searchResult.Albums?.Results.Select(a => new YandexAlbum
+            {
+                Id = a.Id,
+                Title = a.Title,
+                Artists = a.Artists.Select(t => new YandexArtist()
+                {
+                    Id = t.Id,
+                    Name = t.Name,
+                    CoverUrl = t.Cover.GetUrl(),
+                    Description = t.Description.Text,
+                }).ToList(),
+                CoverUrl = string.IsNullOrEmpty(a.CoverUri) ? a.Cover.GetUrl() : a.CoverUri,
+                Description = a.Description,
+            }).ToList(),
+        };
     }
 
-    public async Task<List<YandexTrack>> SearchTracksByIdAsync(
+    public async Task<YandexSearchResult> SearchTracksByIdAsync(
         ApplicationUser user,
         string id,
         TrackSearchType searchType,
@@ -148,7 +186,7 @@ public class YandexMusicService
         )
     {
         var client = await CreateClientAsync(user);
-        if (client == null) return new List<YandexTrack>();
+        if (client == null) return new YandexSearchResult();
 
         var ySerchType = searchType switch
         {
@@ -174,13 +212,16 @@ public class YandexMusicService
             if (limit > 0) searchResult = searchResult.Take(limit);
         }
 
-        return searchResult.Select(t => new YandexTrack
+        return new YandexSearchResult()
+        {
+            Tracks = searchResult.Select(t => new YandexTrack
             {
                 TrackId = t.Id,
                 Title = t.Title,
                 Artists = t.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
                 CoverUri = t.CoverUri ?? string.Empty,
                 DurationMs = t.DurationMs,
-        }).ToList();
+            }).ToList(),
+        };
     }
 }

PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor

@@ -2,6 +2,7 @@
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Shared.Enums
 @using PlaylistShared.Shared.SharedPlaylist
+@using PlaylistShared.Shared.Yandex
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 

PlaylistShared.Pwa/Services/Api/SharedPlaylistClient.cs

@@ -1,5 +1,6 @@
 using PlaylistShared.Shared;
 using PlaylistShared.Shared.SharedPlaylist;
+using PlaylistShared.Shared.Yandex;
 using System.Net.Http.Json;
 
 namespace PlaylistShared.Pwa.Services.Api;

PlaylistShared.Pwa/Services/AudioPlayerService.cs

@@ -1,6 +1,6 @@
 using MudBlazor;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared.Yandex;
 using System.Net.Http.Json;
 
 namespace PlaylistShared.Pwa.Services;

PlaylistShared.Pwa/Services/IAudioPlayerService.cs

@@ -1,4 +1,4 @@
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared.Yandex;
 
 namespace PlaylistShared.Pwa.Services;
 

PlaylistShared.Shared/SharedPlaylist/SharePlaylistDto.cs

@@ -1,7 +1,7 @@
 using PlaylistShared.Shared.Enums;
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.SharedPlaylist;
 
 /// <summary>Запрос на создание нового шеринг-плейлиста.</summary>
 public class SharePlaylistDto

PlaylistShared.Shared/SharedPlaylist/SharePlaylistRequest.cs

@@ -1,4 +1,4 @@
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.SharedPlaylist;
 
 public class SharePlaylistRequest
 {

PlaylistShared.Shared/Yandex/YandexAlbum.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о альбоме из Яндекс.Музыки.</summary>
+public class YandexAlbum
+{
+    /// <summary>Идентификатор альбома (id).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = null!;
+
+    /// <summary>Наименование альбома.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = null!;
+
+    /// <summary>Исполнители альбома.</summary>
+    [JsonPropertyName("artists")]
+    public List<YandexArtist> Artists { get; set; } = null!;
+
+    /// <summary>Описание альбома.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>URL обложки альбома.</summary>
+    [JsonPropertyName("coverUrl")]
+    public string? CoverUrl { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexArtist.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о исполнителе из Яндекс.Музыки.</summary>
+public class YandexArtist
+{
+    /// <summary>Идентификатор исполнителя (id).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = null!;
+
+    /// <summary>Наименование исполнителя.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = null!;
+
+    /// <summary>Описание исполнителя.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>URL исполнителя.</summary>
+    [JsonPropertyName("coverUrl")]
+    public string? CoverUrl { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexPlaylist.cs

@@ -1,10 +1,14 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.Yandex;
 
-/// <summary>Информация о плейлисте из Яндекс.Музыки (для импорта).</summary>
+/// <summary>Информация о плейлисте из Яндекс.Музыки.</summary>
-public class YandexPlaylistInfo
+public class YandexPlaylist
 {
+    /// <summary>Идентификатор плейлиста (uuid).</summary>
+    [JsonPropertyName("uuid")]
+    public string Uuid { get; set; } = null!;
+
     /// <summary>Идентификатор плейлиста (kind).</summary>
     [JsonPropertyName("kind")]
     public string Kind { get; set; } = null!;
@@ -28,12 +32,4 @@ public class YandexPlaylistInfo
     /// <summary>Кол-во треков.</summary>
     [JsonPropertyName("trackCount")]
     public int TrackCount { get; set; }
-
-    /// <summary>Расшаренный</summary>
-    [JsonPropertyName("isShared")]
-    public bool IsShared { get; set; }
-
-    /// <summary>Расшаренная ссылка</summary>
-    [JsonPropertyName("shareToken")]
-    public string? ShareToken { get; set; }
 }

PlaylistShared.Shared/Yandex/YandexPlaylistData.cs

@@ -1,6 +1,4 @@
-using PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Yandex;
-
-namespace PlaylistShared.Shared.SharedPlaylist;
 
 public class YandexPlaylistData
 {

PlaylistShared.Shared/Yandex/YandexPlaylistShare.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о плейлисте из Яндекс.Музыки с пометкой о шаринге.</summary>
+public class YandexPlaylistShare : YandexPlaylist
+{
+
+    /// <summary>Расшаренный</summary>
+    [JsonPropertyName("isShared")]
+    public bool IsShared { get; set; }
+
+    /// <summary>Расшаренная ссылка</summary>
+    [JsonPropertyName("shareToken")]
+    public string? ShareToken { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexSearchResult.cs

@@ -0,0 +1,31 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о плейлисте из Яндекс.Музыки (для импорта).</summary>
+public class YandexSearchResult
+{
+    /// <summary>
+    /// Найденные треки.
+    /// </summary>
+    [JsonPropertyName("tracks")]
+    public List<YandexTrack>? Tracks { get; set; } = null;
+
+    /// <summary>
+    /// Найденные плейлисты.
+    /// </summary>
+    [JsonPropertyName("playlists")]
+    public List<YandexPlaylist>? Playlists { get; set; } = null;
+
+    /// <summary>
+    /// Найденные исполнители.
+    /// </summary>
+    [JsonPropertyName("artists")]
+    public List<YandexArtist>? Artists { get; set; } = null;
+
+    /// <summary>
+    /// Найденные альбомы.
+    /// </summary>
+    [JsonPropertyName("albumns")]
+    public List<YandexAlbum>? Albums { get; set; } = null;
+}

PlaylistShared.Shared/Yandex/YandexTrack.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Yandex;
 
 /// <summary>Результат поиска трека в Яндекс.Музыке.</summary>
 public class YandexTrack