diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index 995e37fd..8e0c9937 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -10,7 +10,6 @@ using TIAM.Entities.Addresses; using TIAM.Entities.Drivers; using TIAM.Entities.Emails; using TIAM.Entities.Products; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; using TIAM.Entities.Transfers; @@ -407,6 +406,8 @@ namespace TIAM.Database.Test Name = name, Description = name + "description", Price = 15000, + Price2 = 21000, + Price3 = 23000, PriceType = PriceType.Fix, Address = new Address { @@ -486,6 +487,7 @@ namespace TIAM.Database.Test var contextId = Guid.Parse(emailIdSenderIdContextIdSenderEmailRecipientIdStrings[2]); var senderEmail = emailIdSenderIdContextIdSenderEmailRecipientIdStrings[3]; var recipientId = Guid.Parse(emailIdSenderIdContextIdSenderEmailRecipientIdStrings[4]); + var recipientEmail = "info@touriam.com"; var subject = "Transfer - Budapest, Liszt Ferenc tér"; var text = "1211 Budapest, Kossuth Lajos utca 145"; @@ -493,7 +495,7 @@ namespace TIAM.Database.Test await Dal.RemoveEmailMessageAsync(emailMessageId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. var emailMessage = new EmailMessage(emailMessageId, senderId, contextId, subject, text, senderEmail); - emailMessage.Recipients.Add(new EmailRecipient(id: Guid.NewGuid(), recipientId, emailMessageId)); + emailMessage.Recipients.Add(new EmailRecipient(id: Guid.NewGuid(), recipientId, emailMessageId, recipientEmail)); Assert.IsTrue(await Dal.AddEmailMessageAsync(emailMessage)); diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 3c7886e2..5e2daa9c 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -14,7 +14,6 @@ using TIAM.Entities.Emails; using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Transfers; using TIAM.Entities.Users; using TIAM.Models.Dtos.Products; diff --git a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs index f30a106c..9c9a9f86 100644 --- a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs +++ b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs @@ -15,7 +15,6 @@ using TIAM.Database.DbSets.Users; using AyCode.Database.DataLayers; using AyCode.Database.DbSets.Users; using TIAM.Database.DbSets.Products; -using TIAM.Entities.TransferDestinations; using TIAM.Models.Dtos.Users; using Newtonsoft.Json; diff --git a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs index 9264ef54..f12a44e4 100644 --- a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs +++ b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs @@ -8,7 +8,7 @@ using AyCode.Utils.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.Identity.Client; using TIAM.Database.DbContexts.Transfers; -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; using TIAM.Entities.Users; namespace TIAM.Database.DataLayers.TransferDestinations; diff --git a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs index 8843e378..e599e43c 100644 --- a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs +++ b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs @@ -16,7 +16,6 @@ using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Transfers; using TIAM.Entities.Users; diff --git a/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs b/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs index d14971d2..da981354 100644 --- a/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs +++ b/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using AyCode.Database.DbContexts; using Microsoft.EntityFrameworkCore; using TIAM.Entities.Auctions; -using TIAM.Entities.TransferDestinations; namespace TIAM.Database.DbContexts.Auctions { diff --git a/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs b/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs index 8c9884aa..018dc2a5 100644 --- a/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs +++ b/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs @@ -15,7 +15,7 @@ using TIAM.Entities.Addresses; using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; using TIAM.Entities.Users; namespace TIAM.Database.DbContexts.ServiceProviders diff --git a/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs b/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs index e206616c..91fc67de 100644 --- a/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs +++ b/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; namespace TIAM.Database.DbContexts.Transfers { diff --git a/TIAM.Database/DbContexts/Users/UserDbContext.cs b/TIAM.Database/DbContexts/Users/UserDbContext.cs index 16f9004a..31fca820 100644 --- a/TIAM.Database/DbContexts/Users/UserDbContext.cs +++ b/TIAM.Database/DbContexts/Users/UserDbContext.cs @@ -21,7 +21,6 @@ using TIAM.Entities.Emails; using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.Profiles; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Transfers; using TIAM.Entities.Users; diff --git a/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs b/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs index c2dd8385..1dc1fdbb 100644 --- a/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs +++ b/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs @@ -16,7 +16,7 @@ public static class EmailMessageDbSetExtension => ctx.EmailMessages.Where(x => x.SenderId == senderId); public static IQueryable GetEmailMessagesBySenderEmailAddress(this IEmailMessageDbSet ctx, string senderEmailAddress) - => ctx.EmailMessages.Where(x => x.SenderEmailAddress == senderEmailAddress); + => ctx.EmailMessages.Where(x => x.EmailAddress == senderEmailAddress); private static IQueryable GetEmailMessages(this IQueryable queryableEmails, Guid userId, Guid userProductMappingId) => queryableEmails.Where(x => x.SenderId == userId || x.SenderId == userProductMappingId || x.Recipients.Any(recipient => recipient.RecipientId == userId || recipient.RecipientId == userProductMappingId)); diff --git a/TIAM.Database/DbSets/Transfers/ITransferDbSet.cs b/TIAM.Database/DbSets/Transfers/ITransferDbSet.cs index 72981e4f..013f3356 100644 --- a/TIAM.Database/DbSets/Transfers/ITransferDbSet.cs +++ b/TIAM.Database/DbSets/Transfers/ITransferDbSet.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Transfers; namespace TIAM.Database.DbSets.Transfers; diff --git a/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs b/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs index 819974c9..614900bf 100644 --- a/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs +++ b/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using TIAM.Entities.Addresses; using TIAM.Entities.Products; -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; namespace TIAM.Database.DbSets.Transfers; diff --git a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs index da7e6f65..43de0d1b 100644 --- a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using TIAM.Entities.TransferDestinations; using TIAM.Entities.Transfers; namespace TIAM.Database.DbSets.Transfers; diff --git a/TIAM.Entities/Emails/EmailMessage.cs b/TIAM.Entities/Emails/EmailMessage.cs index c608825a..cb8f7f2a 100644 --- a/TIAM.Entities/Emails/EmailMessage.cs +++ b/TIAM.Entities/Emails/EmailMessage.cs @@ -3,24 +3,25 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; +using AyCode.Interfaces.Users; namespace TIAM.Entities.Emails; [Table(nameof(EmailMessage))] -public class EmailMessage : IEntityGuid, ITimeStampInfo, IEmailRecipientsRelation +public class EmailMessage : IEntityGuid, ITimeStampInfo, IEmailRecipientsRelation, IEmailAddress { public EmailMessage() { } - public EmailMessage(Guid id, Guid? senderId, Guid contextId, string subject, string? text, string senderEmailAddress) : this() + public EmailMessage(Guid id, Guid? senderId, Guid contextId, string subject, string? text, string emailAddress) : this() { Id = id; SenderId = senderId; ContextId = contextId; Subject = subject; Text = text; - SenderEmailAddress = senderEmailAddress; + EmailAddress = emailAddress; } [Key, DatabaseGenerated(DatabaseGeneratedOption.None)] @@ -32,7 +33,7 @@ public class EmailMessage : IEntityGuid, ITimeStampInfo, IEmailRecipientsRelatio public virtual List Recipients { get; set; } = []; [MaxLength(150)] - public string SenderEmailAddress { get; set; } + public string EmailAddress { get; set; } [MaxLength(100)] public string Subject { get; set; } public string? Text { get; set; } diff --git a/TIAM.Entities/Emails/EmailRecipient.cs b/TIAM.Entities/Emails/EmailRecipient.cs index 69df9925..8ad7c5da 100644 --- a/TIAM.Entities/Emails/EmailRecipient.cs +++ b/TIAM.Entities/Emails/EmailRecipient.cs @@ -2,21 +2,23 @@ using AyCode.Interfaces.TimeStampInfo; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using AyCode.Interfaces.Users; namespace TIAM.Entities.Emails; //Update efcore, aspnetcore to 8.0.1; Implement EmailMessage, EmailRecipient; refactoring, improvments, fixes, etc... -public class EmailRecipient : IEntityGuid, ITimeStampInfo, IEmailMessageRelation +public class EmailRecipient : IEntityGuid, ITimeStampInfo, IEmailMessageRelation, IEmailAddress { public EmailRecipient() { } - public EmailRecipient(Guid id, Guid recipientId, Guid emailMessageId) : this() + public EmailRecipient(Guid id, Guid recipientId, Guid emailMessageId, string emailAddress) : this() { Id = id; RecipientId = recipientId; EmailMessageId = emailMessageId; + EmailAddress = emailAddress; } [Key, DatabaseGenerated(DatabaseGeneratedOption.None)] @@ -24,6 +26,9 @@ public class EmailRecipient : IEntityGuid, ITimeStampInfo, IEmailMessageRelation public Guid RecipientId { get; set; } public Guid EmailMessageId { get; set; } + public string EmailAddress { get; set; } + + public virtual EmailMessage EmailMessage { get; set; } public DateTime Created { get; set; } diff --git a/TIAM.Entities/Transfers/TransferDestination.cs b/TIAM.Entities/Transfers/TransferDestination.cs index e408f8aa..bbec5c17 100644 --- a/TIAM.Entities/Transfers/TransferDestination.cs +++ b/TIAM.Entities/Transfers/TransferDestination.cs @@ -1,13 +1,11 @@ -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; -using AyCode.Entities.Locations; using AyCode.Interfaces.TimeStampInfo; -using System.ComponentModel.DataAnnotations; -using System.Text.RegularExpressions; using TIAM.Core.Enums; using TIAM.Entities.Addresses; -namespace TIAM.Entities.TransferDestinations +namespace TIAM.Entities.Transfers { [Table("TransferDestination")] public class TransferDestination : IEntityGuid, ITimeStampInfo //LocationBase @@ -23,8 +21,10 @@ namespace TIAM.Entities.TransferDestinations public string Description { get; set; } - public double Price { get; set; } public PriceType PriceType { get; set; } + public double Price { get; set; } + public double Price2 { get; set; } + public double Price3 { get; set; } //TEMPORARY!!! public string? AddressString { get; set; } diff --git a/TIAMMobileApp/Services/WizardProcessor.cs b/TIAMMobileApp/Services/WizardProcessor.cs index 25946be2..5fb8bf47 100644 --- a/TIAMMobileApp/Services/WizardProcessor.cs +++ b/TIAMMobileApp/Services/WizardProcessor.cs @@ -1,4 +1,4 @@ -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; diff --git a/TIAMSharedUI/Pages/ChooseDestination.razor.cs b/TIAMSharedUI/Pages/ChooseDestination.razor.cs index 901eb688..2cfbc8d6 100644 --- a/TIAMSharedUI/Pages/ChooseDestination.razor.cs +++ b/TIAMSharedUI/Pages/ChooseDestination.razor.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Transfers; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 564bfa0b..d2276d12 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Components.Web; using System.ComponentModel.DataAnnotations; using System.Linq.Expressions; -using TIAM.Entities.TransferDestinations; using TIAMWebApp.Shared.Application.Utility; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; using TIAMWebApp.Shared.Application.Models.PageModels; diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 97d17f0f..ac23d498 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -10,7 +10,6 @@ @using System.IdentityModel.Tokens.Jwt; @using TIAMSharedUI.Pages.Components; @using TIAMSharedUI.Shared -@using TIAM.Entities.TransferDestinations @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @inject NavigationManager NavManager @inject IUserDataService UserDataService; diff --git a/TIAMSharedUI/Pages/TestPage.razor b/TIAMSharedUI/Pages/TestPage.razor index bc1259e3..f2153bc9 100644 --- a/TIAMSharedUI/Pages/TestPage.razor +++ b/TIAMSharedUI/Pages/TestPage.razor @@ -3,7 +3,7 @@ @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Utility -@using TIAM.Entities.TransferDestinations +@using TIAM.Entities.Transfers @inject LogToBrowserConsole logToBrowserConsole @inject IWizardProcessor WizardProcessor

TestPage

diff --git a/TIAMSharedUI/Pages/Transfer.razor b/TIAMSharedUI/Pages/Transfer.razor index 8a445ec5..90ad22ed 100644 --- a/TIAMSharedUI/Pages/Transfer.razor +++ b/TIAMSharedUI/Pages/Transfer.razor @@ -1,5 +1,4 @@ @page "/transfer" -@using TIAM.Entities.TransferDestinations @using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs index 20be98bf..98f7583d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs @@ -8,7 +8,6 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Interfaces; using Microsoft.AspNetCore.Components; -using TIAM.Entities.TransferDestinations; namespace TIAMSharedUI.Pages.User.SysAdmins { diff --git a/TIAMSharedUI/Shared/SliderItemSelector.razor b/TIAMSharedUI/Shared/SliderItemSelector.razor index 8cc3e19c..4863dd3d 100644 --- a/TIAMSharedUI/Shared/SliderItemSelector.razor +++ b/TIAMSharedUI/Shared/SliderItemSelector.razor @@ -1,7 +1,7 @@ @using System.Linq.Expressions +@using TIAM.Entities.Transfers @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility -@using TIAM.Entities.TransferDestinations @inject LogToBrowserConsole logToBrowserConsole