From 1b4778f499726d138d83ed119f0c56b2e670cf8e Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Wed, 5 Jun 2024 17:53:50 +0200 Subject: [PATCH 1/6] Add TutorLizard.Blazor project and configure Razor components --- TutorLizard.Blazor/Components/_Imports.razor | 10 ++++++++++ TutorLizard.Blazor/Program.cs | 5 +++++ TutorLizard.Blazor/TutorLizard.Blazor.csproj | 15 +++++++++++++++ TutorLizard.Web/Components/App.razor | 1 + TutorLizard.Web/Components/_Imports.razor | 10 ++++++++++ TutorLizard.Web/Program.cs | 11 +++++++++++ TutorLizard.Web/TutorLizard.Web.csproj | 2 ++ TutorLizard.Web/Views/Shared/_Layout.cshtml | 1 + TutorLizard.Web/Views/_ViewImports.cshtml | 1 + TutorLizard.sln | 10 ++++++++-- 10 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 TutorLizard.Blazor/Components/_Imports.razor create mode 100644 TutorLizard.Blazor/Program.cs create mode 100644 TutorLizard.Blazor/TutorLizard.Blazor.csproj create mode 100644 TutorLizard.Web/Components/App.razor create mode 100644 TutorLizard.Web/Components/_Imports.razor diff --git a/TutorLizard.Blazor/Components/_Imports.razor b/TutorLizard.Blazor/Components/_Imports.razor new file mode 100644 index 00000000..1db2b846 --- /dev/null +++ b/TutorLizard.Blazor/Components/_Imports.razor @@ -0,0 +1,10 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using TutorLizard.Blazor +@using TutorLizard.Blazor.Components \ No newline at end of file diff --git a/TutorLizard.Blazor/Program.cs b/TutorLizard.Blazor/Program.cs new file mode 100644 index 00000000..519269f2 --- /dev/null +++ b/TutorLizard.Blazor/Program.cs @@ -0,0 +1,5 @@ +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; + +var builder = WebAssemblyHostBuilder.CreateDefault(args); + +await builder.Build().RunAsync(); diff --git a/TutorLizard.Blazor/TutorLizard.Blazor.csproj b/TutorLizard.Blazor/TutorLizard.Blazor.csproj new file mode 100644 index 00000000..482eac80 --- /dev/null +++ b/TutorLizard.Blazor/TutorLizard.Blazor.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + true + Default + + + + + + + diff --git a/TutorLizard.Web/Components/App.razor b/TutorLizard.Web/Components/App.razor new file mode 100644 index 00000000..caf75c0e --- /dev/null +++ b/TutorLizard.Web/Components/App.razor @@ -0,0 +1 @@ +@* No-op App component *@ \ No newline at end of file diff --git a/TutorLizard.Web/Components/_Imports.razor b/TutorLizard.Web/Components/_Imports.razor new file mode 100644 index 00000000..47b8772d --- /dev/null +++ b/TutorLizard.Web/Components/_Imports.razor @@ -0,0 +1,10 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using TutorLizard.Blazor +@using TutorLizard.Blazor.Components diff --git a/TutorLizard.Web/Program.cs b/TutorLizard.Web/Program.cs index c5f558c6..9c324717 100644 --- a/TutorLizard.Web/Program.cs +++ b/TutorLizard.Web/Program.cs @@ -6,6 +6,7 @@ using TutorLizard.BusinessLogic.Services; using TutorLizard.Web.Interfaces.Services; using TutorLizard.Web.Services; +using TutorLizard.Web.Components; var builder = WebApplication.CreateBuilder(args); @@ -13,6 +14,10 @@ builder.Services.AddControllersWithViews(); builder.Services.AddHttpContextAccessor(); builder.Services.AddRazorPages(); +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents() + .AddInteractiveWebAssemblyComponents(); + builder.Services.AddTransient(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -66,9 +71,15 @@ app.UseRouting(); app.UseAuthorization(); +app.UseAntiforgery(); app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); +app.MapRazorComponents() + .AddInteractiveServerRenderMode() + .AddInteractiveWebAssemblyRenderMode() + .AddAdditionalAssemblies(typeof(TutorLizard.Blazor.Components._Imports).Assembly); + app.Run(); diff --git a/TutorLizard.Web/TutorLizard.Web.csproj b/TutorLizard.Web/TutorLizard.Web.csproj index 29f278f9..7a97931b 100644 --- a/TutorLizard.Web/TutorLizard.Web.csproj +++ b/TutorLizard.Web/TutorLizard.Web.csproj @@ -9,6 +9,7 @@ + @@ -20,6 +21,7 @@ + diff --git a/TutorLizard.Web/Views/Shared/_Layout.cshtml b/TutorLizard.Web/Views/Shared/_Layout.cshtml index 31889f69..50d37d6e 100644 --- a/TutorLizard.Web/Views/Shared/_Layout.cshtml +++ b/TutorLizard.Web/Views/Shared/_Layout.cshtml @@ -75,6 +75,7 @@ + @await RenderSectionAsync("Scripts", required: false) diff --git a/TutorLizard.Web/Views/_ViewImports.cshtml b/TutorLizard.Web/Views/_ViewImports.cshtml index d8560b62..b0094b4f 100644 --- a/TutorLizard.Web/Views/_ViewImports.cshtml +++ b/TutorLizard.Web/Views/_ViewImports.cshtml @@ -7,4 +7,5 @@ @using TutorLizard.BusinessLogic.Models.DTOs.Responses @using TutorLizard.BusinessLogic.Models.DTOs.Requests @using TutorLizard.Web.Strings +@using TutorLizard.Blazor.Components @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/TutorLizard.sln b/TutorLizard.sln index af681556..766b78a2 100644 --- a/TutorLizard.sln +++ b/TutorLizard.sln @@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.Web", "TutorLiz EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DD9B1FDE-1E39-4C45-A1A0-8D3AE694CB2F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorLizard.BusinessLogic.Tests", "Tests\TutorLizard.BusinessLogic.Tests\TutorLizard.BusinessLogic.Tests.csproj", "{1F175297-3AF6-430A-B36E-353FC1B9F9F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.BusinessLogic.Tests", "Tests\TutorLizard.BusinessLogic.Tests\TutorLizard.BusinessLogic.Tests.csproj", "{1F175297-3AF6-430A-B36E-353FC1B9F9F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorLizard.Web.Tests", "Tests\TutorLizard.Web.Tests\TutorLizard.Web.Tests.csproj", "{8CA651DA-9229-4722-80D0-6F49E06DDBD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.Web.Tests", "Tests\TutorLizard.Web.Tests\TutorLizard.Web.Tests.csproj", "{8CA651DA-9229-4722-80D0-6F49E06DDBD3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.Blazor", "TutorLizard.Blazor\TutorLizard.Blazor.csproj", "{C178E212-D193-4128-B9E4-C77341B478BE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -35,6 +37,10 @@ Global {8CA651DA-9229-4722-80D0-6F49E06DDBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CA651DA-9229-4722-80D0-6F49E06DDBD3}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CA651DA-9229-4722-80D0-6F49E06DDBD3}.Release|Any CPU.Build.0 = Release|Any CPU + {C178E212-D193-4128-B9E4-C77341B478BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C178E212-D193-4128-B9E4-C77341B478BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C178E212-D193-4128-B9E4-C77341B478BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C178E212-D193-4128-B9E4-C77341B478BE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From eeb9cd6c419d28a00db274642d908225c3f6844f Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Wed, 5 Jun 2024 17:55:03 +0200 Subject: [PATCH 2/6] Remove not needed _Imports.razor file --- TutorLizard.Web/Components/_Imports.razor | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 TutorLizard.Web/Components/_Imports.razor diff --git a/TutorLizard.Web/Components/_Imports.razor b/TutorLizard.Web/Components/_Imports.razor deleted file mode 100644 index 47b8772d..00000000 --- a/TutorLizard.Web/Components/_Imports.razor +++ /dev/null @@ -1,10 +0,0 @@ -@using System.Net.Http -@using System.Net.Http.Json -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.JSInterop -@using TutorLizard.Blazor -@using TutorLizard.Blazor.Components From 96e6f3b830d799b0f66f0e943c1b27e6974bd245 Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Mon, 10 Jun 2024 19:04:55 +0200 Subject: [PATCH 3/6] Add back a NuGet package reference deleted during merge --- TutorLizard.Web/TutorLizard.Web.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/TutorLizard.Web/TutorLizard.Web.csproj b/TutorLizard.Web/TutorLizard.Web.csproj index 0adb2d10..4ee8a358 100644 --- a/TutorLizard.Web/TutorLizard.Web.csproj +++ b/TutorLizard.Web/TutorLizard.Web.csproj @@ -9,6 +9,7 @@ + From 5bc9d0c68d0127543b856a8f339c413dc0ab9e35 Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Mon, 10 Jun 2024 19:46:51 +0200 Subject: [PATCH 4/6] Add TutorLizard.Shared project, move DTOs and Enums to it --- TutorLizard.Blazor/TutorLizard.Blazor.csproj | 4 ++ .../Repositories/Json/UserJsonRepository.cs | 2 +- TutorLizard.BusinessLogic/Enums/UserType.cs | 3 -- .../Extensions/DtoExtensions.cs | 34 +++++--------- .../Data/Repositories/IUserRepository.cs | 3 +- .../Interfaces/Services/IBrowseService.cs | 4 +- .../Interfaces/Services/IStudentService.cs | 5 +- .../Interfaces/Services/ITutorService.cs | 4 +- .../Interfaces/Services/IUserService.cs | 4 +- .../Models/DTOs/AdDto.cs | 46 ------------------- .../Models/DTOs/AdRequestDto.cs | 35 -------------- .../Models/DTOs/CategoryDto.cs | 20 -------- .../Models/DTOs/ScheduleItemDto.cs | 29 ------------ .../Models/DTOs/ScheduleItemRequestDto.cs | 18 -------- .../Models/DTOs/UserDto.cs | 34 -------------- TutorLizard.BusinessLogic/Models/User.cs | 2 +- .../Services/BrowseService.cs | 8 ++-- .../Services/StudentService.cs | 7 ++- .../Services/TutorService.cs | 6 +-- .../Services/UserService.cs | 4 +- .../TutorLizard.BusinessLogic.csproj | 4 ++ .../Enums/AdToUserRelationship.cs | 2 +- TutorLizard.Shared/Enums/UserType.cs | 3 ++ .../Models/DTOs/AdListItemDto.cs | 2 +- .../Models/DTOs/AdRequestsListDto.cs | 2 +- TutorLizard.Shared/Models/DTOs/CategoryDto.cs | 15 ++++++ .../AcceptScheduleItemRequestRequest.cs | 2 +- .../DTOs/Requests/AdRequestStatusRequest.cs | 2 +- .../Requests/AvailableScheduleForAdRequest.cs | 2 +- .../Models/DTOs/Requests/CreateAdRequest.cs | 2 +- .../DTOs/Requests/CreateAdRequestRequest.cs | 2 +- .../Requests/CreateScheduleItemRequest.cs | 2 +- .../CreateScheduleItemRequestRequest.cs | 2 +- .../DTOs/Requests/GetAdDetailsRequest.cs | 2 +- .../DTOs/Requests/GetBrowseAdsPageRequest.cs | 2 +- .../DTOs/Requests/GetUsersScheduleRequest.cs | 2 +- .../DTOs/Requests/IsUserTheAdOwnerRequest.cs | 2 +- .../Requests/StudentCancelAdRequestRequest.cs | 2 +- .../Requests/StudentsAcceptedAdsRequest.cs | 2 +- .../Requests/StudentsAdRequestsRequest.cs | 2 +- .../Requests/TutorAllAdRequestsRequest.cs | 2 +- .../Models/DTOs/Requests/TutorsAdsRequest.cs | 8 ++-- .../TutorsPendingAdRequestsRequest.cs | 2 +- .../Requests/TutorsScheduleForAdRequest.cs | 2 +- .../UnacceptScheduleItemRequestRequest.cs | 2 +- .../UpdateTutorsPendingAdRequestRequest.cs | 2 +- .../AcceptScheduleItemRequestResponse.cs | 2 +- .../DTOs/Responses/AdRequestStatusResponse.cs | 2 +- .../AvailableScheduleForAdResponse.cs | 2 +- .../DTOs/Responses/CreateAdRequestResponse.cs | 2 +- .../Models/DTOs/Responses/CreateAdResponse.cs | 2 +- .../CreateScheduleItemRequestResponse.cs | 2 +- .../Responses/CreateScheduleItemResponse.cs | 2 +- .../DTOs/Responses/GetAdDetailsResponse.cs | 4 +- .../Responses/GetBrowseAdsPageResponse.cs | 2 +- .../Responses/GetUsersScheduleResponse.cs | 2 +- .../Responses/IsUserTheAdOwnerResponse.cs | 2 +- .../StudentCancelAdRequestResponse.cs | 2 +- .../Responses/StudentsAcceptedAdsResponse.cs | 2 +- .../Responses/StudentsAdRequestsResponse.cs | 2 +- .../Responses/TutorAllAdRequestsResponse.cs | 2 +- .../DTOs/Responses/TutorsAdsResponse.cs | 2 +- .../TutorsPendingAdRequestsResponse.cs | 2 +- .../Responses/TutorsScheduleForAdResponse.cs | 2 +- .../UnacceptScheduleItemRequestResponse.cs | 2 +- .../UpdateTutorsPendingAdRequestResponse.cs | 2 +- .../Models/DTOs/ScheduleItemDto.cs | 16 +++++++ .../DTOs/StudentScheduleItemRequestDto.cs | 2 +- .../DTOs/StudentsScheduleItemSummaryDto.cs | 2 +- .../Models/DTOs/TutorsScheduleItemDto.cs | 2 +- .../DTOs/TutorsScheduleItemRequestDto.cs | 2 +- .../DTOs/TutorsScheduleItemSummaryDto.cs | 2 +- TutorLizard.Shared/Models/DTOs/UserDto.cs | 21 +++++++++ TutorLizard.Shared/TutorLizard.Shared.csproj | 9 ++++ .../Controllers/AccountController.cs | 2 +- TutorLizard.Web/Controllers/AdController.cs | 2 +- .../Controllers/BrowseController.cs | 4 +- .../Controllers/StudentController.cs | 11 ++--- .../Controllers/TutorController.cs | 8 ++-- .../Services/IUserAuthenticationService.cs | 2 +- TutorLizard.Web/Models/RegisterUserModel.cs | 2 +- .../Services/UserAuthenticationService.cs | 2 +- TutorLizard.Web/TutorLizard.Web.csproj | 1 + .../ViewComponents/AdRequestStatusForAd.cs | 4 +- .../ViewComponents/AvailableScheduleForAd.cs | 9 ++-- .../ViewComponents/CreateRequestForAd.cs | 2 +- .../ViewComponents/TutorsScheduleForAd.cs | 4 +- .../AvailableScheduleForAd/Default.cshtml | 2 +- TutorLizard.Web/Views/_ViewImports.cshtml | 10 ++-- TutorLizard.sln | 6 +++ 90 files changed, 195 insertions(+), 320 deletions(-) delete mode 100644 TutorLizard.BusinessLogic/Enums/UserType.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/AdDto.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/AdRequestDto.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/CategoryDto.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemDto.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemRequestDto.cs delete mode 100644 TutorLizard.BusinessLogic/Models/DTOs/UserDto.cs rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Enums/AdToUserRelationship.cs (68%) create mode 100644 TutorLizard.Shared/Enums/UserType.cs rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/AdListItemDto.cs (96%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/AdRequestsListDto.cs (96%) create mode 100644 TutorLizard.Shared/Models/DTOs/CategoryDto.cs rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs (69%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/AdRequestStatusRequest.cs (64%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs (83%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/CreateAdRequest.cs (97%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/CreateAdRequestRequest.cs (89%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/CreateScheduleItemRequest.cs (93%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs (82%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/GetAdDetailsRequest.cs (63%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs (74%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/GetUsersScheduleRequest.cs (55%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs (74%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs (64%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs (85%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/StudentsAdRequestsRequest.cs (77%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs (74%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/TutorsAdsRequest.cs (54%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs (75%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs (65%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs (69%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs (83%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs (58%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/AdRequestStatusResponse.cs (88%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs (85%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/CreateAdRequestResponse.cs (56%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/CreateAdResponse.cs (66%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs (83%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/CreateScheduleItemResponse.cs (82%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/GetAdDetailsResponse.cs (84%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs (80%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/GetUsersScheduleResponse.cs (77%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs (62%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs (59%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs (80%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/StudentsAdRequestsResponse.cs (70%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs (64%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/TutorsAdsResponse.cs (80%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs (65%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs (71%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs (59%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs (61%) create mode 100644 TutorLizard.Shared/Models/DTOs/ScheduleItemDto.cs rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/StudentScheduleItemRequestDto.cs (86%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/StudentsScheduleItemSummaryDto.cs (87%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/TutorsScheduleItemDto.cs (81%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/TutorsScheduleItemRequestDto.cs (86%) rename {TutorLizard.BusinessLogic => TutorLizard.Shared}/Models/DTOs/TutorsScheduleItemSummaryDto.cs (84%) create mode 100644 TutorLizard.Shared/Models/DTOs/UserDto.cs create mode 100644 TutorLizard.Shared/TutorLizard.Shared.csproj diff --git a/TutorLizard.Blazor/TutorLizard.Blazor.csproj b/TutorLizard.Blazor/TutorLizard.Blazor.csproj index 482eac80..1fd99884 100644 --- a/TutorLizard.Blazor/TutorLizard.Blazor.csproj +++ b/TutorLizard.Blazor/TutorLizard.Blazor.csproj @@ -12,4 +12,8 @@ + + + + diff --git a/TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs b/TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs index f46d22b2..983e9b2e 100644 --- a/TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs +++ b/TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Options; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Models; using TutorLizard.BusinessLogic.Options; diff --git a/TutorLizard.BusinessLogic/Enums/UserType.cs b/TutorLizard.BusinessLogic/Enums/UserType.cs deleted file mode 100644 index 5add649c..00000000 --- a/TutorLizard.BusinessLogic/Enums/UserType.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace TutorLizard.BusinessLogic.Enums; - -public enum UserType { Regular, Admin } diff --git a/TutorLizard.BusinessLogic/Extensions/DtoExtensions.cs b/TutorLizard.BusinessLogic/Extensions/DtoExtensions.cs index 1882bc47..e968dece 100644 --- a/TutorLizard.BusinessLogic/Extensions/DtoExtensions.cs +++ b/TutorLizard.BusinessLogic/Extensions/DtoExtensions.cs @@ -1,30 +1,18 @@ using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; +using TutorLizard.Shared.Models.DTOs; namespace TutorLizard.BusinessLogic.Extensions; public static class DtoExtensions { - private static readonly ScheduleItemDto.ScheduleItemRequestStatus status; + public static CategoryDto ToDto(this Category category) + => new CategoryDto(category.Id, + category.Name, + category.Description); - public static AdDto ToDto(this Ad ad) => new AdDto(ad); - public static AdRequestDto ToDto(this AdRequest adRequest) => new AdRequestDto(adRequest); - public static CategoryDto ToDto(this Category category) => new CategoryDto(category); - public static ScheduleItemDto ToDto(this ScheduleItem scheduleItem) => new ScheduleItemDto(scheduleItem, status); - public static ScheduleItemRequestDto ToDto(this ScheduleItemRequest scheduleItemRequest) => new ScheduleItemRequestDto(scheduleItemRequest); - public static UserDto ToDto(this User user) => new UserDto(user); - - public static AdListItemDto ToAdListItemDto(this Ad ad) - { - return new AdListItemDto(id: ad.Id, - tutorId: ad.TutorId, - tutorName: ad.User.Name, - subject: ad.Subject, - title: ad.Title, - description: ad.Description, - categoryId: ad.CategoryId, - categoryName: ad.Category.Name, - price: ad.Price, - location: ad.Location, - isRemote: ad.IsRemote); - } + public static UserDto ToDto(this User user) + => new UserDto(user.Id, + user.Name, + user.UserType, + user.Email, + user.DateCreated); } diff --git a/TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs b/TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs index 55018a8f..1e1c07f1 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs @@ -1,6 +1,5 @@ -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; namespace TutorLizard.BusinessLogic.Interfaces.Data.Repositories; public interface IUserRepository diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/IBrowseService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/IBrowseService.cs index c212783f..bee02453 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/IBrowseService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/IBrowseService.cs @@ -1,5 +1,5 @@ -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Interfaces.Services; diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs index 37695307..346a10e6 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs @@ -1,6 +1,5 @@ -using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Interfaces.Services; diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs index e4f8e9ff..42eb42bb 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs @@ -1,5 +1,5 @@ -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Interfaces.Services; diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs index 9c1bfa0f..5b58aad6 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs @@ -1,5 +1,5 @@ -using TutorLizard.BusinessLogic.Enums; -using TutorLizard.BusinessLogic.Models.DTOs; +using TutorLizard.Shared.Enums; +using TutorLizard.Shared.Models.DTOs; namespace TutorLizard.BusinessLogic.Interfaces.Services; diff --git a/TutorLizard.BusinessLogic/Models/DTOs/AdDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/AdDto.cs deleted file mode 100644 index d04bb157..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/AdDto.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class AdDto -{ - public int Id { get; set; } - public int TutorId { get; set; } - - [Required(ErrorMessage = "Please provide subject!")] - [StringLength(25)] - public string Subject { get; set; } - - [Required(ErrorMessage = "Please provide title!")] - [StringLength(25)] - public string Title { get; set; } - - [Required(ErrorMessage = "Please provide description!")] - [StringLength(250)] - public string Description { get; set; } - - [Display(Name = "Category")] - [Required(ErrorMessage = "Please provide category!")] - public int CategoryId { get; set; } - - [Required(ErrorMessage = "Please provide price!")] - [Range(0, double.MaxValue, ErrorMessage = "The price must be greater than 0!")] - public decimal Price { get; set; } - - [Required(ErrorMessage = "Please provide location!")] - [StringLength(25)] - public string Location { get; set; } - public bool IsRemote { get; set; } - - public AdDto(Ad ad) - { - Id = ad.Id; - TutorId = ad.TutorId; - Subject = ad.Subject; - Title = ad.Title; - Description = ad.Description; - CategoryId = ad.CategoryId; - Price = ad.Price; - Location = ad.Location; - IsRemote = ad.IsRemote; - } -} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/AdRequestDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/AdRequestDto.cs deleted file mode 100644 index b9b044aa..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/AdRequestDto.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class AdRequestDto -{ - public int Id { get; set; } - - [Required(ErrorMessage = "Please provide Ad Id!")] - [Range(0, int.MaxValue, ErrorMessage = "Ad Id must be greater than 0!")] - public int AdId { get; set; } - - [Required(ErrorMessage = "Please provide your id!")] - [Range(0, int.MaxValue, ErrorMessage = "Id must be greater than 0!")] - public int StudentId { get; set; } - public bool IsAccepted { get; set; } - - [Required(ErrorMessage = "Please write a message!")] - [MaxLength(150)] - public string Message { get; set; } - public string? ReplyMessage { get; set; } - public DateTime? ReviewDate { get; set; } - public bool IsRemote { get; set; } - - public AdRequestDto(AdRequest adRequest) - { - Id = adRequest.Id; - AdId = adRequest.AdId; - StudentId = adRequest.StudentId; - IsAccepted = adRequest.IsAccepted; - Message = adRequest.Message; - ReplyMessage = adRequest.ReplyMessage; - ReviewDate = adRequest.ReviewDate; - IsRemote = adRequest.IsRemote; - } -} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/CategoryDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/CategoryDto.cs deleted file mode 100644 index 7ccd43b5..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/CategoryDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class CategoryDto -{ - public int Id { get; set; } - - [Required] - [MinLength(1)] - [MaxLength(20)] - public string Name { get; set; } - public string? Description { get; set; } - - public CategoryDto(Category category) - { - Id = category.Id; - Name = category.Name; - Description = category.Description; - } -} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemDto.cs deleted file mode 100644 index 8b3f0b0f..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class ScheduleItemDto -{ - public int Id { get; set; } - public int AdId { get; set; } - public DateTime DateTime { get; set; } - public ScheduleItemRequestStatus Status { get; set; } - - public ScheduleItemDto(ScheduleItem scheduleItem, ScheduleItemRequestStatus status) - { - Id = scheduleItem.Id; - AdId = scheduleItem.AdId; - DateTime = scheduleItem.DateTime; - Status = status; - } - - public ScheduleItemDto() - { - - } - - public enum ScheduleItemRequestStatus - { - Accepted, - Pending, - Rejected, - RequestNotSent - } -} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemRequestDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemRequestDto.cs deleted file mode 100644 index 4db732df..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/ScheduleItemRequestDto.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class ScheduleItemRequestDto -{ - public int Id { get; set; } - public int ScheduleItemId { get; set; } - public int StudentId { get; set; } - public bool IsAccepted { get; set; } - public bool IsRemote { get; set; } - - public ScheduleItemRequestDto(ScheduleItemRequest scheduleItemRequest) - { - Id = scheduleItemRequest.Id; - ScheduleItemId = scheduleItemRequest.ScheduleItemId; - StudentId = scheduleItemRequest.StudentId; - IsAccepted = scheduleItemRequest.IsAccepted; - IsRemote = scheduleItemRequest.IsRemote; - } -} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/UserDto.cs b/TutorLizard.BusinessLogic/Models/DTOs/UserDto.cs deleted file mode 100644 index 3002b166..00000000 --- a/TutorLizard.BusinessLogic/Models/DTOs/UserDto.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using TutorLizard.BusinessLogic.Enums; - -namespace TutorLizard.BusinessLogic.Models.DTOs; -public class UserDto -{ - public int Id { get; set; } - - [Required(ErrorMessage = "Podaj nazwę użytkownika.")] - [Display(Name = "Nazwa użytkownika")] - [MinLength(5, ErrorMessage = "Minimalna długość: 5 znaków")] - [MaxLength(20, ErrorMessage = "Maksymalna długość: 20 znaków")] - public string Name { get; set; } - - [Display(Name = "Typ użytkownika")] - public UserType UserType { get; set; } - - [Required(ErrorMessage = "Podaj adres email.")] - [EmailAddress(ErrorMessage = "Podaj prawidłowy adres email.")] - [Display(Name = "Adres email")] - public string Email { get; set; } - - [Display(Name = "Data rejestracji")] - public DateTime DateCreated { get; set; } = DateTime.Now; - - public UserDto(User user) - { - Id = user.Id; - Name = user.Name; - UserType = user.UserType; - Email = user.Email; - DateCreated = user.DateCreated; - } -} diff --git a/TutorLizard.BusinessLogic/Models/User.cs b/TutorLizard.BusinessLogic/Models/User.cs index 59ac7641..f06d9590 100644 --- a/TutorLizard.BusinessLogic/Models/User.cs +++ b/TutorLizard.BusinessLogic/Models/User.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; namespace TutorLizard.BusinessLogic.Models; diff --git a/TutorLizard.BusinessLogic/Services/BrowseService.cs b/TutorLizard.BusinessLogic/Services/BrowseService.cs index 9bf8f721..949f2f7e 100644 --- a/TutorLizard.BusinessLogic/Services/BrowseService.cs +++ b/TutorLizard.BusinessLogic/Services/BrowseService.cs @@ -1,11 +1,11 @@ using Microsoft.EntityFrameworkCore; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Interfaces.Services; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Services; public class BrowseService : IBrowseService diff --git a/TutorLizard.BusinessLogic/Services/StudentService.cs b/TutorLizard.BusinessLogic/Services/StudentService.cs index 21ed1c49..2d12cd30 100644 --- a/TutorLizard.BusinessLogic/Services/StudentService.cs +++ b/TutorLizard.BusinessLogic/Services/StudentService.cs @@ -1,11 +1,10 @@ using Microsoft.EntityFrameworkCore; -using System.Runtime.InteropServices; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Interfaces.Services; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Services; public class StudentService : IStudentService diff --git a/TutorLizard.BusinessLogic/Services/TutorService.cs b/TutorLizard.BusinessLogic/Services/TutorService.cs index e96b525a..64d0db7a 100644 --- a/TutorLizard.BusinessLogic/Services/TutorService.cs +++ b/TutorLizard.BusinessLogic/Services/TutorService.cs @@ -2,9 +2,9 @@ using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Interfaces.Services; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Services; public class TutorService : ITutorService diff --git a/TutorLizard.BusinessLogic/Services/UserService.cs b/TutorLizard.BusinessLogic/Services/UserService.cs index 4110ccb5..fb3a3c87 100644 --- a/TutorLizard.BusinessLogic/Services/UserService.cs +++ b/TutorLizard.BusinessLogic/Services/UserService.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Identity; -using TutorLizard.BusinessLogic.Models.DTOs; +using TutorLizard.Shared.Models.DTOs; using TutorLizard.BusinessLogic.Models; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Extensions; using TutorLizard.BusinessLogic.Interfaces.Services; using Microsoft.EntityFrameworkCore; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; namespace TutorLizard.BusinessLogic.Services; diff --git a/TutorLizard.BusinessLogic/TutorLizard.BusinessLogic.csproj b/TutorLizard.BusinessLogic/TutorLizard.BusinessLogic.csproj index 294a3d5d..41ea8726 100644 --- a/TutorLizard.BusinessLogic/TutorLizard.BusinessLogic.csproj +++ b/TutorLizard.BusinessLogic/TutorLizard.BusinessLogic.csproj @@ -22,4 +22,8 @@ + + + + diff --git a/TutorLizard.BusinessLogic/Enums/AdToUserRelationship.cs b/TutorLizard.Shared/Enums/AdToUserRelationship.cs similarity index 68% rename from TutorLizard.BusinessLogic/Enums/AdToUserRelationship.cs rename to TutorLizard.Shared/Enums/AdToUserRelationship.cs index 2c85904e..3f3d54e8 100644 --- a/TutorLizard.BusinessLogic/Enums/AdToUserRelationship.cs +++ b/TutorLizard.Shared/Enums/AdToUserRelationship.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Enums; +namespace TutorLizard.Shared.Enums; public enum AdToUserRelationship { None, diff --git a/TutorLizard.Shared/Enums/UserType.cs b/TutorLizard.Shared/Enums/UserType.cs new file mode 100644 index 00000000..bb83c55b --- /dev/null +++ b/TutorLizard.Shared/Enums/UserType.cs @@ -0,0 +1,3 @@ +namespace TutorLizard.Shared.Enums; + +public enum UserType { Regular, Admin } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/AdListItemDto.cs b/TutorLizard.Shared/Models/DTOs/AdListItemDto.cs similarity index 96% rename from TutorLizard.BusinessLogic/Models/DTOs/AdListItemDto.cs rename to TutorLizard.Shared/Models/DTOs/AdListItemDto.cs index e2ee5e67..4aba0aa1 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/AdListItemDto.cs +++ b/TutorLizard.Shared/Models/DTOs/AdListItemDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class AdListItemDto { public int Id { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/AdRequestsListDto.cs b/TutorLizard.Shared/Models/DTOs/AdRequestsListDto.cs similarity index 96% rename from TutorLizard.BusinessLogic/Models/DTOs/AdRequestsListDto.cs rename to TutorLizard.Shared/Models/DTOs/AdRequestsListDto.cs index 816e285c..e8be5b40 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/AdRequestsListDto.cs +++ b/TutorLizard.Shared/Models/DTOs/AdRequestsListDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class AdRequestsListDto { diff --git a/TutorLizard.Shared/Models/DTOs/CategoryDto.cs b/TutorLizard.Shared/Models/DTOs/CategoryDto.cs new file mode 100644 index 00000000..61b3f942 --- /dev/null +++ b/TutorLizard.Shared/Models/DTOs/CategoryDto.cs @@ -0,0 +1,15 @@ + +namespace TutorLizard.Shared.Models.DTOs; +public class CategoryDto +{ + + public int Id { get; set; } + public string Name { get; set; } + public string? Description { get; set; } + public CategoryDto(int id, string name, string? description) + { + Id = id; + Name = name; + Description = description; + } +} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs similarity index 69% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs index 87d96f68..a708ac2e 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/AcceptScheduleItemRequestRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class AcceptScheduleItemRequestRequest { public int TutorId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AdRequestStatusRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs similarity index 64% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/AdRequestStatusRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs index af77fb36..3b03f596 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AdRequestStatusRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class AdRequestStatusRequest { public int AdId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs similarity index 83% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs index 64524e79..e123d7cf 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class AvailableScheduleForAdRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequest.cs similarity index 97% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequest.cs index a239395a..e94d0cb7 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequest.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class CreateAdRequest { public CreateAdRequest() diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequestRequest.cs similarity index 89% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequestRequest.cs index fd200db1..56f46203 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateAdRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/CreateAdRequestRequest.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class CreateAdRequestRequest { public int StudentId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequest.cs similarity index 93% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequest.cs index 8147625b..7435c413 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequest.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class CreateScheduleItemRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs similarity index 82% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs index 39784bc7..45768f97 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/CreateScheduleItemRequestRequest.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class CreateScheduleItemRequestRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetAdDetailsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetAdDetailsRequest.cs similarity index 63% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/GetAdDetailsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetAdDetailsRequest.cs index 241fa604..f4784ccc 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetAdDetailsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetAdDetailsRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class GetAdDetailsRequest { public int AdId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs similarity index 74% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs index 5d401349..ca7bf186 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetBrowseAdsPageRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class GetBrowseAdsPageRequest(int pageNumber, int pageSize) { public int PageNumber { get; set; } = pageNumber; diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetUsersScheduleRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetUsersScheduleRequest.cs similarity index 55% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/GetUsersScheduleRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetUsersScheduleRequest.cs index 271e80b8..565660eb 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/GetUsersScheduleRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetUsersScheduleRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class GetUsersScheduleRequest { public int UserId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs similarity index 74% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs index fb425f15..a896f29e 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/IsUserTheAdOwnerRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class IsUserTheAdOwnerRequest(int adId, int? userId) { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs similarity index 64% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs index d0bb07fb..8a504e82 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class StudentCancelAdRequestRequest(int adRequestId) { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs similarity index 85% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs index de8a57ba..390eca25 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class StudentsAcceptedAdsRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs similarity index 77% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs index f4e22acc..89e1a405 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/StudentsAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs @@ -1,6 +1,6 @@ using System; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class StudentsAdRequestsRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs similarity index 74% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs index 52949bca..3f8b12ac 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class TutorAllAdRequestsRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsAdsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs similarity index 54% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsAdsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs index 0dfe5653..4392032d 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsAdsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs @@ -3,17 +3,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Responses; -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests +namespace TutorLizard.Shared.Models.DTOs.Requests { public class TutorsAdsRequest { public int TutorId { get; set; } - public TutorsAdsRequest(int? tutorId) + public TutorsAdsRequest(int tutorId) { - TutorId = (int)tutorId; + TutorId = tutorId; } } } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs similarity index 75% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs index 31b5c9b9..14429735 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class TutorsPendingAdRequestsRequest { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs similarity index 65% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs index fb1d83b1..1d192015 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class TutorsScheduleForAdRequest { public int AdId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs similarity index 69% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs index 9a3b5d85..a790b17b 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/UnacceptScheduleItemRequestRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class UnacceptScheduleItemRequestRequest { public int TutorId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs similarity index 83% rename from TutorLizard.BusinessLogic/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs index 48c720cf..c03dbe97 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Requests; +namespace TutorLizard.Shared.Models.DTOs.Requests; public class UpdateTutorsPendingAdRequestRequest(int adRequestId, string replyMessage) { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs similarity index 58% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs index 9363c935..9740d8d5 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/AcceptScheduleItemRequestResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class AcceptScheduleItemRequestResponse { public bool Success { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AdRequestStatusResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs similarity index 88% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/AdRequestStatusResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs index 43d454ab..fea3ba1b 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AdRequestStatusResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class AdRequestStatusResponse { public int Id { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs similarity index 85% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs index dc3ae1e9..5cd5ae36 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class AvailableScheduleForAdResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/CreateAdRequestResponse.cs similarity index 56% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/CreateAdRequestResponse.cs index f59fef33..45e7f057 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/CreateAdRequestResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class CreateAdRequestResponse { public bool Success { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/CreateAdResponse.cs similarity index 66% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/CreateAdResponse.cs index 219c1e99..e2bbf808 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateAdResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/CreateAdResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class CreateAdResponse { public bool SuccessfullyCreated { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs similarity index 83% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs index c66eeda4..be5dea53 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemRequestResponse.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class CreateScheduleItemRequestResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemResponse.cs similarity index 82% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemResponse.cs index 20ca9f52..db3cb29f 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/CreateScheduleItemResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/CreateScheduleItemResponse.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class CreateScheduleItemResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetAdDetailsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetAdDetailsResponse.cs similarity index 84% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/GetAdDetailsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetAdDetailsResponse.cs index 92c84f79..dfd384db 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetAdDetailsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetAdDetailsResponse.cs @@ -1,6 +1,6 @@ -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class GetAdDetailsResponse { public int AdId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs similarity index 80% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs index 62612a17..9f971ea8 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetBrowseAdsPageResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class GetBrowseAdsPageResponse { public bool Success { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetUsersScheduleResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetUsersScheduleResponse.cs similarity index 77% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/GetUsersScheduleResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetUsersScheduleResponse.cs index 4cfe5aed..4039fab2 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/GetUsersScheduleResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetUsersScheduleResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class GetUsersScheduleResponse { public List TutorsSchedule { get; set; } = []; diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs similarity index 62% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs index e85a986c..986d3774 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/IsUserTheAdOwnerResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class IsUserTheAdOwnerResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs similarity index 59% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs index 5a937988..895b720b 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class StudentCancelAdRequestResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs similarity index 80% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs index a73b2337..69d00730 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class StudentsAcceptedAdsResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs similarity index 70% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs index 7f80d6aa..5f6d3ff7 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/StudentsAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs @@ -1,6 +1,6 @@ using System; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class StudentsAdRequestsResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs similarity index 64% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs index d0f4491b..11548151 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class TutorAllAdRequestsResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsAdsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs similarity index 80% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsAdsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs index 51c0a5e5..7e901dc3 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsAdsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses +namespace TutorLizard.Shared.Models.DTOs.Responses { public class TutorsAdsResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs similarity index 65% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs index e5ba4698..42fff85f 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class TutorsPendingAdRequestsResponse { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs similarity index 71% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs index 5e1a5a4e..53169d70 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class TutorsScheduleForAdResponse { public int AdId { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs similarity index 59% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs index 32df8b27..b6515981 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/UnacceptScheduleItemRequestResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class UnacceptScheduleItemRequestResponse { public bool Success { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs similarity index 61% rename from TutorLizard.BusinessLogic/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs index b7e82981..24f257de 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs.Responses; +namespace TutorLizard.Shared.Models.DTOs.Responses; public class UpdateTutorsPendingAdRequestResponse() { diff --git a/TutorLizard.Shared/Models/DTOs/ScheduleItemDto.cs b/TutorLizard.Shared/Models/DTOs/ScheduleItemDto.cs new file mode 100644 index 00000000..b13e2a34 --- /dev/null +++ b/TutorLizard.Shared/Models/DTOs/ScheduleItemDto.cs @@ -0,0 +1,16 @@ +namespace TutorLizard.Shared.Models.DTOs; +public class ScheduleItemDto +{ + public int Id { get; set; } + public int AdId { get; set; } + public DateTime DateTime { get; set; } + public ScheduleItemRequestStatus Status { get; set; } + + public enum ScheduleItemRequestStatus + { + Accepted, + Pending, + Rejected, + RequestNotSent + } +} diff --git a/TutorLizard.BusinessLogic/Models/DTOs/StudentScheduleItemRequestDto.cs b/TutorLizard.Shared/Models/DTOs/StudentScheduleItemRequestDto.cs similarity index 86% rename from TutorLizard.BusinessLogic/Models/DTOs/StudentScheduleItemRequestDto.cs rename to TutorLizard.Shared/Models/DTOs/StudentScheduleItemRequestDto.cs index 9cf23588..8105d0aa 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/StudentScheduleItemRequestDto.cs +++ b/TutorLizard.Shared/Models/DTOs/StudentScheduleItemRequestDto.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace TutorLizard.BusinessLogic.Models.DTOs +namespace TutorLizard.Shared.Models.DTOs { public class StudentScheduleItemRequestDto { diff --git a/TutorLizard.BusinessLogic/Models/DTOs/StudentsScheduleItemSummaryDto.cs b/TutorLizard.Shared/Models/DTOs/StudentsScheduleItemSummaryDto.cs similarity index 87% rename from TutorLizard.BusinessLogic/Models/DTOs/StudentsScheduleItemSummaryDto.cs rename to TutorLizard.Shared/Models/DTOs/StudentsScheduleItemSummaryDto.cs index 28985f74..ef9182b2 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/StudentsScheduleItemSummaryDto.cs +++ b/TutorLizard.Shared/Models/DTOs/StudentsScheduleItemSummaryDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class StudentsScheduleItemSummaryDto { public int Id { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemDto.cs b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemDto.cs similarity index 81% rename from TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemDto.cs rename to TutorLizard.Shared/Models/DTOs/TutorsScheduleItemDto.cs index f086a15b..d9f430c9 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemDto.cs +++ b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class TutorsScheduleItemDto { public int Id { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemRequestDto.cs b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemRequestDto.cs similarity index 86% rename from TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemRequestDto.cs rename to TutorLizard.Shared/Models/DTOs/TutorsScheduleItemRequestDto.cs index fdea2a0e..3404d57e 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemRequestDto.cs +++ b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemRequestDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class TutorsScheduleItemRequestDto { public int Id { get; set; } diff --git a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemSummaryDto.cs b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemSummaryDto.cs similarity index 84% rename from TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemSummaryDto.cs rename to TutorLizard.Shared/Models/DTOs/TutorsScheduleItemSummaryDto.cs index 19b42c61..c93c4c8e 100644 --- a/TutorLizard.BusinessLogic/Models/DTOs/TutorsScheduleItemSummaryDto.cs +++ b/TutorLizard.Shared/Models/DTOs/TutorsScheduleItemSummaryDto.cs @@ -1,4 +1,4 @@ -namespace TutorLizard.BusinessLogic.Models.DTOs; +namespace TutorLizard.Shared.Models.DTOs; public class TutorsScheduleItemSummaryDto { public int Id { get; set; } diff --git a/TutorLizard.Shared/Models/DTOs/UserDto.cs b/TutorLizard.Shared/Models/DTOs/UserDto.cs new file mode 100644 index 00000000..3f8237ce --- /dev/null +++ b/TutorLizard.Shared/Models/DTOs/UserDto.cs @@ -0,0 +1,21 @@ +using System.ComponentModel.DataAnnotations; +using TutorLizard.Shared.Enums; + +namespace TutorLizard.Shared.Models.DTOs; +public class UserDto +{ + public int Id { get; set; } + public string Name { get; set; } + public UserType UserType { get; set; } + public string Email { get; set; } + public DateTime DateCreated { get; set; } = DateTime.Now; + + public UserDto(int id, string name, UserType userType, string email, DateTime dateCreated) + { + Id = id; + Name = name; + UserType = userType; + Email = email; + DateCreated = dateCreated; + } +} diff --git a/TutorLizard.Shared/TutorLizard.Shared.csproj b/TutorLizard.Shared/TutorLizard.Shared.csproj new file mode 100644 index 00000000..fa71b7ae --- /dev/null +++ b/TutorLizard.Shared/TutorLizard.Shared.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/TutorLizard.Web/Controllers/AccountController.cs b/TutorLizard.Web/Controllers/AccountController.cs index 6390d7eb..fd3da6e7 100644 --- a/TutorLizard.Web/Controllers/AccountController.cs +++ b/TutorLizard.Web/Controllers/AccountController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using TutorLizard.BusinessLogic.Enums; using TutorLizard.BusinessLogic.Interfaces.Services; +using TutorLizard.Shared.Enums; using TutorLizard.Web.Interfaces.Services; using TutorLizard.Web.Models; diff --git a/TutorLizard.Web/Controllers/AdController.cs b/TutorLizard.Web/Controllers/AdController.cs index 52d3a635..c025b594 100644 --- a/TutorLizard.Web/Controllers/AdController.cs +++ b/TutorLizard.Web/Controllers/AdController.cs @@ -4,7 +4,7 @@ using TutorLizard.BusinessLogic.Extensions; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; +using TutorLizard.Shared.Models.DTOs; namespace TutorLizard.Web.Controllers { diff --git a/TutorLizard.Web/Controllers/BrowseController.cs b/TutorLizard.Web/Controllers/BrowseController.cs index ab5d4257..bb106a5a 100644 --- a/TutorLizard.Web/Controllers/BrowseController.cs +++ b/TutorLizard.Web/Controllers/BrowseController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; using TutorLizard.Web.Interfaces.Services; namespace TutorLizard.Web.Controllers; diff --git a/TutorLizard.Web/Controllers/StudentController.cs b/TutorLizard.Web/Controllers/StudentController.cs index 8d44471e..ce1e8292 100644 --- a/TutorLizard.Web/Controllers/StudentController.cs +++ b/TutorLizard.Web/Controllers/StudentController.cs @@ -1,11 +1,8 @@ -using Microsoft.AspNetCore.Antiforgery; -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Identity.Client; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; using TutorLizard.Web.Interfaces.Services; namespace TutorLizard.Web.Controllers; @@ -97,7 +94,7 @@ public async Task CreateScheduleItemRequest(int scheduleItemId, i if (response.Success) { _uiMessagesService.ShowSuccessMessage("Zgłoszenie do terminu wysłane."); - return RedirectToAction("AdDetails", "Browse", new {id = adId }); + return RedirectToAction("AdDetails", "Browse", new { id = adId }); } else { diff --git a/TutorLizard.Web/Controllers/TutorController.cs b/TutorLizard.Web/Controllers/TutorController.cs index fa50acda..9e37f54b 100644 --- a/TutorLizard.Web/Controllers/TutorController.cs +++ b/TutorLizard.Web/Controllers/TutorController.cs @@ -7,9 +7,9 @@ using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Interfaces.Services; using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; using TutorLizard.Web.Interfaces.Services; namespace TutorLizard.Web.Controllers; @@ -318,7 +318,7 @@ public async Task TutorsAdsList() return Forbid(); } - TutorsAdsRequest request = new(tutorId); + TutorsAdsRequest request = new((int)tutorId); TutorsAdsResponse response = await _tutorService.ViewTutorsAds(request); diff --git a/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs b/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs index 73b079b0..e4974d5a 100644 --- a/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs +++ b/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs @@ -1,4 +1,4 @@ -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; namespace TutorLizard.BusinessLogic.Interfaces.Services; diff --git a/TutorLizard.Web/Models/RegisterUserModel.cs b/TutorLizard.Web/Models/RegisterUserModel.cs index d73935c8..a58db6f5 100644 --- a/TutorLizard.Web/Models/RegisterUserModel.cs +++ b/TutorLizard.Web/Models/RegisterUserModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; namespace TutorLizard.Web.Models { diff --git a/TutorLizard.Web/Services/UserAuthenticationService.cs b/TutorLizard.Web/Services/UserAuthenticationService.cs index c1c0519a..ad502e91 100644 --- a/TutorLizard.Web/Services/UserAuthenticationService.cs +++ b/TutorLizard.Web/Services/UserAuthenticationService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using System.Security.Claims; -using TutorLizard.BusinessLogic.Enums; +using TutorLizard.Shared.Enums; using TutorLizard.BusinessLogic.Interfaces.Services; namespace TutorLizard.BusinessLogic.Services; diff --git a/TutorLizard.Web/TutorLizard.Web.csproj b/TutorLizard.Web/TutorLizard.Web.csproj index 4ee8a358..eb2bdcae 100644 --- a/TutorLizard.Web/TutorLizard.Web.csproj +++ b/TutorLizard.Web/TutorLizard.Web.csproj @@ -28,6 +28,7 @@ + diff --git a/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs b/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs index 86c88dbf..8bc931dd 100644 --- a/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs +++ b/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.ViewComponents; [ViewComponent(Name = nameof(AdRequestStatusForAd))] diff --git a/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs b/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs index c21c0b8f..4f3332ce 100644 --- a/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs +++ b/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs @@ -1,8 +1,7 @@ -using Microsoft.AspNetCore.Http.HttpResults; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.ViewComponents { @@ -22,7 +21,7 @@ public class AvailableScheduleForAd : ViewComponent public async Task InvokeAsync(int adId) { int? studentId = _userAuthenticationService.GetLoggedInUserId(); - if(studentId is null) + if (studentId is null) { return View(); } diff --git a/TutorLizard.Web/ViewComponents/CreateRequestForAd.cs b/TutorLizard.Web/ViewComponents/CreateRequestForAd.cs index 16009607..9e0fc738 100644 --- a/TutorLizard.Web/ViewComponents/CreateRequestForAd.cs +++ b/TutorLizard.Web/ViewComponents/CreateRequestForAd.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Requests; namespace TutorLizard.Web.ViewComponents; diff --git a/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs b/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs index 82377139..e68054c0 100644 --- a/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs +++ b/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using TutorLizard.BusinessLogic.Interfaces.Services; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.ViewComponents; diff --git a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml index 7bb8378f..40ecc41a 100644 --- a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml +++ b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml @@ -1,4 +1,4 @@ -@using static TutorLizard.BusinessLogic.Models.DTOs.ScheduleItemDto +@using static TutorLizard.Shared.Models.DTOs.ScheduleItemDto @model AvailableScheduleForAdResponse? @if (Model is not null) diff --git a/TutorLizard.Web/Views/_ViewImports.cshtml b/TutorLizard.Web/Views/_ViewImports.cshtml index b0094b4f..828b4f9d 100644 --- a/TutorLizard.Web/Views/_ViewImports.cshtml +++ b/TutorLizard.Web/Views/_ViewImports.cshtml @@ -1,11 +1,11 @@ @using TutorLizard.Web @using TutorLizard.Web.Models -@using TutorLizard.BusinessLogic.Enums +@using TutorLizard.Web.Strings @using TutorLizard.BusinessLogic.Models @using TutorLizard.BusinessLogic.Interfaces.Data.Repositories -@using TutorLizard.BusinessLogic.Models.DTOs -@using TutorLizard.BusinessLogic.Models.DTOs.Responses -@using TutorLizard.BusinessLogic.Models.DTOs.Requests -@using TutorLizard.Web.Strings +@using TutorLizard.Shared.Enums +@using TutorLizard.Shared.Models.DTOs +@using TutorLizard.Shared.Models.DTOs.Responses +@using TutorLizard.Shared.Models.DTOs.Requests @using TutorLizard.Blazor.Components @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/TutorLizard.sln b/TutorLizard.sln index 766b78a2..e082ce82 100644 --- a/TutorLizard.sln +++ b/TutorLizard.sln @@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.Web.Tests", "Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorLizard.Blazor", "TutorLizard.Blazor\TutorLizard.Blazor.csproj", "{C178E212-D193-4128-B9E4-C77341B478BE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorLizard.Shared", "TutorLizard.Shared\TutorLizard.Shared.csproj", "{FA2E2928-556A-4868-8C47-50D371E17580}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -41,6 +43,10 @@ Global {C178E212-D193-4128-B9E4-C77341B478BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C178E212-D193-4128-B9E4-C77341B478BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {C178E212-D193-4128-B9E4-C77341B478BE}.Release|Any CPU.Build.0 = Release|Any CPU + {FA2E2928-556A-4868-8C47-50D371E17580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA2E2928-556A-4868-8C47-50D371E17580}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA2E2928-556A-4868-8C47-50D371E17580}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA2E2928-556A-4868-8C47-50D371E17580}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From a780ffd522dd360797831537db06883b5fcdd35b Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Mon, 10 Jun 2024 19:55:46 +0200 Subject: [PATCH 5/6] Change method, request and response names for consistency --- .../Interfaces/Services/IStudentService.cs | 10 +++---- .../Interfaces/Services/ITutorService.cs | 10 +++---- .../Services/StudentService.cs | 24 ++++++++--------- .../Services/TutorService.cs | 22 ++++++++-------- ...stRequest.cs => DeleteAdRequestRequest.cs} | 2 +- ...equest.cs => GetAdRequestStatusRequest.cs} | 2 +- ...cs => GetAvailableScheduleForAdRequest.cs} | 4 +-- ...st.cs => GetStudentsAcceptedAdsRequest.cs} | 4 +-- ...est.cs => GetStudentsAdRequestsRequest.cs} | 4 +-- ...rsAdsRequest.cs => GetTutorsAdsRequest.cs} | 4 +-- ...st.cs => GetTutorsAllAdRequestsRequest.cs} | 4 +-- ...s => GetTutorsPendingAdRequestsRequest.cs} | 4 +-- ...st.cs => GetTutorsScheduleForAdRequest.cs} | 2 +- ...stRequest.cs => UpdateAdRequestRequest.cs} | 2 +- ...Response.cs => DeleteAdRequestResponse.cs} | 2 +- ...ponse.cs => GetAdRequestStatusResponse.cs} | 2 +- ...s => GetAvailableScheduleForAdResponse.cs} | 2 +- ...e.cs => GetStudentsAcceptedAdsResponse.cs} | 2 +- ...se.cs => GetStudentsAdRequestsResponse.cs} | 2 +- ...AdsResponse.cs => GetTutorsAdsResponse.cs} | 2 +- ...e.cs => GetTutorsAllAdRequestsResponse.cs} | 2 +- ... => GetTutorsPendingAdRequestsResponse.cs} | 2 +- ...e.cs => GetTutorsScheduleForAdResponse.cs} | 2 +- ...Response.cs => UpdateAdRequestResponse.cs} | 2 +- .../Controllers/StudentController.cs | 12 ++++----- .../Controllers/TutorController.cs | 26 +++++++++---------- .../ViewComponents/AdRequestStatusForAd.cs | 4 +-- .../ViewComponents/AvailableScheduleForAd.cs | 4 +-- .../ViewComponents/TutorsScheduleForAd.cs | 4 +-- .../AdRequestStatusForAd/Default.cshtml | 8 +++--- .../AvailableScheduleForAd/Default.cshtml | 2 +- .../TutorsScheduleForAd/Default.cshtml | 2 +- .../Views/Student/AcceptedAds.cshtml | 2 +- .../Views/Student/AdRequests.cshtml | 2 +- .../Views/Tutor/TutorsAdsList.cshtml | 2 +- .../Views/Tutor/ViewAllAdRequests.cshtml | 2 +- .../Views/Tutor/ViewPendingAdRequests.cshtml | 2 +- 37 files changed, 95 insertions(+), 95 deletions(-) rename TutorLizard.Shared/Models/DTOs/Requests/{StudentCancelAdRequestRequest.cs => DeleteAdRequestRequest.cs} (63%) rename TutorLizard.Shared/Models/DTOs/Requests/{AdRequestStatusRequest.cs => GetAdRequestStatusRequest.cs} (77%) rename TutorLizard.Shared/Models/DTOs/Requests/{AvailableScheduleForAdRequest.cs => GetAvailableScheduleForAdRequest.cs} (65%) rename TutorLizard.Shared/Models/DTOs/Requests/{StudentsAcceptedAdsRequest.cs => GetStudentsAcceptedAdsRequest.cs} (72%) rename TutorLizard.Shared/Models/DTOs/Requests/{StudentsAdRequestsRequest.cs => GetStudentsAdRequestsRequest.cs} (61%) rename TutorLizard.Shared/Models/DTOs/Requests/{TutorsAdsRequest.cs => GetTutorsAdsRequest.cs} (79%) rename TutorLizard.Shared/Models/DTOs/Requests/{TutorAllAdRequestsRequest.cs => GetTutorsAllAdRequestsRequest.cs} (58%) rename TutorLizard.Shared/Models/DTOs/Requests/{TutorsPendingAdRequestsRequest.cs => GetTutorsPendingAdRequestsRequest.cs} (56%) rename TutorLizard.Shared/Models/DTOs/Requests/{TutorsScheduleForAdRequest.cs => GetTutorsScheduleForAdRequest.cs} (75%) rename TutorLizard.Shared/Models/DTOs/Requests/{UpdateTutorsPendingAdRequestRequest.cs => UpdateAdRequestRequest.cs} (75%) rename TutorLizard.Shared/Models/DTOs/Responses/{StudentCancelAdRequestResponse.cs => DeleteAdRequestResponse.cs} (70%) rename TutorLizard.Shared/Models/DTOs/Responses/{AdRequestStatusResponse.cs => GetAdRequestStatusResponse.cs} (92%) rename TutorLizard.Shared/Models/DTOs/Responses/{AvailableScheduleForAdResponse.cs => GetAvailableScheduleForAdResponse.cs} (87%) rename TutorLizard.Shared/Models/DTOs/Responses/{StudentsAcceptedAdsResponse.cs => GetStudentsAcceptedAdsResponse.cs} (83%) rename TutorLizard.Shared/Models/DTOs/Responses/{StudentsAdRequestsResponse.cs => GetStudentsAdRequestsResponse.cs} (76%) rename TutorLizard.Shared/Models/DTOs/Responses/{TutorsAdsResponse.cs => GetTutorsAdsResponse.cs} (86%) rename TutorLizard.Shared/Models/DTOs/Responses/{TutorAllAdRequestsResponse.cs => GetTutorsAllAdRequestsResponse.cs} (74%) rename TutorLizard.Shared/Models/DTOs/Responses/{TutorsPendingAdRequestsResponse.cs => GetTutorsPendingAdRequestsResponse.cs} (72%) rename TutorLizard.Shared/Models/DTOs/Responses/{TutorsScheduleForAdResponse.cs => GetTutorsScheduleForAdResponse.cs} (79%) rename TutorLizard.Shared/Models/DTOs/Responses/{UpdateTutorsPendingAdRequestResponse.cs => UpdateAdRequestResponse.cs} (66%) diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs index 346a10e6..48f03c4f 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs @@ -5,11 +5,11 @@ namespace TutorLizard.BusinessLogic.Interfaces.Services; public interface IStudentService { - Task ViewAcceptedAds(StudentsAcceptedAdsRequest request); - Task ViewAdRequests(StudentsAdRequestsRequest request); - Task ViewAdRequestStatus(AdRequestStatusRequest request); - Task DeleteAdRequest(StudentCancelAdRequestRequest request); + Task GetStudentsAcceptedAds(GetStudentsAcceptedAdsRequest request); + Task GetStudentsAdRequests(GetStudentsAdRequestsRequest request); + Task GetAdRequestStatus(GetAdRequestStatusRequest request); + Task DeleteAdRequest(DeleteAdRequestRequest request); Task CreateScheduleItemRequest(CreateScheduleItemRequestRequest request); - Task GetAvailableScheduleForAd(AvailableScheduleForAdRequest request); + Task GetAvailableScheduleForAd(GetAvailableScheduleForAdRequest request); Task CreateAdRequest(CreateAdRequestRequest request); } \ No newline at end of file diff --git a/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs b/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs index 42eb42bb..9a983945 100644 --- a/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs +++ b/TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs @@ -7,12 +7,12 @@ public interface ITutorService { Task AcceptScheduleItemRequest(AcceptScheduleItemRequestRequest request); Task CrateAd(CreateAdRequest request); - Task GetTutorsScheduleForAd(TutorsScheduleForAdRequest request); + Task GetTutorsScheduleForAd(GetTutorsScheduleForAdRequest request); Task CreateScheduleItem(CreateScheduleItemRequest request); Task IsUserTheAdOwner(IsUserTheAdOwnerRequest request); Task UnacceptScheduleItemRequest(UnacceptScheduleItemRequestRequest request); - Task UpdateAdRequest(UpdateTutorsPendingAdRequestRequest request); - Task ViewAllPendingAdRequests(TutorsPendingAdRequestsRequest request); - Task ViewAllAdRequests(TutorAllAdRequestsRequest request); - Task ViewTutorsAds(TutorsAdsRequest request); + Task UpdateAdRequest(UpdateAdRequestRequest request); + Task GetTutorsPendingAdRequests(GetTutorsPendingAdRequestsRequest request); + Task GetTutorsAllAdRequests(GetTutorsAllAdRequestsRequest request); + Task GetTutorsAds(GetTutorsAdsRequest request); } \ No newline at end of file diff --git a/TutorLizard.BusinessLogic/Services/StudentService.cs b/TutorLizard.BusinessLogic/Services/StudentService.cs index 2d12cd30..27938f87 100644 --- a/TutorLizard.BusinessLogic/Services/StudentService.cs +++ b/TutorLizard.BusinessLogic/Services/StudentService.cs @@ -59,7 +59,7 @@ public async Task CreateScheduleItemRequest(C }; } - public async Task ViewAcceptedAds(StudentsAcceptedAdsRequest request) + public async Task GetStudentsAcceptedAds(GetStudentsAcceptedAdsRequest request) { var studentId = request.StudentId; @@ -91,13 +91,13 @@ public async Task ViewAcceptedAds(StudentsAcceptedA }) .ToList(); - return new StudentsAcceptedAdsResponse + return new GetStudentsAcceptedAdsResponse { Ads = adListDtos, }; } - public async Task ViewAdRequests(StudentsAdRequestsRequest request) + public async Task GetStudentsAdRequests(GetStudentsAdRequestsRequest request) { var studentId = request.StudentId; @@ -124,13 +124,13 @@ public async Task ViewAdRequests(StudentsAdRequestsR }) .ToList(); - return new StudentsAdRequestsResponse + return new GetStudentsAdRequestsResponse { AdRequests = adRequestsListDtos }; } - public async Task ViewAdRequestStatus(AdRequestStatusRequest request) + public async Task GetAdRequestStatus(GetAdRequestStatusRequest request) { var adRequestDetails = await _adRequestRepository.GetAll() .Include(adrequest => adrequest.Ad) @@ -141,9 +141,9 @@ public async Task ViewAdRequestStatus(AdRequestStatusRe .FirstOrDefaultAsync(); if (adRequestDetails is null) - return new AdRequestStatusResponse() { IsSuccessful = false }; + return new GetAdRequestStatusResponse() { IsSuccessful = false }; - AdRequestStatusResponse response = new AdRequestStatusResponse() + GetAdRequestStatusResponse response = new GetAdRequestStatusResponse() { Id = adRequestDetails.Id, AdId = adRequestDetails.AdId, @@ -151,18 +151,18 @@ public async Task ViewAdRequestStatus(AdRequestStatusRe ReplyMessage = adRequestDetails.ReplyMessage, DateCreated = adRequestDetails.DateCreated, ReviewDate = adRequestDetails.ReviewDate, - Status = adRequestDetails.ReviewDate == null ? AdRequestStatusResponse.RequestStatus.Pending : AdRequestStatusResponse.RequestStatus.Rejected, + Status = adRequestDetails.ReviewDate == null ? GetAdRequestStatusResponse.RequestStatus.Pending : GetAdRequestStatusResponse.RequestStatus.Rejected, IsSuccessful = true }; return response; } - public async Task DeleteAdRequest(StudentCancelAdRequestRequest request) + public async Task DeleteAdRequest(DeleteAdRequestRequest request) { var deletedAdRequest = await _adRequestRepository.Delete(request.Id); - StudentCancelAdRequestResponse response = new StudentCancelAdRequestResponse(); + DeleteAdRequestResponse response = new DeleteAdRequestResponse(); if (deletedAdRequest == null) response.IsSuccessful = true; else @@ -232,7 +232,7 @@ public async Task CreateAdRequest(CreateAdRequestReques }; } - public async Task GetAvailableScheduleForAd(AvailableScheduleForAdRequest request) + public async Task GetAvailableScheduleForAd(GetAvailableScheduleForAdRequest request) { List items = await _scheduleItemRepository.GetAll() .Where(si => si.Ad.AdRequests.Any(ar => ar.StudentId == request.StudentId && ar.IsAccepted) && si.AdId == request.AdId) @@ -251,7 +251,7 @@ public async Task GetAvailableScheduleForAd(Avai .Where(ar => ar.AdId == request.AdId) .AnyAsync(ar => ar.StudentId == request.StudentId && ar.IsAccepted); - AvailableScheduleForAdResponse response = new() + GetAvailableScheduleForAdResponse response = new() { AdId = request.AdId, IsAccepted = isAccepted, diff --git a/TutorLizard.BusinessLogic/Services/TutorService.cs b/TutorLizard.BusinessLogic/Services/TutorService.cs index 64d0db7a..f4f12934 100644 --- a/TutorLizard.BusinessLogic/Services/TutorService.cs +++ b/TutorLizard.BusinessLogic/Services/TutorService.cs @@ -79,7 +79,7 @@ public async Task CreateScheduleItem(CreateScheduleI }; } - public async Task GetTutorsScheduleForAd(TutorsScheduleForAdRequest request) + public async Task GetTutorsScheduleForAd(GetTutorsScheduleForAdRequest request) { List scheduleItems = await _scheduleItemRepository.GetAll() .Where(item => item.AdId == request.AdId) @@ -105,7 +105,7 @@ public async Task GetTutorsScheduleForAd(TutorsSche .ToListAsync(); - TutorsScheduleForAdResponse response = new() + GetTutorsScheduleForAdResponse response = new() { AdId = request.AdId, ScheduleItems = scheduleItems @@ -182,7 +182,7 @@ public async Task UnacceptScheduleItemReque }; } - public async Task ViewAllAdRequests(TutorAllAdRequestsRequest request) + public async Task GetTutorsAllAdRequests(GetTutorsAllAdRequestsRequest request) { List adRequestsList = await _adRequestRepository.GetAll() .Include(adrequest => adrequest.Ad) @@ -201,7 +201,7 @@ public async Task ViewAllAdRequests(TutorAllAdReques adrequest.ReviewDate)) .ToListAsync(); - TutorAllAdRequestsResponse response = new() + GetTutorsAllAdRequestsResponse response = new() { AdRequests = adRequestsList }; @@ -209,7 +209,7 @@ public async Task ViewAllAdRequests(TutorAllAdReques return response; } - public async Task ViewAllPendingAdRequests(TutorsPendingAdRequestsRequest request) + public async Task GetTutorsPendingAdRequests(GetTutorsPendingAdRequestsRequest request) { List adRequests = await _adRequestRepository.GetAll() .Where(adrequest => @@ -231,7 +231,7 @@ public async Task ViewAllPendingAdRequests(Tuto adrequest.ReviewDate)) .ToListAsync(); - TutorsPendingAdRequestsResponse response = new() + GetTutorsPendingAdRequestsResponse response = new() { AdRequests = adRequests }; @@ -239,7 +239,7 @@ public async Task ViewAllPendingAdRequests(Tuto return response; } - public async Task UpdateAdRequest(UpdateTutorsPendingAdRequestRequest request) + public async Task UpdateAdRequest(UpdateAdRequestRequest request) { var adRequest = await _adRequestRepository .Update(request.AdRequestId, entity => @@ -248,13 +248,13 @@ public async Task UpdateAdRequest(UpdateTu entity.ReplyMessage = request.ReplyMessage; }); - if (request.Action == UpdateTutorsPendingAdRequestRequest.UpdateAction.Accept) + if (request.Action == UpdateAdRequestRequest.UpdateAction.Accept) { adRequest = await _adRequestRepository .Update(request.AdRequestId, entity => entity.IsAccepted = true); } - UpdateTutorsPendingAdRequestResponse response = new(); + UpdateAdRequestResponse response = new(); if (adRequest is null) response.IsSuccessful = false; @@ -264,7 +264,7 @@ public async Task UpdateAdRequest(UpdateTu return response; } - public async Task ViewTutorsAds(TutorsAdsRequest request) + public async Task GetTutorsAds(GetTutorsAdsRequest request) { var tutorId = request.TutorId; @@ -291,7 +291,7 @@ public async Task ViewTutorsAds(TutorsAdsRequest request) }) .ToList(); - return new TutorsAdsResponse + return new GetTutorsAdsResponse { AdList = adListDtos }; diff --git a/TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/DeleteAdRequestRequest.cs similarity index 63% rename from TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/DeleteAdRequestRequest.cs index 8a504e82..7c275df2 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/StudentCancelAdRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/DeleteAdRequestRequest.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class StudentCancelAdRequestRequest(int adRequestId) +public class DeleteAdRequestRequest(int adRequestId) { public int Id { get; set; } = adRequestId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetAdRequestStatusRequest.cs similarity index 77% rename from TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetAdRequestStatusRequest.cs index 3b03f596..fef45c57 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/AdRequestStatusRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetAdRequestStatusRequest.cs @@ -1,5 +1,5 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class AdRequestStatusRequest +public class GetAdRequestStatusRequest { public int AdId { get; set; } public int StudentId { get; set; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetAvailableScheduleForAdRequest.cs similarity index 65% rename from TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetAvailableScheduleForAdRequest.cs index e123d7cf..95c8c5eb 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/AvailableScheduleForAdRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetAvailableScheduleForAdRequest.cs @@ -1,10 +1,10 @@ namespace TutorLizard.Shared.Models.DTOs.Requests { - public class AvailableScheduleForAdRequest + public class GetAvailableScheduleForAdRequest { public int AdId { get; set; } public int StudentId { get; set; } - public AvailableScheduleForAdRequest(int adId, int studentId) + public GetAvailableScheduleForAdRequest(int adId, int studentId) { AdId = adId; StudentId = studentId; diff --git a/TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAcceptedAdsRequest.cs similarity index 72% rename from TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAcceptedAdsRequest.cs index 390eca25..15a32ae0 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/StudentsAcceptedAdsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAcceptedAdsRequest.cs @@ -6,10 +6,10 @@ namespace TutorLizard.Shared.Models.DTOs.Requests { - public class StudentsAcceptedAdsRequest + public class GetStudentsAcceptedAdsRequest { public int StudentId { get; set; } - public StudentsAcceptedAdsRequest(int? studentId) + public GetStudentsAcceptedAdsRequest(int? studentId) { StudentId = (int)studentId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAdRequestsRequest.cs similarity index 61% rename from TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAdRequestsRequest.cs index 89e1a405..dedfc404 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/StudentsAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetStudentsAdRequestsRequest.cs @@ -2,10 +2,10 @@ namespace TutorLizard.Shared.Models.DTOs.Requests { - public class StudentsAdRequestsRequest + public class GetStudentsAdRequestsRequest { public int StudentId { get; set; } - public StudentsAdRequestsRequest(int? studentId) + public GetStudentsAdRequestsRequest(int? studentId) { StudentId = (int)studentId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAdsRequest.cs similarity index 79% rename from TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAdsRequest.cs index 4392032d..4dcd43fc 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/TutorsAdsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAdsRequest.cs @@ -7,11 +7,11 @@ namespace TutorLizard.Shared.Models.DTOs.Requests { - public class TutorsAdsRequest + public class GetTutorsAdsRequest { public int TutorId { get; set; } - public TutorsAdsRequest(int tutorId) + public GetTutorsAdsRequest(int tutorId) { TutorId = tutorId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAllAdRequestsRequest.cs similarity index 58% rename from TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAllAdRequestsRequest.cs index 3f8b12ac..317d6621 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/TutorAllAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsAllAdRequestsRequest.cs @@ -1,9 +1,9 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class TutorAllAdRequestsRequest +public class GetTutorsAllAdRequestsRequest { public int TutorId { get; set; } - public TutorAllAdRequestsRequest(int? tutorId) + public GetTutorsAllAdRequestsRequest(int? tutorId) { TutorId = (int)tutorId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsPendingAdRequestsRequest.cs similarity index 56% rename from TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetTutorsPendingAdRequestsRequest.cs index 14429735..c49c47bb 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/TutorsPendingAdRequestsRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsPendingAdRequestsRequest.cs @@ -1,9 +1,9 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class TutorsPendingAdRequestsRequest +public class GetTutorsPendingAdRequestsRequest { public int TutorId { get; set; } - public TutorsPendingAdRequestsRequest(int? tutorId) + public GetTutorsPendingAdRequestsRequest(int? tutorId) { TutorId = (int)tutorId; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsScheduleForAdRequest.cs similarity index 75% rename from TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/GetTutorsScheduleForAdRequest.cs index 1d192015..e293bb9a 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/TutorsScheduleForAdRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/GetTutorsScheduleForAdRequest.cs @@ -1,5 +1,5 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class TutorsScheduleForAdRequest +public class GetTutorsScheduleForAdRequest { public int AdId { get; set; } public int TutorId { get; set; } diff --git a/TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs b/TutorLizard.Shared/Models/DTOs/Requests/UpdateAdRequestRequest.cs similarity index 75% rename from TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs rename to TutorLizard.Shared/Models/DTOs/Requests/UpdateAdRequestRequest.cs index c03dbe97..2779f27a 100644 --- a/TutorLizard.Shared/Models/DTOs/Requests/UpdateTutorsPendingAdRequestRequest.cs +++ b/TutorLizard.Shared/Models/DTOs/Requests/UpdateAdRequestRequest.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Requests; -public class UpdateTutorsPendingAdRequestRequest(int adRequestId, string replyMessage) +public class UpdateAdRequestRequest(int adRequestId, string replyMessage) { public int AdRequestId { get; set; } = adRequestId; public string ReplyMessage { get; set; } = replyMessage; diff --git a/TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/DeleteAdRequestResponse.cs similarity index 70% rename from TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/DeleteAdRequestResponse.cs index 895b720b..61d1a4f1 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/StudentCancelAdRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/DeleteAdRequestResponse.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class StudentCancelAdRequestResponse +public class DeleteAdRequestResponse { public bool IsSuccessful { get; set; } } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetAdRequestStatusResponse.cs similarity index 92% rename from TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetAdRequestStatusResponse.cs index fea3ba1b..b149ce27 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/AdRequestStatusResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetAdRequestStatusResponse.cs @@ -1,5 +1,5 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class AdRequestStatusResponse +public class GetAdRequestStatusResponse { public int Id { get; set; } public int AdId { get; set; } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetAvailableScheduleForAdResponse.cs similarity index 87% rename from TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetAvailableScheduleForAdResponse.cs index 5cd5ae36..233fad54 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/AvailableScheduleForAdResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetAvailableScheduleForAdResponse.cs @@ -6,7 +6,7 @@ namespace TutorLizard.Shared.Models.DTOs.Responses { - public class AvailableScheduleForAdResponse + public class GetAvailableScheduleForAdResponse { public List Items { get; set; } = new(); public bool IsAccepted { get; set; } = true; diff --git a/TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAcceptedAdsResponse.cs similarity index 83% rename from TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAcceptedAdsResponse.cs index 69d00730..a822dd8b 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/StudentsAcceptedAdsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAcceptedAdsResponse.cs @@ -6,7 +6,7 @@ namespace TutorLizard.Shared.Models.DTOs.Responses { - public class StudentsAcceptedAdsResponse + public class GetStudentsAcceptedAdsResponse { public List Ads { get; set; } = new(); } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAdRequestsResponse.cs similarity index 76% rename from TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAdRequestsResponse.cs index 5f6d3ff7..bd45a9ae 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/StudentsAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetStudentsAdRequestsResponse.cs @@ -2,7 +2,7 @@ namespace TutorLizard.Shared.Models.DTOs.Responses { - public class StudentsAdRequestsResponse + public class GetStudentsAdRequestsResponse { public List AdRequests { get; set; } = new(); } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAdsResponse.cs similarity index 86% rename from TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAdsResponse.cs index 7e901dc3..7457d858 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/TutorsAdsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAdsResponse.cs @@ -6,7 +6,7 @@ namespace TutorLizard.Shared.Models.DTOs.Responses { - public class TutorsAdsResponse + public class GetTutorsAdsResponse { public List AdList { get; set; } = new(); } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAllAdRequestsResponse.cs similarity index 74% rename from TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAllAdRequestsResponse.cs index 11548151..41fd9fb0 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/TutorAllAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsAllAdRequestsResponse.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class TutorAllAdRequestsResponse +public class GetTutorsAllAdRequestsResponse { public List AdRequests { get; set; } = new(); } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsPendingAdRequestsResponse.cs similarity index 72% rename from TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetTutorsPendingAdRequestsResponse.cs index 42fff85f..0b320d34 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/TutorsPendingAdRequestsResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsPendingAdRequestsResponse.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class TutorsPendingAdRequestsResponse +public class GetTutorsPendingAdRequestsResponse { public List AdRequests { get; set; } = new(); } diff --git a/TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsScheduleForAdResponse.cs similarity index 79% rename from TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/GetTutorsScheduleForAdResponse.cs index 53169d70..58f5ecba 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/TutorsScheduleForAdResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/GetTutorsScheduleForAdResponse.cs @@ -1,5 +1,5 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class TutorsScheduleForAdResponse +public class GetTutorsScheduleForAdResponse { public int AdId { get; set; } public List ScheduleItems { get; set; } = []; diff --git a/TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs b/TutorLizard.Shared/Models/DTOs/Responses/UpdateAdRequestResponse.cs similarity index 66% rename from TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs rename to TutorLizard.Shared/Models/DTOs/Responses/UpdateAdRequestResponse.cs index 24f257de..fd63ec0c 100644 --- a/TutorLizard.Shared/Models/DTOs/Responses/UpdateTutorsPendingAdRequestResponse.cs +++ b/TutorLizard.Shared/Models/DTOs/Responses/UpdateAdRequestResponse.cs @@ -1,6 +1,6 @@ namespace TutorLizard.Shared.Models.DTOs.Responses; -public class UpdateTutorsPendingAdRequestResponse() +public class UpdateAdRequestResponse() { public bool IsSuccessful { get; set; } } diff --git a/TutorLizard.Web/Controllers/StudentController.cs b/TutorLizard.Web/Controllers/StudentController.cs index ce1e8292..c85cbfcd 100644 --- a/TutorLizard.Web/Controllers/StudentController.cs +++ b/TutorLizard.Web/Controllers/StudentController.cs @@ -36,9 +36,9 @@ public async Task AcceptedAds() return Forbid(); } - StudentsAcceptedAdsRequest request = new(studentId); + GetStudentsAcceptedAdsRequest request = new(studentId); - StudentsAcceptedAdsResponse response = await _studentService.ViewAcceptedAds(request); + GetStudentsAcceptedAdsResponse response = await _studentService.GetStudentsAcceptedAds(request); return View(response); } @@ -59,9 +59,9 @@ public async Task AdRequests(IFormCollection buttonAction) return Forbid(); } - StudentsAdRequestsRequest request = new(studentId); + GetStudentsAdRequestsRequest request = new(studentId); - StudentsAdRequestsResponse response = await _studentService.ViewAdRequests(request); + GetStudentsAdRequestsResponse response = await _studentService.GetStudentsAdRequests(request); return View(response); } @@ -138,8 +138,8 @@ public async Task CreateAdRequest(CreateAdRequestRequest request) [ValidateAntiForgeryToken] public async Task CancelAdRequest(int adRequestId) { - StudentCancelAdRequestRequest request = new StudentCancelAdRequestRequest(adRequestId); - StudentCancelAdRequestResponse response = await _studentService.DeleteAdRequest(request); + DeleteAdRequestRequest request = new DeleteAdRequestRequest(adRequestId); + DeleteAdRequestResponse response = await _studentService.DeleteAdRequest(request); if (response.IsSuccessful) { diff --git a/TutorLizard.Web/Controllers/TutorController.cs b/TutorLizard.Web/Controllers/TutorController.cs index 9e37f54b..640a5198 100644 --- a/TutorLizard.Web/Controllers/TutorController.cs +++ b/TutorLizard.Web/Controllers/TutorController.cs @@ -223,9 +223,9 @@ public async Task ViewPendingAdRequests() return Forbid(); } - TutorsPendingAdRequestsRequest request = new(tutorId); + GetTutorsPendingAdRequestsRequest request = new(tutorId); - TutorsPendingAdRequestsResponse response = await _tutorService.ViewAllPendingAdRequests(request); + GetTutorsPendingAdRequestsResponse response = await _tutorService.GetTutorsPendingAdRequests(request); return View(response); } @@ -245,34 +245,34 @@ public async Task UpdatePendingAdRequest(IFormCollection form, in return Forbid(); } - UpdateTutorsPendingAdRequestRequest request = new(adRequestId, form["replyMessage"]); + UpdateAdRequestRequest request = new(adRequestId, form["replyMessage"]); try { if (!form["btnAccept"].IsNullOrEmpty()) - request.Action = UpdateTutorsPendingAdRequestRequest.UpdateAction.Accept; + request.Action = UpdateAdRequestRequest.UpdateAction.Accept; else if (!form["btnReject"].IsNullOrEmpty()) - request.Action = UpdateTutorsPendingAdRequestRequest.UpdateAction.Reject; + request.Action = UpdateAdRequestRequest.UpdateAction.Reject; var response = await _tutorService.UpdateAdRequest(request); if (!response.IsSuccessful) { - if(request.Action == UpdateTutorsPendingAdRequestRequest.UpdateAction.Accept) + if(request.Action == UpdateAdRequestRequest.UpdateAction.Accept) { _uiMessagesService.ShowFailureMessage("Wystąpił błąd. Akceptacja zgłoszenia nieudana."); } - else if (request.Action == UpdateTutorsPendingAdRequestRequest.UpdateAction.Reject) + else if (request.Action == UpdateAdRequestRequest.UpdateAction.Reject) { _uiMessagesService.ShowFailureMessage("Wystąpił błąd. Odrzucenie zgłoszenia nieudane."); } RedirectToAction(nameof(AdRequest)); } - if(request.Action == UpdateTutorsPendingAdRequestRequest.UpdateAction.Accept) + if(request.Action == UpdateAdRequestRequest.UpdateAction.Accept) { _uiMessagesService.ShowSuccessMessage("Ogłoszenie zaakceptowane."); } - else if (request.Action == UpdateTutorsPendingAdRequestRequest.UpdateAction.Reject) + else if (request.Action == UpdateAdRequestRequest.UpdateAction.Reject) { _uiMessagesService.ShowSuccessMessage("Ogłoszenie odrzucone."); } @@ -295,9 +295,9 @@ public async Task ViewAllAdRequests() return Forbid(); } - TutorAllAdRequestsRequest request = new(tutorId); + GetTutorsAllAdRequestsRequest request = new(tutorId); - TutorAllAdRequestsResponse response = await _tutorService.ViewAllAdRequests(request); + GetTutorsAllAdRequestsResponse response = await _tutorService.GetTutorsAllAdRequests(request); return View(response); } @@ -318,9 +318,9 @@ public async Task TutorsAdsList() return Forbid(); } - TutorsAdsRequest request = new((int)tutorId); + GetTutorsAdsRequest request = new((int)tutorId); - TutorsAdsResponse response = await _tutorService.ViewTutorsAds(request); + GetTutorsAdsResponse response = await _tutorService.GetTutorsAds(request); return View(response); } diff --git a/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs b/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs index 8bc931dd..17578c10 100644 --- a/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs +++ b/TutorLizard.Web/ViewComponents/AdRequestStatusForAd.cs @@ -25,13 +25,13 @@ public async Task InvokeAsync(int adId) return View(); } - AdRequestStatusRequest request = new() + GetAdRequestStatusRequest request = new() { AdId = adId, StudentId = (int)studentId }; - AdRequestStatusResponse response = await _studentService.ViewAdRequestStatus(request); + GetAdRequestStatusResponse response = await _studentService.GetAdRequestStatus(request); if (!response.IsSuccessful) return View(); diff --git a/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs b/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs index 4f3332ce..7e456aab 100644 --- a/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs +++ b/TutorLizard.Web/ViewComponents/AvailableScheduleForAd.cs @@ -25,9 +25,9 @@ public async Task InvokeAsync(int adId) { return View(); } - AvailableScheduleForAdRequest request = new(adId, (int)studentId); + GetAvailableScheduleForAdRequest request = new(adId, (int)studentId); - AvailableScheduleForAdResponse response = await _studentService.GetAvailableScheduleForAd(request); + GetAvailableScheduleForAdResponse response = await _studentService.GetAvailableScheduleForAd(request); return View(response); } diff --git a/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs b/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs index e68054c0..f6720243 100644 --- a/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs +++ b/TutorLizard.Web/ViewComponents/TutorsScheduleForAd.cs @@ -25,13 +25,13 @@ public async Task InvokeAsync(int adId) { return View(); } - TutorsScheduleForAdRequest request = new() + GetTutorsScheduleForAdRequest request = new() { AdId = adId, TutorId = (int)tutorId }; - TutorsScheduleForAdResponse response = await _tutorService.GetTutorsScheduleForAd(request); + GetTutorsScheduleForAdResponse response = await _tutorService.GetTutorsScheduleForAd(request); return View(response); } diff --git a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml index b6671dca..4fbdf119 100644 --- a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml +++ b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml @@ -1,4 +1,4 @@ -@model AdRequestStatusResponse? +@model GetAdRequestStatusResponse? @if(Model is not null) { @@ -6,15 +6,15 @@

Twoje zgłoszenie

Status zgłoszenia: - @if(Model.Status == AdRequestStatusResponse.RequestStatus.Accepted) + @if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Accepted) { Zaakceptowane } - else if(Model.Status == AdRequestStatusResponse.RequestStatus.Pending) + else if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Pending) { Oczekuje na akceptację } - else if (Model.Status == AdRequestStatusResponse.RequestStatus.Rejected) + else if (Model.Status == GetAdRequestStatusResponse.RequestStatus.Rejected) { Odrzucone } diff --git a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml index 40ecc41a..471200c7 100644 --- a/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml +++ b/TutorLizard.Web/Views/Shared/Components/AvailableScheduleForAd/Default.cshtml @@ -1,5 +1,5 @@ @using static TutorLizard.Shared.Models.DTOs.ScheduleItemDto -@model AvailableScheduleForAdResponse? +@model GetAvailableScheduleForAdResponse? @if (Model is not null) { diff --git a/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml index 8e95680f..40452629 100644 --- a/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml +++ b/TutorLizard.Web/Views/Shared/Components/TutorsScheduleForAd/Default.cshtml @@ -1,4 +1,4 @@ -@model TutorsScheduleForAdResponse? +@model GetTutorsScheduleForAdResponse? @if(Model is not null) { diff --git a/TutorLizard.Web/Views/Student/AcceptedAds.cshtml b/TutorLizard.Web/Views/Student/AcceptedAds.cshtml index 80d80d90..bd8874c5 100644 --- a/TutorLizard.Web/Views/Student/AcceptedAds.cshtml +++ b/TutorLizard.Web/Views/Student/AcceptedAds.cshtml @@ -1,4 +1,4 @@ -@model StudentsAcceptedAdsResponse +@model GetStudentsAcceptedAdsResponse @{ ViewData["Title"] = "AcceptedAds"; } diff --git a/TutorLizard.Web/Views/Student/AdRequests.cshtml b/TutorLizard.Web/Views/Student/AdRequests.cshtml index aca3ae58..abc10327 100644 --- a/TutorLizard.Web/Views/Student/AdRequests.cshtml +++ b/TutorLizard.Web/Views/Student/AdRequests.cshtml @@ -1,4 +1,4 @@ -@model StudentsAdRequestsResponse +@model GetStudentsAdRequestsResponse @{ ViewData["Title"] = "AdRequests"; } diff --git a/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml b/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml index baca6a07..851855eb 100644 --- a/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml +++ b/TutorLizard.Web/Views/Tutor/TutorsAdsList.cshtml @@ -1,4 +1,4 @@ -@model TutorsAdsResponse +@model GetTutorsAdsResponse @{ ViewData["Title"] = "AdsList"; } diff --git a/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml b/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml index 273e0c54..c5e386a4 100644 --- a/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml +++ b/TutorLizard.Web/Views/Tutor/ViewAllAdRequests.cshtml @@ -1,4 +1,4 @@ -@model TutorAllAdRequestsResponse +@model GetTutorsAllAdRequestsResponse @{ ViewData["Title"] = "ViewAdRequests"; diff --git a/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml b/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml index ff0aeef5..098f63d2 100644 --- a/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml +++ b/TutorLizard.Web/Views/Tutor/ViewPendingAdRequests.cshtml @@ -1,4 +1,4 @@ -@model TutorsPendingAdRequestsResponse +@model GetTutorsPendingAdRequestsResponse @{ ViewData["Title"] = "ViewPendingAdRequests"; From b1690dfbdc9f25fdafd194d089be41d4c39cc0b1 Mon Sep 17 00:00:00 2001 From: Adam Monikowski Date: Mon, 10 Jun 2024 19:58:55 +0200 Subject: [PATCH 6/6] Fix namespaces in unit tests --- .../Services/Browse/BrowseServiceGetAdDetailsTests.cs | 6 +++--- .../Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs | 6 +++--- .../Services/Browse/BrowseServiceGetUsersScheduleTests.cs | 4 ++-- .../Services/Browse/BrowseServiceTestsBase.cs | 2 -- .../Controllers/Browse/BrowseControllerAdDetailsTests.cs | 4 ++-- .../Controllers/Browse/BrowseControllerAdsTests.cs | 4 ++-- .../Controllers/Browse/BrowseControllerScheduleTests.cs | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetAdDetailsTests.cs b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetAdDetailsTests.cs index b8d3fda1..00d19ec1 100644 --- a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetAdDetailsTests.cs +++ b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetAdDetailsTests.cs @@ -1,6 +1,6 @@ -using TutorLizard.BusinessLogic.Enums; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models; +using TutorLizard.BusinessLogic.Models; +using TutorLizard.Shared.Enums; +using TutorLizard.Shared.Models.DTOs.Requests; namespace TutorLizard.BusinessLogic.Tests.Services.Browse; public class BrowseServiceGetAdDetailsTests : BrowseServiceTestsBase diff --git a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs index 9b1517fd..8456f82a 100644 --- a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs +++ b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs @@ -1,8 +1,8 @@ using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; using TutorLizard.BusinessLogic.Services; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.BusinessLogic.Tests.Services.Browse; public class BrowseServiceGetBrowseAdsPageTests : BrowseServiceTestsBase diff --git a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetUsersScheduleTests.cs b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetUsersScheduleTests.cs index b6bd30e8..82640753 100644 --- a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetUsersScheduleTests.cs +++ b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetUsersScheduleTests.cs @@ -1,7 +1,7 @@ using TutorLizard.BusinessLogic.Models; -using TutorLizard.BusinessLogic.Models.DTOs; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; using TutorLizard.BusinessLogic.Services; +using TutorLizard.Shared.Models.DTOs; +using TutorLizard.Shared.Models.DTOs.Requests; namespace TutorLizard.BusinessLogic.Tests.Services.Browse; public class BrowseServiceGetUsersScheduleTests : BrowseServiceTestsBase diff --git a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceTestsBase.cs b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceTestsBase.cs index de6e4f8a..02dc7127 100644 --- a/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceTestsBase.cs +++ b/Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceTestsBase.cs @@ -1,7 +1,5 @@ using AutoFixture; -using Microsoft.EntityFrameworkCore; using Moq; -using TutorLizard.BusinessLogic.Data; using TutorLizard.BusinessLogic.Interfaces.Data.Repositories; using TutorLizard.BusinessLogic.Models; using TutorLizard.BusinessLogic.Services; diff --git a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdDetailsTests.cs b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdDetailsTests.cs index 51f566e4..c1404fa0 100644 --- a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdDetailsTests.cs +++ b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdDetailsTests.cs @@ -1,8 +1,8 @@ using AutoFixture; using Microsoft.AspNetCore.Mvc; using Moq; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.Tests.Controllers.Browse; public class BrowseControllerAdDetailsTests : BrowseControllerTestsBase diff --git a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdsTests.cs b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdsTests.cs index ad626e7e..5119292c 100644 --- a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdsTests.cs +++ b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdsTests.cs @@ -1,8 +1,8 @@ using AutoFixture; using Microsoft.AspNetCore.Mvc; using Moq; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.Tests.Controllers.Browse; public class BrowseControllerAdsTests : BrowseControllerTestsBase diff --git a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerScheduleTests.cs b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerScheduleTests.cs index 723b7814..a3c4b3c8 100644 --- a/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerScheduleTests.cs +++ b/Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerScheduleTests.cs @@ -1,8 +1,8 @@ using AutoFixture; using Microsoft.AspNetCore.Mvc; using Moq; -using TutorLizard.BusinessLogic.Models.DTOs.Requests; -using TutorLizard.BusinessLogic.Models.DTOs.Responses; +using TutorLizard.Shared.Models.DTOs.Requests; +using TutorLizard.Shared.Models.DTOs.Responses; namespace TutorLizard.Web.Tests.Controllers.Browse; public class BrowseControllerScheduleTests : BrowseControllerTestsBase