From 2b5fb10ee420bb08a6ee50939daebcd81dc34c6a Mon Sep 17 00:00:00 2001 From: iSQL Date: Thu, 29 Aug 2024 16:44:09 +0200 Subject: [PATCH 1/2] - Cleanup migrations, and add basic classifieds module with private messagings --- .../Domain/Classifieds/ClassifiedAd.cs | 15 +- .../Domain/Classifieds/ClassifiedMessage.cs | 8 +- .../Domain/Classifieds/ClassifiedUser.cs | 3 +- BaseServerTest.sln | 2 +- BaseServerTest/BaseServerTest.csproj | 4 + .../Components/Layout/NavMenu.razor | 3 + .../Components/Pages/Classifieds.razor | 30 -- .../Pages/Classifieds/AdDetail.razor | 15 + .../Pages/Classifieds/AdDetail.razor.cs | 27 ++ .../Pages/Classifieds/AddMessages.razor | 17 + .../Pages/Classifieds/AddMessages.razor.cs | 22 + .../Pages/Classifieds/ClassifiedsMain.razor | 36 ++ .../Classifieds/ClassifiedsMain.razor.cs | 40 ++ .../Pages/Classifieds/ContactSeller.razor | 15 + .../Pages/Classifieds/ContactSeller.razor.cs | 44 ++ .../Components/Pages/Classifieds/PostAd.razor | 36 ++ .../Pages/Classifieds/PostAd.razor.cs | 100 +++++ .../Classifieds/IClassifiedAdRepository.cs | 10 + .../IClassifiedMessageRepository.cs | 10 + .../Classifieds/IClassifiedUserRepository.cs | 9 + .../Contracts/Repositories/IRepositoryBase.cs | 11 + .../Classifieds/IClassifiedAdService.cs | 15 + .../Classifieds/IClassifiedMessageService.cs | 12 + .../Classifieds/IClassifiedUserService.cs | 14 + ...000000000_CreateIdentitySchema.Designer.cs | 279 ------------- ...240731145108_AddedAppointments.Designer.cs | 353 ---------------- .../20240731145108_AddedAppointments.cs | 53 --- ...20240731191213_DodatSrecniBroj.Designer.cs | 356 ---------------- .../20240731191213_DodatSrecniBroj.cs | 29 -- ...821195540_AddedChatPersistancy.Designer.cs | 384 ------------------ .../20240821195540_AddedChatPersistancy.cs | 94 ----- ...20240827182603_CreateClassifiedEntities.cs | 180 -------- .../20240829090657_InitialCreate.Designer.cs} | 65 ++- .../20240829090657_InitialCreate.cs} | 161 +++++++- .../ApplicationDbContextModelSnapshot.cs | 61 ++- BaseServerTest/Program.cs | 14 + .../Classifieds/ClassifiedAdRepository.cs | 29 ++ .../ClassifiedMessageRepository.cs | 32 ++ .../Classifieds/ClassifiedUserRepository.cs | 20 + BaseServerTest/Repositories/RepositoryBase.cs | 45 ++ .../Classifieds/ClassifiedAdService.cs | 57 +++ .../Classifieds/ClassifiedMessageService.cs | 32 ++ .../Classifieds/ClassifiedUserService.cs | 73 ++++ 43 files changed, 973 insertions(+), 1842 deletions(-) delete mode 100644 BaseServerTest/Components/Pages/Classifieds.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/AdDetail.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/AdDetail.razor.cs create mode 100644 BaseServerTest/Components/Pages/Classifieds/AddMessages.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs create mode 100644 BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor.cs create mode 100644 BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs create mode 100644 BaseServerTest/Components/Pages/Classifieds/PostAd.razor create mode 100644 BaseServerTest/Components/Pages/Classifieds/PostAd.razor.cs create mode 100644 BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedAdRepository.cs create mode 100644 BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedMessageRepository.cs create mode 100644 BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedUserRepository.cs create mode 100644 BaseServerTest/Contracts/Repositories/IRepositoryBase.cs create mode 100644 BaseServerTest/Contracts/Services/Classifieds/IClassifiedAdService.cs create mode 100644 BaseServerTest/Contracts/Services/Classifieds/IClassifiedMessageService.cs create mode 100644 BaseServerTest/Contracts/Services/Classifieds/IClassifiedUserService.cs delete mode 100644 BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs delete mode 100644 BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.Designer.cs delete mode 100644 BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.cs delete mode 100644 BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.Designer.cs delete mode 100644 BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.cs delete mode 100644 BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.Designer.cs delete mode 100644 BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.cs delete mode 100644 BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.cs rename BaseServerTest/{Data/Migrations/20240827182603_CreateClassifiedEntities.Designer.cs => Migrations/20240829090657_InitialCreate.Designer.cs} (91%) rename BaseServerTest/{Data/Migrations/00000000000000_CreateIdentitySchema.cs => Migrations/20240829090657_InitialCreate.cs} (55%) rename BaseServerTest/{Data => }/Migrations/ApplicationDbContextModelSnapshot.cs (92%) create mode 100644 BaseServerTest/Repositories/Classifieds/ClassifiedAdRepository.cs create mode 100644 BaseServerTest/Repositories/Classifieds/ClassifiedMessageRepository.cs create mode 100644 BaseServerTest/Repositories/Classifieds/ClassifiedUserRepository.cs create mode 100644 BaseServerTest/Repositories/RepositoryBase.cs create mode 100644 BaseServerTest/Services/Classifieds/ClassifiedAdService.cs create mode 100644 BaseServerTest/Services/Classifieds/ClassifiedMessageService.cs create mode 100644 BaseServerTest/Services/Classifieds/ClassifiedUserService.cs diff --git a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedAd.cs b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedAd.cs index c4ac31d..6503307 100644 --- a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedAd.cs +++ b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedAd.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,17 +9,27 @@ namespace BaseServerTest.Shared.Domain.Classifieds { public class ClassifiedAd { - public int Id { get; set; } + public string Id { get; set; } + + [Required] public string Title { get; set; } + + [Required] public string Description { get; set; } + + [Required] public string Category { get; set; } + + [Range(0, double.MaxValue, ErrorMessage = "Price must be a positive value")] public decimal Price { get; set; } + public DateTime DatePosted { get; set; } public bool IsActive { get; set; } - public int UserId { get; set; } + public string UserId { get; set; } // Navigation Properties public ClassifiedUser User { get; set; } public ICollection Messages { get; set; } } + } diff --git a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedMessage.cs b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedMessage.cs index 20906cc..bf15b7b 100644 --- a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedMessage.cs +++ b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedMessage.cs @@ -8,12 +8,12 @@ namespace BaseServerTest.Shared.Domain.Classifieds { public class ClassifiedMessage { - public int Id { get; set; } + public string Id { get; set; } public string Content { get; set; } public DateTime DateSent { get; set; } - public int SenderId { get; set; } - public int ReceiverId { get; set; } - public int ClassifiedAdId { get; set; } + public string SenderId { get; set; } + public string ReceiverId { get; set; } + public string ClassifiedAdId { get; set; } // Navigation Properties public ClassifiedUser Sender { get; set; } diff --git a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedUser.cs b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedUser.cs index 405ed10..ec08b10 100644 --- a/BaseServerTest.Shared/Domain/Classifieds/ClassifiedUser.cs +++ b/BaseServerTest.Shared/Domain/Classifieds/ClassifiedUser.cs @@ -8,10 +8,9 @@ namespace BaseServerTest.Shared.Domain.Classifieds { public class ClassifiedUser { - public int Id { get; set; } + public string Id { get; set; } public string UserName { get; set; } public string Email { get; set; } - public string PasswordHash { get; set; } public DateTime DateRegistered { get; set; } // Navigation Properties diff --git a/BaseServerTest.sln b/BaseServerTest.sln index ad58d22..57834b4 100644 --- a/BaseServerTest.sln +++ b/BaseServerTest.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.8.34525.116 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseServerTest", "BaseServerTest\BaseServerTest.csproj", "{392E3F17-800B-4E3C-BBD1-E1CE6C7F295E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseServerTest.Shared", "BaseServerTest.Shared\BaseServerTest.Shared.csproj", "{B016785B-B08D-4F2C-8DA8-18411A26D30D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseServerTest.Shared", "BaseServerTest.Shared\BaseServerTest.Shared.csproj", "{B016785B-B08D-4F2C-8DA8-18411A26D30D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/BaseServerTest/BaseServerTest.csproj b/BaseServerTest/BaseServerTest.csproj index d651594..6512563 100644 --- a/BaseServerTest/BaseServerTest.csproj +++ b/BaseServerTest/BaseServerTest.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/BaseServerTest/Components/Layout/NavMenu.razor b/BaseServerTest/Components/Layout/NavMenu.razor index 68e8db7..b29cbfa 100644 --- a/BaseServerTest/Components/Layout/NavMenu.razor +++ b/BaseServerTest/Components/Layout/NavMenu.razor @@ -46,6 +46,9 @@ Novosti + Classifieds + Post Ad + Messages
diff --git a/BaseServerTest/Components/Pages/Classifieds.razor b/BaseServerTest/Components/Pages/Classifieds.razor deleted file mode 100644 index 2f38489..0000000 --- a/BaseServerTest/Components/Pages/Classifieds.razor +++ /dev/null @@ -1,30 +0,0 @@ -@page "/classifieds" - -

Oglasi

-
-
-
Postavi oglas
-
-
- - -
-
- - -
- -
-
-
- -
-
-
Najsvežiji oglasi
-
    -
  • Bicikl na prodaju - 100 dinara
    • -
  • Soba za iznajmljivanje - 500 dinara dnevno
    • -
  • Tražim dadilju - 065xxxxxxx
    • -
-
-
diff --git a/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor b/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor new file mode 100644 index 0000000..01fae6a --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor @@ -0,0 +1,15 @@ +@page "/classifieds/detail/{AdId}" +@rendermode InteractiveServer + +

@Ad?.Title

+ +@if (Ad != null) +{ +

@Ad.Description

+

Price: @Ad.Price:C

+ +} +else +{ +

Loading ad details...

+} \ No newline at end of file diff --git a/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor.cs b/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor.cs new file mode 100644 index 0000000..485d88b --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/AdDetail.razor.cs @@ -0,0 +1,27 @@ +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Components; + + +namespace BaseServerTest.Components.Pages.Classifieds +{ + public partial class AdDetail + { + [Inject] + public IClassifiedAdService ClassifiedAdService { get; set; } + [Inject] + public NavigationManager NavigationManager { get; set; } + [Parameter] public string AdId { get; set; } + private ClassifiedAd Ad; + + protected override async Task OnInitializedAsync() + { + Ad = await ClassifiedAdService.GetAdByIdAsync(AdId); + } + + private void ContactSeller() + { + NavigationManager.NavigateTo($"/classifieds/contact/{Ad.UserId}/{AdId}"); + } + } +} diff --git a/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor new file mode 100644 index 0000000..156a0a7 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor @@ -0,0 +1,17 @@ +@page "/classifieds/messages" + +

Messages

+ +@if (Messages != null) +{ +
    + @foreach (var message in Messages) + { +
  • @message.DateSent: @message.Content
    • + } +
+} +else +{ +

Loading messages...

+} diff --git a/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs new file mode 100644 index 0000000..957f974 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs @@ -0,0 +1,22 @@ +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Components; + +namespace BaseServerTest.Components.Pages.Classifieds +{ + public partial class AddMessages + { + [Inject] + public IClassifiedMessageService ClassifiedMessageService { get; set; } + public List Messages; + + protected override async Task OnInitializedAsync() + { + // Replace with logic to get the logged-in user's ID + var userId = new Guid().ToString(); + var anotherUserId = new Guid().ToString(); + Messages = await ClassifiedMessageService.GetMessagesBetweenUsersAsync(userId, anotherUserId); + } + } +} diff --git a/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor b/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor new file mode 100644 index 0000000..3131ecf --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor @@ -0,0 +1,36 @@ +@page "/classifieds" + +

Classifieds

+ +
+ + +
+ +
+ +
+ +
+ @if (Ads != null) + { +
    + @foreach (var ad in Ads) + { +
  • + @ad.Title - @ad.Price:C +
    • + } +
+ } + else + { +

Loading ads...

+ } +
\ No newline at end of file diff --git a/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor.cs b/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor.cs new file mode 100644 index 0000000..4603576 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/ClassifiedsMain.razor.cs @@ -0,0 +1,40 @@ +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Components; + +namespace BaseServerTest.Components.Pages.Classifieds +{ + public partial class ClassifiedsMain + { + [Inject] + public IClassifiedAdService ClassifiedAdService { get; set; } + public List Ads; + public string SearchTerm; + public string SelectedCategory; + public List Categories = new List { "Electronics", "Furniture", "Vehicles", "Services", "Other" }; + + protected override async Task OnInitializedAsync() + { + Ads = await ClassifiedAdService.GetAllAdsAsync(); + } + + public async Task SearchAds() + { + Ads = await ClassifiedAdService.SearchAdsAsync(SearchTerm); + } + + public async Task FilterByCategory(ChangeEventArgs e) + { + if (string.IsNullOrEmpty(SelectedCategory)) + { + Ads = await ClassifiedAdService.GetAllAdsAsync(); + } + else + { + Ads = await ClassifiedAdService.GetAdsByCategoryAsync(SelectedCategory); + } + } + } +} + diff --git a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor new file mode 100644 index 0000000..4193bf2 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor @@ -0,0 +1,15 @@ +@page "/classifieds/contact/{SellerId}/{AdId}" + +

Contact Seller

+ + + + + +
+ + +
+ + + \ No newline at end of file diff --git a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs new file mode 100644 index 0000000..d38319d --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs @@ -0,0 +1,44 @@ +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Identity; +using System.ServiceModel.Channels; + +namespace BaseServerTest.Components.Pages.Classifieds +{ + public partial class ContactSeller + { + [Inject] + public IClassifiedMessageService ClassifiedMessageService { get; set; } + [Inject] + UserManager UserManager { get; set; } + [Inject] + AuthenticationStateProvider AuthenticationStateProvider { get; set; } + [Parameter] public string SellerId { get; set; } + [Parameter] public string AdId { get; set; } + public ClassifiedMessage Message = new ClassifiedMessage(); + + protected async override void OnInitialized() + { + Message.Id = Guid.NewGuid().ToString(); + Message.ReceiverId = SellerId; + Message.ClassifiedAdId = AdId; + Message.DateSent = DateTime.UtcNow; + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + var currentUser = await UserManager.GetUserAsync(authState.User); + Message.SenderId = currentUser?.Id; + + //ToDo: Add navigational items + // Get sendId + } + + private async Task SendMessage() + { + await ClassifiedMessageService.SendMessageAsync(Message); + // Navigate back to classifieds or to the conversation + } + } +} diff --git a/BaseServerTest/Components/Pages/Classifieds/PostAd.razor b/BaseServerTest/Components/Pages/Classifieds/PostAd.razor new file mode 100644 index 0000000..8eb5e85 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/PostAd.razor @@ -0,0 +1,36 @@ +@page "/classifieds/post" + +

@(IsEditing ? "Edit Ad" : "Post a New Ad")

+ + + + + +
+ + +
+ +
+ + +
+ +
+ + + @foreach (var category in Categories) + { + + } + + +
+ +
+ + +
+ + + \ No newline at end of file diff --git a/BaseServerTest/Components/Pages/Classifieds/PostAd.razor.cs b/BaseServerTest/Components/Pages/Classifieds/PostAd.razor.cs new file mode 100644 index 0000000..11c2005 --- /dev/null +++ b/BaseServerTest/Components/Pages/Classifieds/PostAd.razor.cs @@ -0,0 +1,100 @@ +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Identity; + +namespace BaseServerTest.Components.Pages.Classifieds +{ + public partial class PostAd + { + [SupplyParameterFromForm] + public ClassifiedAd Ad { get; set; } + + [Inject] + public IClassifiedAdService ClassifiedAdService { get; set; } + [Inject] + public IClassifiedUserService ClassifiedUserService { get; set; } + [Inject] + public NavigationManager NavigationManager { get; set; } + + [Inject] + AuthenticationStateProvider AuthenticationStateProvider { get; set; } + [Inject] + UserManager UserManager { get; set; } + + ApplicationUser CurrentUser { get; set; } + ClassifiedUser ClassifiedUser { get; set; } + + + private bool IsInitialized = false; // Add this flag + + + public bool IsEditing; + public List Categories = new List { "Electronics", "Furniture", "Vehicles", "Services", "Other" }; + + //protected override async Task OnInitializedAsync() + //{ + // if (!IsInitialized) + // { + // if (IsEditing) + // { + // Load the existing ad for editing + // Ad = await ClassifiedAdService.GetAdByIdAsync(1); + // } + // else + // { + // Initialize a new ad for posting + // Ad = new ClassifiedAd(); + // } + + // IsInitialized = true; // Mark as initialized + // } + //} + + //ToDo: Check where to create classified user + protected override async Task OnInitializedAsync() + { + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + CurrentUser = await UserManager.GetUserAsync(authState.User); + ClassifiedUser = await ClassifiedUserService.GetUserByIdAsync(CurrentUser?.Id); + if (CurrentUser != null && ClassifiedUser == null) + { + await ClassifiedUserService.CreateUserAsync(new ClassifiedUser { UserName = CurrentUser.UserName, Id = CurrentUser.Id, Email = CurrentUser.Email, DateRegistered = DateTime.UtcNow }); + } + else if (CurrentUser != null && ClassifiedUser != null) + { + // Classified user already exist + } + else + { + // Handle the case where the user is not authenticated + } + } + + protected override void OnInitialized() + { + Ad ??= new(); + } + + public async Task SaveAd() + { + if (IsEditing) + { + await ClassifiedAdService.UpdateAdAsync(Ad); + } + else + { + Ad.Id = Guid.NewGuid().ToString(); + Ad.DatePosted = DateTime.UtcNow; + Ad.UserId = CurrentUser.Id; + Ad.User = ClassifiedUser; + await ClassifiedAdService.CreateAdAsync(Ad); + } + + NavigationManager.NavigateTo("/classifieds"); + } + } +} diff --git a/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedAdRepository.cs b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedAdRepository.cs new file mode 100644 index 0000000..88fb345 --- /dev/null +++ b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedAdRepository.cs @@ -0,0 +1,10 @@ +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Repositories.Classifieds +{ + public interface IClassifiedAdRepository : IRepositoryBase + { + Task> GetAdsByCategoryAsync(string category); + Task> SearchAdsAsync(string searchTerm); + } +} diff --git a/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedMessageRepository.cs b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedMessageRepository.cs new file mode 100644 index 0000000..d46d363 --- /dev/null +++ b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedMessageRepository.cs @@ -0,0 +1,10 @@ +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Repositories.Classifieds +{ + public interface IClassifiedMessageRepository : IRepositoryBase + { + Task> GetMessagesForAdAsync(string adId); + Task> GetMessagesBetweenUsersAsync(string senderId, string receiverId); + } +} diff --git a/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedUserRepository.cs b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedUserRepository.cs new file mode 100644 index 0000000..71d5115 --- /dev/null +++ b/BaseServerTest/Contracts/Repositories/Classifieds/IClassifiedUserRepository.cs @@ -0,0 +1,9 @@ +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Repositories.Classifieds +{ + public interface IClassifiedUserRepository : IRepositoryBase + { + Task GetUserByUsernameAsync(string username); + } +} diff --git a/BaseServerTest/Contracts/Repositories/IRepositoryBase.cs b/BaseServerTest/Contracts/Repositories/IRepositoryBase.cs new file mode 100644 index 0000000..7f004b2 --- /dev/null +++ b/BaseServerTest/Contracts/Repositories/IRepositoryBase.cs @@ -0,0 +1,11 @@ +namespace BaseServerTest.Contracts.Repositories +{ + public interface IRepositoryBase where T : class + { + Task> GetAllAsync(); + Task GetByIdAsync(string id); + Task CreateAsync(T entity); + Task UpdateAsync(T entity); + Task DeleteAsync(T entity); + } +} diff --git a/BaseServerTest/Contracts/Services/Classifieds/IClassifiedAdService.cs b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedAdService.cs new file mode 100644 index 0000000..597f172 --- /dev/null +++ b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedAdService.cs @@ -0,0 +1,15 @@ +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Services.Classifieds +{ + public interface IClassifiedAdService + { + Task> GetAllAdsAsync(); + Task GetAdByIdAsync(string adId); + Task> GetAdsByCategoryAsync(string category); + Task> SearchAdsAsync(string searchTerm); + Task CreateAdAsync(ClassifiedAd ad); + Task UpdateAdAsync(ClassifiedAd ad); + Task DeleteAdAsync(string adId); + } +} diff --git a/BaseServerTest/Contracts/Services/Classifieds/IClassifiedMessageService.cs b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedMessageService.cs new file mode 100644 index 0000000..77ff571 --- /dev/null +++ b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedMessageService.cs @@ -0,0 +1,12 @@ + +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Services.Classifieds +{ + public interface IClassifiedMessageService + { + Task> GetMessagesForAdAsync(string adId); + Task> GetMessagesBetweenUsersAsync(string senderId, string receiverId); + Task SendMessageAsync(ClassifiedMessage message); + } +} diff --git a/BaseServerTest/Contracts/Services/Classifieds/IClassifiedUserService.cs b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedUserService.cs new file mode 100644 index 0000000..eceb484 --- /dev/null +++ b/BaseServerTest/Contracts/Services/Classifieds/IClassifiedUserService.cs @@ -0,0 +1,14 @@ +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Contracts.Services.Classifieds +{ + public interface IClassifiedUserService + { + Task GetUserByIdAsync(string userId); + Task GetUserByUsernameAsync(string username); + Task CreateUserAsync(ClassifiedUser user); + Task UpdateUserAsync(ClassifiedUser user); + Task DeleteUserAsync(string userId); + } + +} diff --git a/BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs deleted file mode 100644 index 5ee8e22..0000000 --- a/BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ /dev/null @@ -1,279 +0,0 @@ -// -using BaseServerTest.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using System; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("00000000000000_CreateIdentitySchema")] - partial class CreateIdentitySchema - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "8.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("BaseServerTest.Data.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("AccessFailedCount") - .HasColumnType("int"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit"); - - b.Property("LockoutEnabled") - .HasColumnType("bit"); - - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); - - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); - - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); - - b.ToTable("AspNetRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderKey") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("Name") - .HasColumnType("nvarchar(450)"); - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.Designer.cs b/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.Designer.cs deleted file mode 100644 index b0b53ff..0000000 --- a/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.Designer.cs +++ /dev/null @@ -1,353 +0,0 @@ -// -using System; -using BaseServerTest.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20240731145108_AddedAppointments")] - partial class AddedAppointments - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "8.0.1") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("BaseServerTest.Data.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("AccessFailedCount") - .HasColumnType("int"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit"); - - b.Property("LockoutEnabled") - .HasColumnType("bit"); - - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); - - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); - - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("BaseServerTest.Shared.Domain.Appointment", b => - { - b.Property("AppointmentId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("AppointmentId")); - - b.Property("AllDay") - .HasColumnType("bit"); - - b.Property("Caption") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("EndDate") - .HasColumnType("datetime2"); - - b.Property("Label") - .HasColumnType("int"); - - b.Property("StartDate") - .HasColumnType("datetime2"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("AppointmentId"); - - b.ToTable("Appointments"); - - b.HasData( - new - { - AppointmentId = 1, - AllDay = false, - Caption = "Šišanje", - EndDate = new DateTime(2024, 7, 31, 16, 30, 0, 0, DateTimeKind.Local), - Label = 1, - StartDate = new DateTime(2024, 7, 31, 14, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 2, - AllDay = false, - Caption = "Kod mehaničara", - EndDate = new DateTime(2024, 8, 2, 13, 30, 0, 0, DateTimeKind.Local), - Label = 6, - StartDate = new DateTime(2024, 8, 2, 11, 30, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 3, - AllDay = false, - Caption = "Šetnja sa patikama", - EndDate = new DateTime(2024, 8, 1, 8, 30, 0, 0, DateTimeKind.Local), - Label = 2, - StartDate = new DateTime(2024, 8, 1, 8, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 4, - AllDay = false, - Caption = "Gledanje u Mesec", - EndDate = new DateTime(2024, 7, 31, 1, 30, 0, 0, DateTimeKind.Local), - Label = 3, - StartDate = new DateTime(2024, 7, 31, 1, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); - - b.ToTable("AspNetRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderKey") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("Name") - .HasColumnType("nvarchar(450)"); - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.cs b/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.cs deleted file mode 100644 index 39ad9f8..0000000 --- a/BaseServerTest/Data/Migrations/20240731145108_AddedAppointments.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional - -namespace BaseServerTest.Migrations -{ - /// - public partial class AddedAppointments : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Appointments", - columns: table => new - { - AppointmentId = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - StartDate = table.Column(type: "datetime2", nullable: false), - EndDate = table.Column(type: "datetime2", nullable: false), - Caption = table.Column(type: "nvarchar(max)", nullable: false), - Label = table.Column(type: "int", nullable: false), - Status = table.Column(type: "int", nullable: false), - AllDay = table.Column(type: "bit", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Appointments", x => x.AppointmentId); - }); - - migrationBuilder.InsertData( - table: "Appointments", - columns: new[] { "AppointmentId", "AllDay", "Caption", "EndDate", "Label", "StartDate", "Status" }, - values: new object[,] - { - { 1, false, "Šišanje", new DateTime(2024, 7, 31, 16, 30, 0, 0, DateTimeKind.Local), 1, new DateTime(2024, 7, 31, 14, 0, 0, 0, DateTimeKind.Local), 1 }, - { 2, false, "Kod mehaničara", new DateTime(2024, 8, 2, 13, 30, 0, 0, DateTimeKind.Local), 6, new DateTime(2024, 8, 2, 11, 30, 0, 0, DateTimeKind.Local), 1 }, - { 3, false, "Šetnja sa patikama", new DateTime(2024, 8, 1, 8, 30, 0, 0, DateTimeKind.Local), 2, new DateTime(2024, 8, 1, 8, 0, 0, 0, DateTimeKind.Local), 1 }, - { 4, false, "Gledanje u Mesec", new DateTime(2024, 7, 31, 1, 30, 0, 0, DateTimeKind.Local), 3, new DateTime(2024, 7, 31, 1, 0, 0, 0, DateTimeKind.Local), 1 } - }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Appointments"); - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.Designer.cs b/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.Designer.cs deleted file mode 100644 index b5ffbc8..0000000 --- a/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.Designer.cs +++ /dev/null @@ -1,356 +0,0 @@ -// -using System; -using BaseServerTest.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20240731191213_DodatSrecniBroj")] - partial class DodatSrecniBroj - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "8.0.1") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("BaseServerTest.Data.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("AccessFailedCount") - .HasColumnType("int"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit"); - - b.Property("LockoutEnabled") - .HasColumnType("bit"); - - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); - - b.Property("LuckyNumber") - .HasColumnType("int"); - - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); - - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("BaseServerTest.Shared.Domain.Appointment", b => - { - b.Property("AppointmentId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("AppointmentId")); - - b.Property("AllDay") - .HasColumnType("bit"); - - b.Property("Caption") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("EndDate") - .HasColumnType("datetime2"); - - b.Property("Label") - .HasColumnType("int"); - - b.Property("StartDate") - .HasColumnType("datetime2"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("AppointmentId"); - - b.ToTable("Appointments"); - - b.HasData( - new - { - AppointmentId = 1, - AllDay = false, - Caption = "Šišanje", - EndDate = new DateTime(2024, 7, 31, 16, 30, 0, 0, DateTimeKind.Local), - Label = 1, - StartDate = new DateTime(2024, 7, 31, 14, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 2, - AllDay = false, - Caption = "Kod mehaničara", - EndDate = new DateTime(2024, 8, 2, 13, 30, 0, 0, DateTimeKind.Local), - Label = 6, - StartDate = new DateTime(2024, 8, 2, 11, 30, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 3, - AllDay = false, - Caption = "Šetnja sa patikama", - EndDate = new DateTime(2024, 8, 1, 8, 30, 0, 0, DateTimeKind.Local), - Label = 2, - StartDate = new DateTime(2024, 8, 1, 8, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 4, - AllDay = false, - Caption = "Gledanje u Mesec", - EndDate = new DateTime(2024, 7, 31, 1, 30, 0, 0, DateTimeKind.Local), - Label = 3, - StartDate = new DateTime(2024, 7, 31, 1, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); - - b.ToTable("AspNetRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderKey") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("Name") - .HasColumnType("nvarchar(450)"); - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.cs b/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.cs deleted file mode 100644 index 867747e..0000000 --- a/BaseServerTest/Data/Migrations/20240731191213_DodatSrecniBroj.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - /// - public partial class DodatSrecniBroj : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "LuckyNumber", - table: "AspNetUsers", - type: "int", - nullable: false, - defaultValue: 0); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "LuckyNumber", - table: "AspNetUsers"); - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.Designer.cs b/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.Designer.cs deleted file mode 100644 index a783933..0000000 --- a/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.Designer.cs +++ /dev/null @@ -1,384 +0,0 @@ -// -using System; -using BaseServerTest.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20240821195540_AddedChatPersistancy")] - partial class AddedChatPersistancy - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "8.0.1") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("BaseServerTest.Data.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("AccessFailedCount") - .HasColumnType("int"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit"); - - b.Property("LockoutEnabled") - .HasColumnType("bit"); - - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); - - b.Property("LuckyNumber") - .HasColumnType("int"); - - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); - - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); - - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("BaseServerTest.Data.ChatMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Content") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("GroupName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Timestamp") - .HasColumnType("datetime2"); - - b.Property("UserName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("ChatMessages"); - }); - - modelBuilder.Entity("BaseServerTest.Shared.Domain.Appointment", b => - { - b.Property("AppointmentId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("AppointmentId")); - - b.Property("AllDay") - .HasColumnType("bit"); - - b.Property("Caption") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("EndDate") - .HasColumnType("datetime2"); - - b.Property("Label") - .HasColumnType("int"); - - b.Property("StartDate") - .HasColumnType("datetime2"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("AppointmentId"); - - b.ToTable("Appointments"); - - b.HasData( - new - { - AppointmentId = 1, - AllDay = false, - Caption = "Šišanje", - EndDate = new DateTime(2024, 8, 21, 16, 30, 0, 0, DateTimeKind.Local), - Label = 1, - StartDate = new DateTime(2024, 8, 21, 14, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 2, - AllDay = false, - Caption = "Kod mehaničara", - EndDate = new DateTime(2024, 8, 23, 13, 30, 0, 0, DateTimeKind.Local), - Label = 6, - StartDate = new DateTime(2024, 8, 23, 11, 30, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 3, - AllDay = false, - Caption = "Šetnja sa patikama", - EndDate = new DateTime(2024, 8, 22, 8, 30, 0, 0, DateTimeKind.Local), - Label = 2, - StartDate = new DateTime(2024, 8, 22, 8, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }, - new - { - AppointmentId = 4, - AllDay = false, - Caption = "Gledanje u Mesec", - EndDate = new DateTime(2024, 8, 21, 1, 30, 0, 0, DateTimeKind.Local), - Label = 3, - StartDate = new DateTime(2024, 8, 21, 1, 0, 0, 0, DateTimeKind.Local), - Status = 1 - }); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); - - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); - - b.ToTable("AspNetRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); - - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderKey") - .HasColumnType("nvarchar(450)"); - - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") - .HasColumnType("nvarchar(450)"); - - b.Property("Name") - .HasColumnType("nvarchar(450)"); - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("BaseServerTest.Data.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.cs b/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.cs deleted file mode 100644 index 7b08c9e..0000000 --- a/BaseServerTest/Data/Migrations/20240821195540_AddedChatPersistancy.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - /// - public partial class AddedChatPersistancy : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "ChatMessages", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - GroupName = table.Column(type: "nvarchar(max)", nullable: false), - UserName = table.Column(type: "nvarchar(max)", nullable: false), - Content = table.Column(type: "nvarchar(max)", nullable: false), - Timestamp = table.Column(type: "datetime2", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_ChatMessages", x => x.Id); - }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 1, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 21, 16, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 21, 14, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 2, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 23, 13, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 23, 11, 30, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 3, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 22, 8, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 22, 8, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 4, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 21, 1, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 21, 1, 0, 0, 0, DateTimeKind.Local) }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "ChatMessages"); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 1, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 7, 31, 16, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 7, 31, 14, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 2, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 2, 13, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 2, 11, 30, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 3, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 1, 8, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 1, 8, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 4, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 7, 31, 1, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 7, 31, 1, 0, 0, 0, DateTimeKind.Local) }); - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.cs b/BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.cs deleted file mode 100644 index 3e33cb3..0000000 --- a/BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.cs +++ /dev/null @@ -1,180 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BaseServerTest.Migrations -{ - /// - public partial class CreateClassifiedEntities : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "ClassifiedUsers", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - UserName = table.Column(type: "nvarchar(max)", nullable: false), - Email = table.Column(type: "nvarchar(max)", nullable: false), - PasswordHash = table.Column(type: "nvarchar(max)", nullable: false), - DateRegistered = table.Column(type: "datetime2", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_ClassifiedUsers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "ClassifiedAds", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - Title = table.Column(type: "nvarchar(max)", nullable: false), - Description = table.Column(type: "nvarchar(max)", nullable: false), - Category = table.Column(type: "nvarchar(max)", nullable: false), - Price = table.Column(type: "decimal(18,2)", nullable: false), - DatePosted = table.Column(type: "datetime2", nullable: false), - IsActive = table.Column(type: "bit", nullable: false), - UserId = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_ClassifiedAds", x => x.Id); - table.ForeignKey( - name: "FK_ClassifiedAds_ClassifiedUsers_UserId", - column: x => x.UserId, - principalTable: "ClassifiedUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "ClassifiedMessages", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - Content = table.Column(type: "nvarchar(max)", nullable: false), - DateSent = table.Column(type: "datetime2", nullable: false), - SenderId = table.Column(type: "int", nullable: false), - ReceiverId = table.Column(type: "int", nullable: false), - ClassifiedAdId = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_ClassifiedMessages", x => x.Id); - table.ForeignKey( - name: "FK_ClassifiedMessages_ClassifiedAds_ClassifiedAdId", - column: x => x.ClassifiedAdId, - principalTable: "ClassifiedAds", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_ClassifiedMessages_ClassifiedUsers_ReceiverId", - column: x => x.ReceiverId, - principalTable: "ClassifiedUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_ClassifiedMessages_ClassifiedUsers_SenderId", - column: x => x.SenderId, - principalTable: "ClassifiedUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 1, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 27, 16, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 27, 14, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 2, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 29, 13, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 29, 11, 30, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 3, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 28, 8, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 28, 8, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 4, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 27, 1, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 27, 1, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.CreateIndex( - name: "IX_ClassifiedAds_UserId", - table: "ClassifiedAds", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_ClassifiedMessages_ClassifiedAdId", - table: "ClassifiedMessages", - column: "ClassifiedAdId"); - - migrationBuilder.CreateIndex( - name: "IX_ClassifiedMessages_ReceiverId", - table: "ClassifiedMessages", - column: "ReceiverId"); - - migrationBuilder.CreateIndex( - name: "IX_ClassifiedMessages_SenderId", - table: "ClassifiedMessages", - column: "SenderId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "ClassifiedMessages"); - - migrationBuilder.DropTable( - name: "ClassifiedAds"); - - migrationBuilder.DropTable( - name: "ClassifiedUsers"); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 1, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 21, 16, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 21, 14, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 2, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 23, 13, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 23, 11, 30, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 3, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 22, 8, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 22, 8, 0, 0, 0, DateTimeKind.Local) }); - - migrationBuilder.UpdateData( - table: "Appointments", - keyColumn: "AppointmentId", - keyValue: 4, - columns: new[] { "EndDate", "StartDate" }, - values: new object[] { new DateTime(2024, 8, 21, 1, 30, 0, 0, DateTimeKind.Local), new DateTime(2024, 8, 21, 1, 0, 0, 0, DateTimeKind.Local) }); - } - } -} diff --git a/BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.Designer.cs b/BaseServerTest/Migrations/20240829090657_InitialCreate.Designer.cs similarity index 91% rename from BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.Designer.cs rename to BaseServerTest/Migrations/20240829090657_InitialCreate.Designer.cs index 3294016..be3d1e4 100644 --- a/BaseServerTest/Data/Migrations/20240827182603_CreateClassifiedEntities.Designer.cs +++ b/BaseServerTest/Migrations/20240829090657_InitialCreate.Designer.cs @@ -12,8 +12,8 @@ namespace BaseServerTest.Migrations { [DbContext(typeof(ApplicationDbContext))] - [Migration("20240827182603_CreateClassifiedEntities")] - partial class CreateClassifiedEntities + [Migration("20240829090657_InitialCreate")] + partial class InitialCreate { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -130,9 +130,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) AppointmentId = 1, AllDay = false, Caption = "Šišanje", - EndDate = new DateTime(2024, 8, 27, 16, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 29, 16, 30, 0, 0, DateTimeKind.Local), Label = 1, - StartDate = new DateTime(2024, 8, 27, 14, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 29, 14, 0, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -140,9 +140,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) AppointmentId = 2, AllDay = false, Caption = "Kod mehaničara", - EndDate = new DateTime(2024, 8, 29, 13, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 31, 13, 30, 0, 0, DateTimeKind.Local), Label = 6, - StartDate = new DateTime(2024, 8, 29, 11, 30, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 31, 11, 30, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -150,9 +150,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) AppointmentId = 3, AllDay = false, Caption = "Šetnja sa patikama", - EndDate = new DateTime(2024, 8, 28, 8, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 30, 8, 30, 0, 0, DateTimeKind.Local), Label = 2, - StartDate = new DateTime(2024, 8, 28, 8, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 30, 8, 0, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -160,9 +160,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) AppointmentId = 4, AllDay = false, Caption = "Gledanje u Mesec", - EndDate = new DateTime(2024, 8, 27, 1, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 29, 1, 30, 0, 0, DateTimeKind.Local), Label = 3, - StartDate = new DateTime(2024, 8, 27, 1, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 29, 1, 0, 0, 0, DateTimeKind.Local), Status = 1 }); }); @@ -197,11 +197,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedAd", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); b.Property("Category") .IsRequired() @@ -224,8 +221,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .HasColumnType("int"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.HasKey("Id"); @@ -236,14 +234,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedMessage", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("ClassifiedAdId") - .HasColumnType("int"); + b.Property("ClassifiedAdId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.Property("Content") .IsRequired() @@ -252,11 +248,13 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("DateSent") .HasColumnType("datetime2"); - b.Property("ReceiverId") - .HasColumnType("int"); + b.Property("ReceiverId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.Property("SenderId") - .HasColumnType("int"); + b.Property("SenderId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.HasKey("Id"); @@ -271,11 +269,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedUser", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); b.Property("DateRegistered") .HasColumnType("datetime2"); @@ -284,10 +279,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("PasswordHash") - .IsRequired() - .HasColumnType("nvarchar(max)"); - b.Property("UserName") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/BaseServerTest/Migrations/20240829090657_InitialCreate.cs similarity index 55% rename from BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to BaseServerTest/Migrations/20240829090657_InitialCreate.cs index 3bb2ac0..8acad7a 100644 --- a/BaseServerTest/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/BaseServerTest/Migrations/20240829090657_InitialCreate.cs @@ -1,16 +1,36 @@ -using Microsoft.EntityFrameworkCore.Migrations; -using System; +using System; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable +#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional + namespace BaseServerTest.Migrations { /// - public partial class CreateIdentitySchema : Migration + public partial class InitialCreate : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) { + migrationBuilder.CreateTable( + name: "Appointments", + columns: table => new + { + AppointmentId = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + StartDate = table.Column(type: "datetime2", nullable: false), + EndDate = table.Column(type: "datetime2", nullable: false), + Caption = table.Column(type: "nvarchar(max)", nullable: false), + Label = table.Column(type: "int", nullable: false), + Status = table.Column(type: "int", nullable: false), + AllDay = table.Column(type: "bit", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Appointments", x => x.AppointmentId); + }); + migrationBuilder.CreateTable( name: "AspNetRoles", columns: table => new @@ -30,6 +50,7 @@ protected override void Up(MigrationBuilder migrationBuilder) columns: table => new { Id = table.Column(type: "nvarchar(450)", nullable: false), + LuckyNumber = table.Column(type: "int", nullable: false), UserName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), NormalizedUserName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), Email = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), @@ -50,6 +71,36 @@ protected override void Up(MigrationBuilder migrationBuilder) table.PrimaryKey("PK_AspNetUsers", x => x.Id); }); + migrationBuilder.CreateTable( + name: "ChatMessages", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + GroupName = table.Column(type: "nvarchar(max)", nullable: false), + UserName = table.Column(type: "nvarchar(max)", nullable: false), + Content = table.Column(type: "nvarchar(max)", nullable: false), + Timestamp = table.Column(type: "datetime2", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ChatMessages", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "ClassifiedUsers", + columns: table => new + { + Id = table.Column(type: "nvarchar(450)", nullable: false), + UserName = table.Column(type: "nvarchar(max)", nullable: false), + Email = table.Column(type: "nvarchar(max)", nullable: false), + DateRegistered = table.Column(type: "datetime2", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ClassifiedUsers", x => x.Id); + }); + migrationBuilder.CreateTable( name: "AspNetRoleClaims", columns: table => new @@ -156,6 +207,75 @@ protected override void Up(MigrationBuilder migrationBuilder) onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateTable( + name: "ClassifiedAds", + columns: table => new + { + Id = table.Column(type: "nvarchar(450)", nullable: false), + Title = table.Column(type: "nvarchar(max)", nullable: false), + Description = table.Column(type: "nvarchar(max)", nullable: false), + Category = table.Column(type: "nvarchar(max)", nullable: false), + Price = table.Column(type: "decimal(18,2)", nullable: false), + DatePosted = table.Column(type: "datetime2", nullable: false), + IsActive = table.Column(type: "bit", nullable: false), + UserId = table.Column(type: "nvarchar(450)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ClassifiedAds", x => x.Id); + table.ForeignKey( + name: "FK_ClassifiedAds_ClassifiedUsers_UserId", + column: x => x.UserId, + principalTable: "ClassifiedUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "ClassifiedMessages", + columns: table => new + { + Id = table.Column(type: "nvarchar(450)", nullable: false), + Content = table.Column(type: "nvarchar(max)", nullable: false), + DateSent = table.Column(type: "datetime2", nullable: false), + SenderId = table.Column(type: "nvarchar(450)", nullable: false), + ReceiverId = table.Column(type: "nvarchar(450)", nullable: false), + ClassifiedAdId = table.Column(type: "nvarchar(450)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ClassifiedMessages", x => x.Id); + table.ForeignKey( + name: "FK_ClassifiedMessages_ClassifiedAds_ClassifiedAdId", + column: x => x.ClassifiedAdId, + principalTable: "ClassifiedAds", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ClassifiedMessages_ClassifiedUsers_ReceiverId", + column: x => x.ReceiverId, + principalTable: "ClassifiedUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_ClassifiedMessages_ClassifiedUsers_SenderId", + column: x => x.SenderId, + principalTable: "ClassifiedUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.InsertData( + table: "Appointments", + columns: new[] { "AppointmentId", "AllDay", "Caption", "EndDate", "Label", "StartDate", "Status" }, + values: new object[,] + { + { 1, false, "Šišanje", new DateTime(2024, 8, 29, 16, 30, 0, 0, DateTimeKind.Local), 1, new DateTime(2024, 8, 29, 14, 0, 0, 0, DateTimeKind.Local), 1 }, + { 2, false, "Kod mehaničara", new DateTime(2024, 8, 31, 13, 30, 0, 0, DateTimeKind.Local), 6, new DateTime(2024, 8, 31, 11, 30, 0, 0, DateTimeKind.Local), 1 }, + { 3, false, "Šetnja sa patikama", new DateTime(2024, 8, 30, 8, 30, 0, 0, DateTimeKind.Local), 2, new DateTime(2024, 8, 30, 8, 0, 0, 0, DateTimeKind.Local), 1 }, + { 4, false, "Gledanje u Mesec", new DateTime(2024, 8, 29, 1, 30, 0, 0, DateTimeKind.Local), 3, new DateTime(2024, 8, 29, 1, 0, 0, 0, DateTimeKind.Local), 1 } + }); + migrationBuilder.CreateIndex( name: "IX_AspNetRoleClaims_RoleId", table: "AspNetRoleClaims", @@ -194,11 +314,34 @@ protected override void Up(MigrationBuilder migrationBuilder) column: "NormalizedUserName", unique: true, filter: "[NormalizedUserName] IS NOT NULL"); + + migrationBuilder.CreateIndex( + name: "IX_ClassifiedAds_UserId", + table: "ClassifiedAds", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_ClassifiedMessages_ClassifiedAdId", + table: "ClassifiedMessages", + column: "ClassifiedAdId"); + + migrationBuilder.CreateIndex( + name: "IX_ClassifiedMessages_ReceiverId", + table: "ClassifiedMessages", + column: "ReceiverId"); + + migrationBuilder.CreateIndex( + name: "IX_ClassifiedMessages_SenderId", + table: "ClassifiedMessages", + column: "SenderId"); } /// protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "Appointments"); + migrationBuilder.DropTable( name: "AspNetRoleClaims"); @@ -214,11 +357,23 @@ protected override void Down(MigrationBuilder migrationBuilder) migrationBuilder.DropTable( name: "AspNetUserTokens"); + migrationBuilder.DropTable( + name: "ChatMessages"); + + migrationBuilder.DropTable( + name: "ClassifiedMessages"); + migrationBuilder.DropTable( name: "AspNetRoles"); migrationBuilder.DropTable( name: "AspNetUsers"); + + migrationBuilder.DropTable( + name: "ClassifiedAds"); + + migrationBuilder.DropTable( + name: "ClassifiedUsers"); } } } diff --git a/BaseServerTest/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/BaseServerTest/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 92% rename from BaseServerTest/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to BaseServerTest/Migrations/ApplicationDbContextModelSnapshot.cs index 32b1377..e4992dd 100644 --- a/BaseServerTest/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/BaseServerTest/Migrations/ApplicationDbContextModelSnapshot.cs @@ -127,9 +127,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) AppointmentId = 1, AllDay = false, Caption = "Šišanje", - EndDate = new DateTime(2024, 8, 27, 16, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 29, 16, 30, 0, 0, DateTimeKind.Local), Label = 1, - StartDate = new DateTime(2024, 8, 27, 14, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 29, 14, 0, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -137,9 +137,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) AppointmentId = 2, AllDay = false, Caption = "Kod mehaničara", - EndDate = new DateTime(2024, 8, 29, 13, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 31, 13, 30, 0, 0, DateTimeKind.Local), Label = 6, - StartDate = new DateTime(2024, 8, 29, 11, 30, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 31, 11, 30, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -147,9 +147,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) AppointmentId = 3, AllDay = false, Caption = "Šetnja sa patikama", - EndDate = new DateTime(2024, 8, 28, 8, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 30, 8, 30, 0, 0, DateTimeKind.Local), Label = 2, - StartDate = new DateTime(2024, 8, 28, 8, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 30, 8, 0, 0, 0, DateTimeKind.Local), Status = 1 }, new @@ -157,9 +157,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) AppointmentId = 4, AllDay = false, Caption = "Gledanje u Mesec", - EndDate = new DateTime(2024, 8, 27, 1, 30, 0, 0, DateTimeKind.Local), + EndDate = new DateTime(2024, 8, 29, 1, 30, 0, 0, DateTimeKind.Local), Label = 3, - StartDate = new DateTime(2024, 8, 27, 1, 0, 0, 0, DateTimeKind.Local), + StartDate = new DateTime(2024, 8, 29, 1, 0, 0, 0, DateTimeKind.Local), Status = 1 }); }); @@ -194,11 +194,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedAd", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); b.Property("Category") .IsRequired() @@ -221,8 +218,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .HasColumnType("int"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.HasKey("Id"); @@ -233,14 +231,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedMessage", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("ClassifiedAdId") - .HasColumnType("int"); + b.Property("ClassifiedAdId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.Property("Content") .IsRequired() @@ -249,11 +245,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("DateSent") .HasColumnType("datetime2"); - b.Property("ReceiverId") - .HasColumnType("int"); + b.Property("ReceiverId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.Property("SenderId") - .HasColumnType("int"); + b.Property("SenderId") + .IsRequired() + .HasColumnType("nvarchar(450)"); b.HasKey("Id"); @@ -268,11 +266,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("BaseServerTest.Shared.Domain.Classifieds.ClassifiedUser", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("Id") + .HasColumnType("nvarchar(450)"); b.Property("DateRegistered") .HasColumnType("datetime2"); @@ -281,10 +276,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("PasswordHash") - .IsRequired() - .HasColumnType("nvarchar(max)"); - b.Property("UserName") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/BaseServerTest/Program.cs b/BaseServerTest/Program.cs index bb0770f..0369ec6 100644 --- a/BaseServerTest/Program.cs +++ b/BaseServerTest/Program.cs @@ -13,6 +13,10 @@ using BaseServerTest.State; using System; using BaseServerTest.Misc; +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Repositories.Classifieds; +using BaseServerTest.Services.Classifieds; namespace BaseServerTest { public class Program @@ -60,6 +64,16 @@ public static void Main(string[] args) builder.Services.AddScoped(); builder.Services.AddScoped(); + // ClassifiedsRepository registrations + builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); + + // Classifieds Service registrations + builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); diff --git a/BaseServerTest/Repositories/Classifieds/ClassifiedAdRepository.cs b/BaseServerTest/Repositories/Classifieds/ClassifiedAdRepository.cs new file mode 100644 index 0000000..173c876 --- /dev/null +++ b/BaseServerTest/Repositories/Classifieds/ClassifiedAdRepository.cs @@ -0,0 +1,29 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.EntityFrameworkCore; + +namespace BaseServerTest.Repositories.Classifieds +{ + public class ClassifiedAdRepository : RepositoryBase, IClassifiedAdRepository + { + public ClassifiedAdRepository(ApplicationDbContext context) : base(context) + { + } + + public async Task> GetAdsByCategoryAsync(string category) + { + return await _context.ClassifiedAds + .Where(ad => ad.Category == category && ad.IsActive) + .ToListAsync(); + } + + public async Task> SearchAdsAsync(string searchTerm) + { + return await _context.ClassifiedAds + .Where(ad => (ad.Title.Contains(searchTerm) || ad.Description.Contains(searchTerm)) && ad.IsActive) + .ToListAsync(); + } + } + +} diff --git a/BaseServerTest/Repositories/Classifieds/ClassifiedMessageRepository.cs b/BaseServerTest/Repositories/Classifieds/ClassifiedMessageRepository.cs new file mode 100644 index 0000000..6e60d2e --- /dev/null +++ b/BaseServerTest/Repositories/Classifieds/ClassifiedMessageRepository.cs @@ -0,0 +1,32 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.EntityFrameworkCore; + +namespace BaseServerTest.Repositories.Classifieds +{ + public class ClassifiedMessageRepository : RepositoryBase, IClassifiedMessageRepository + { + public ClassifiedMessageRepository(ApplicationDbContext context) : base(context) + { + } + + public async Task> GetMessagesForAdAsync(string adId) + { + return await _context.ClassifiedMessages + .Where(m => m.ClassifiedAdId == adId) + .OrderBy(m => m.DateSent) + .ToListAsync(); + } + + public async Task> GetMessagesBetweenUsersAsync(string senderId, string receiverId) + { + return await _context.ClassifiedMessages + .Where(m => (m.SenderId == senderId && m.ReceiverId == receiverId) || + (m.SenderId == receiverId && m.ReceiverId == senderId)) + .OrderBy(m => m.DateSent) + .ToListAsync(); + } + } + +} diff --git a/BaseServerTest/Repositories/Classifieds/ClassifiedUserRepository.cs b/BaseServerTest/Repositories/Classifieds/ClassifiedUserRepository.cs new file mode 100644 index 0000000..587bc00 --- /dev/null +++ b/BaseServerTest/Repositories/Classifieds/ClassifiedUserRepository.cs @@ -0,0 +1,20 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.EntityFrameworkCore; + +namespace BaseServerTest.Repositories.Classifieds +{ + public class ClassifiedUserRepository : RepositoryBase, IClassifiedUserRepository + { + public ClassifiedUserRepository(ApplicationDbContext context) : base(context) + { + } + + public async Task GetUserByUsernameAsync(string username) + { + return await _context.ClassifiedUsers.FirstOrDefaultAsync(u => u.UserName == username); + } + } + +} diff --git a/BaseServerTest/Repositories/RepositoryBase.cs b/BaseServerTest/Repositories/RepositoryBase.cs new file mode 100644 index 0000000..2c0a8c1 --- /dev/null +++ b/BaseServerTest/Repositories/RepositoryBase.cs @@ -0,0 +1,45 @@ +using BaseServerTest.Contracts.Repositories; +using BaseServerTest.Data; +using Microsoft.EntityFrameworkCore; + +namespace BaseServerTest.Repositories +{ + public abstract class RepositoryBase : IRepositoryBase where T : class + { + protected readonly ApplicationDbContext _context; + + public RepositoryBase(ApplicationDbContext context) + { + _context = context; + } + + public async Task> GetAllAsync() + { + return await _context.Set().ToListAsync(); + } + + public async Task GetByIdAsync(string id) + { + return await _context.Set().FindAsync(id); + } + + public async Task CreateAsync(T entity) + { + _context.Set().Add(entity); + await _context.SaveChangesAsync(); + } + + public async Task UpdateAsync(T entity) + { + _context.Set().Update(entity); + await _context.SaveChangesAsync(); + } + + public async Task DeleteAsync(T entity) + { + _context.Set().Remove(entity); + await _context.SaveChangesAsync(); + } + } + +} diff --git a/BaseServerTest/Services/Classifieds/ClassifiedAdService.cs b/BaseServerTest/Services/Classifieds/ClassifiedAdService.cs new file mode 100644 index 0000000..9a122e8 --- /dev/null +++ b/BaseServerTest/Services/Classifieds/ClassifiedAdService.cs @@ -0,0 +1,57 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Services.Classifieds +{ + public class ClassifiedAdService : IClassifiedAdService + { + private readonly IClassifiedAdRepository _repository; + + public ClassifiedAdService(IClassifiedAdRepository repository) + { + _repository = repository; + } + + public async Task> GetAllAdsAsync() + { + return await _repository.GetAllAsync(); + } + + public async Task GetAdByIdAsync(string adId) + { + return await _repository.GetByIdAsync(adId); + } + + public async Task> GetAdsByCategoryAsync(string category) + { + return await _repository.GetAdsByCategoryAsync(category); + } + + public async Task> SearchAdsAsync(string searchTerm) + { + return await _repository.SearchAdsAsync(searchTerm); + } + + public async Task CreateAdAsync(ClassifiedAd ad) + { + await _repository.CreateAsync(ad); + } + + public async Task UpdateAdAsync(ClassifiedAd ad) + { + await _repository.UpdateAsync(ad); + } + + public async Task DeleteAdAsync(string adId) + { + var ad = await _repository.GetByIdAsync(adId); + if (ad != null) + { + ad.IsActive = false; + await _repository.UpdateAsync(ad); + } + } + } + +} diff --git a/BaseServerTest/Services/Classifieds/ClassifiedMessageService.cs b/BaseServerTest/Services/Classifieds/ClassifiedMessageService.cs new file mode 100644 index 0000000..3cda128 --- /dev/null +++ b/BaseServerTest/Services/Classifieds/ClassifiedMessageService.cs @@ -0,0 +1,32 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Shared.Domain.Classifieds; + +namespace BaseServerTest.Services.Classifieds +{ + public class ClassifiedMessageService : IClassifiedMessageService + { + private readonly IClassifiedMessageRepository _repository; + + public ClassifiedMessageService(IClassifiedMessageRepository repository) + { + _repository = repository; + } + + public async Task> GetMessagesForAdAsync(string adId) + { + return await _repository.GetMessagesForAdAsync(adId); + } + + public async Task> GetMessagesBetweenUsersAsync(string senderId, string receiverId) + { + return await _repository.GetMessagesBetweenUsersAsync(senderId, receiverId); + } + + public async Task SendMessageAsync(ClassifiedMessage message) + { + await _repository.CreateAsync(message); + } + } + +} diff --git a/BaseServerTest/Services/Classifieds/ClassifiedUserService.cs b/BaseServerTest/Services/Classifieds/ClassifiedUserService.cs new file mode 100644 index 0000000..63c696c --- /dev/null +++ b/BaseServerTest/Services/Classifieds/ClassifiedUserService.cs @@ -0,0 +1,73 @@ +using BaseServerTest.Contracts.Repositories.Classifieds; +using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Data; +using BaseServerTest.Shared.Domain.Classifieds; +using Microsoft.AspNetCore.Identity; + +namespace BaseServerTest.Services.Classifieds +{ + public class ClassifiedUserService : IClassifiedUserService + { + private readonly IClassifiedUserRepository _repository; + private readonly UserManager _userManager; + private readonly ApplicationDbContext _context; + + public ClassifiedUserService(IClassifiedUserRepository repository, UserManager userManager, ApplicationDbContext context) + { + _repository = repository; + _userManager = userManager ?? throw new ArgumentNullException(nameof(userManager)); + _context = context ?? throw new ArgumentNullException(nameof(context)); + } + public async Task CreateClassifiedUserAsync(string identityUserId, string username) + { + var identityUser = await _userManager.FindByIdAsync(identityUserId); + if (identityUser == null) + { + throw new ArgumentException("Invalid IdentityUser ID"); + } + + var classifiedUser = new ClassifiedUser + { + Id = identityUser.Id, + UserName = username, + Email = identityUser.Email, + DateRegistered = DateTime.UtcNow + }; + + _context.ClassifiedUsers.Add(classifiedUser); + await _context.SaveChangesAsync(); + + return classifiedUser; + } + + public async Task GetUserByIdAsync(string userId) + { + return await _repository.GetByIdAsync(userId); + } + + public async Task GetUserByUsernameAsync(string username) + { + return await _repository.GetUserByUsernameAsync(username); + } + + public async Task CreateUserAsync(ClassifiedUser user) + { + await _repository.CreateAsync(user); + } + + public async Task UpdateUserAsync(ClassifiedUser user) + { + await _repository.UpdateAsync(user); + } + + public async Task DeleteUserAsync(string userId) + { + var user = await _repository.GetByIdAsync(userId); + if (user != null) + { + await _repository.DeleteAsync(user); + } + } + } + +} From 4d3b9ef64c96c05576e76a25690913ead833c663 Mon Sep 17 00:00:00 2001 From: iSQL Date: Thu, 29 Aug 2024 17:13:11 +0200 Subject: [PATCH 2/2] - Fixed basic messaging --- .../Pages/Classifieds/AddMessages.razor.cs | 17 ++++++++-- .../Pages/Classifieds/ContactSeller.razor | 5 +-- .../Pages/Classifieds/ContactSeller.razor.cs | 32 +++++++++++-------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs index 957f974..c219f57 100644 --- a/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs +++ b/BaseServerTest/Components/Pages/Classifieds/AddMessages.razor.cs @@ -1,21 +1,32 @@ using BaseServerTest.Contracts.Services.Classifieds; +using BaseServerTest.Data; using BaseServerTest.Services.Classifieds; using BaseServerTest.Shared.Domain.Classifieds; using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Identity; namespace BaseServerTest.Components.Pages.Classifieds { public partial class AddMessages { + [Inject] + UserManager UserManager { get; set; } + [Inject] + AuthenticationStateProvider AuthenticationStateProvider { get; set; } [Inject] public IClassifiedMessageService ClassifiedMessageService { get; set; } public List Messages; protected override async Task OnInitializedAsync() { - // Replace with logic to get the logged-in user's ID - var userId = new Guid().ToString(); - var anotherUserId = new Guid().ToString(); + // ToDo: Add navigational properties for ad, users + // Add message details + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + var currentUser = await UserManager.GetUserAsync(authState.User); + + var userId = currentUser?.Id; + var anotherUserId = currentUser?.Id; Messages = await ClassifiedMessageService.GetMessagesBetweenUsersAsync(userId, anotherUserId); } } diff --git a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor index 4193bf2..bdcbe8e 100644 --- a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor +++ b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor @@ -1,14 +1,15 @@ @page "/classifieds/contact/{SellerId}/{AdId}" +@rendermode InteractiveServer

Contact Seller

- +
- +
diff --git a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs index d38319d..783b604 100644 --- a/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs +++ b/BaseServerTest/Components/Pages/Classifieds/ContactSeller.razor.cs @@ -17,27 +17,33 @@ public partial class ContactSeller UserManager UserManager { get; set; } [Inject] AuthenticationStateProvider AuthenticationStateProvider { get; set; } - [Parameter] public string SellerId { get; set; } - [Parameter] public string AdId { get; set; } - public ClassifiedMessage Message = new ClassifiedMessage(); - protected async override void OnInitialized() - { - Message.Id = Guid.NewGuid().ToString(); - Message.ReceiverId = SellerId; - Message.ClassifiedAdId = AdId; - Message.DateSent = DateTime.UtcNow; - var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); - var currentUser = await UserManager.GetUserAsync(authState.User); - Message.SenderId = currentUser?.Id; + [Parameter] + public string SellerId { get; set; } + [Parameter] + public string AdId { get; set; } + [SupplyParameterFromForm] + public ClassifiedMessage ClassifiedMessage { get; set; } + protected override void OnInitialized() + { + ClassifiedMessage ??= new(); //ToDo: Add navigational items // Get sendId } private async Task SendMessage() { - await ClassifiedMessageService.SendMessageAsync(Message); + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + var currentUser = await UserManager.GetUserAsync(authState.User); + + ClassifiedMessage.Id = Guid.NewGuid().ToString(); + ClassifiedMessage.ReceiverId = SellerId; + ClassifiedMessage.ClassifiedAdId = AdId; + ClassifiedMessage.DateSent = DateTime.UtcNow; + + ClassifiedMessage.SenderId = currentUser?.Id; + await ClassifiedMessageService.SendMessageAsync(ClassifiedMessage); // Navigate back to classifieds or to the conversation } }