Чистка кода

PlaylistShared.Api/Controllers/AccountController.cs

@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Services;
+using PlaylistShared.Shared;
+using PlaylistShared.Shared.Auth;
 using PlaylistShared.Shared.DTO;
 
 [ApiController]

PlaylistShared.Api/Controllers/PlaylistsController.cs

@@ -4,9 +4,10 @@ using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Models;
+using PlaylistShared.Shared.Playlist;
+using PlaylistShared.Shared.Shared;
 using YandexMusic;
 
 namespace PlaylistShared.Api.Controllers;

PlaylistShared.Api/Controllers/SharedPlaylistController.cs

@@ -4,8 +4,9 @@ using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
+using PlaylistShared.Shared;
 using PlaylistShared.Shared.DTO;
-using PlaylistShared.Shared.Models;
+using PlaylistShared.Shared.Shared;
 using YandexMusic.API.Models.Playlist;
 
 [ApiController]

PlaylistShared.Api/Controllers/YandexTokenController.cs

@@ -4,7 +4,8 @@ using Microsoft.AspNetCore.Mvc;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared;
+using PlaylistShared.Shared.Profile;
 
 namespace PlaylistShared.Api.Controllers;
 

PlaylistShared.Api/Data/Migrations/20260412171234_InitialCreate.cs

@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

PlaylistShared.Api/Mapping/AppMappingProfile.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using PlaylistShared.Api.Entities;
-using PlaylistShared.Shared.Models;
+using PlaylistShared.Shared.Auth;
+using PlaylistShared.Shared.Shared;
 
 namespace PlaylistShared.Api.Mapping;
 

PlaylistShared.Api/Services/SharedPlaylistService.cs

@@ -2,9 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using PlaylistShared.Api.Data;
 using PlaylistShared.Api.Entities;
-using PlaylistShared.Shared.DTO;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Models;
+using PlaylistShared.Shared.Playlist;
+using PlaylistShared.Shared.Shared;
 
 namespace PlaylistShared.Api.Services;
 

PlaylistShared.Pwa/Pages/Login.razor

@@ -1,4 +1,5 @@
 @page "/login"
+@using PlaylistShared.Shared.Auth
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Pwa.Services
 @inject HttpClient Http

PlaylistShared.Pwa/Pages/MyPlaylists.razor

@@ -1,6 +1,7 @@
 @page "/my-playlists"
 @attribute [Authorize]
 @using PlaylistShared.Shared.DTO
+@using PlaylistShared.Shared.Playlist
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation

PlaylistShared.Pwa/Pages/Register.razor

@@ -1,4 +1,5 @@
 @page "/register"
+@using PlaylistShared.Shared.Auth
 @inject HttpClient Http
 @inject AuthStateProvider AuthProvider
 @inject NavigationManager Navigation

PlaylistShared.Pwa/Pages/SharedPlaylistView.razor

@@ -2,7 +2,7 @@
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Shared.Enums
 @using PlaylistShared.Pwa.Services
-@using PlaylistShared.Shared.Models
+@using PlaylistShared.Shared.Shared
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation

PlaylistShared.Pwa/Services/ApiClient.cs

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

PlaylistShared.Pwa/_Imports.razor

@@ -12,4 +12,4 @@
 @using PlaylistShared.Pwa.Services
 @using MudBlazor
 @using Microsoft.AspNetCore.Authorization
-@using PlaylistShared.Shared.DTO
+@using PlaylistShared.Shared

PlaylistShared.Shared/ApiResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared;
 
 /// <summary>Универсальный контейнер ответа API.</summary>
 /// <typeparam name="T">Тип данных ответа.</typeparam>

PlaylistShared.Shared/Auth/ApplicationUserDto.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Models;
+namespace PlaylistShared.Shared.Auth;
 
 /// <summary>DTO пользователя (без конфиденциальных данных).</summary>
 public class ApplicationUserDto

PlaylistShared.Shared/Auth/LoginRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Auth;
 
 /// <summary>Запрос на вход по паролю.</summary>
 public class LoginRequest

PlaylistShared.Shared/Auth/LoginResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Auth;
 
 /// <summary>Ответ после успешного входа.</summary>
 public class LoginResponse

PlaylistShared.Shared/Auth/RegisterRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Auth;
 
 /// <summary>Запрос на регистрацию нового пользователя.</summary>
 public class RegisterRequest

PlaylistShared.Shared/ErrorResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared;
 
 /// <summary>Стандартный ответ сервера при ошибке.</summary>
 public class ErrorResponse

PlaylistShared.Shared/Playlist/SharePlaylistDto.cs

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

PlaylistShared.Shared/Playlist/SharePlaylistRequest.cs

@@ -0,0 +1,7 @@
+namespace PlaylistShared.Shared.Playlist;
+
+public class SharePlaylistRequest
+{
+    public string Kind { get; set; }
+    public string OwnerUid { get; set; }
+}

PlaylistShared.Shared/Playlist/YandexPlaylistInfo.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Playlist;
 
 /// <summary>Информация о плейлисте из Яндекс.Музыки (для импорта).</summary>
 public class YandexPlaylistInfo
@@ -37,9 +37,3 @@ public class YandexPlaylistInfo
     [JsonPropertyName("shareToken")]
     public string? ShareToken { get; set; }
 }
-
-public class SharePlaylistRequest
-{
-    public string Kind { get; set; }
-    public string OwnerUid { get; set; }
-}

PlaylistShared.Shared/Profile/SetYandexTokenRequest.cs

@@ -1,4 +1,4 @@
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Profile;
 
 public class SetYandexTokenRequest
 {

PlaylistShared.Shared/Profile/YandexTokenStatus.cs

@@ -1,4 +1,4 @@
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Profile;
 
 public class YandexTokenStatus
 {

PlaylistShared.Shared/Shared/AddTrackByLinkRequest.cs

@@ -1,4 +1,4 @@
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Shared;
 
 public class AddTrackByLinkRequest
 {

PlaylistShared.Shared/Shared/AddTracksRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Shared;
 
 public class AddTracksRequest
 {

PlaylistShared.Shared/Shared/SharedPlaylistDto.cs

@@ -1,7 +1,8 @@
-using PlaylistShared.Shared.Enums;
+using PlaylistShared.Shared.Auth;
+using PlaylistShared.Shared.Enums;
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Models;
+namespace PlaylistShared.Shared.Shared;
 
 /// <summary>DTO шеринг-плейлиста (без навигационных свойств).</summary>
 public class SharedPlaylistDto

PlaylistShared.Shared/Shared/UpdatePermissionsDto.cs

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

PlaylistShared.Shared/Shared/YandexPlaylistData.cs

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