доработка api поиска треков
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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")]
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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")]
|
||||
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchQuery(
|
||||
[HttpGet("search")]
|
||||
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));
|
||||
|
||||
Reference in New Issue
Block a user