TIAM.Database.Test/AdminDalTest.cs

@@ -10,6 +10,7 @@ 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;
@@ -406,8 +407,6 @@ namespace TIAM.Database.Test
                 Name = name,
                 Description = name + "description",
                 Price = 15000,
-                Price2 = 21000,
-                Price3 = 23000,
                 PriceType = PriceType.Fix,
                 Address = new Address
                 {
@@ -487,7 +486,6 @@ 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";
@@ -495,7 +493,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, recipientEmail));
+            emailMessage.Recipients.Add(new EmailRecipient(id: Guid.NewGuid(), recipientId, emailMessageId));
 
 
             Assert.IsTrue(await Dal.AddEmailMessageAsync(emailMessage));

TIAM.Database/DataLayers/Admins/AdminDal.cs

@@ -14,6 +14,7 @@ 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;
@@ -95,7 +96,7 @@ namespace TIAM.Database.DataLayers.Admins
             {
                 userProductMapping = ctx.AddUserProductMapping(userProductMappingId, userId, productId, permissions, userProductToCars);
                 
-                return userProductMapping != null;
+                return userProductMapping != null && ctx.SaveChanges() > 0;
             });
 
             return isSucces ? userProductMapping : null;
@@ -112,7 +113,7 @@ namespace TIAM.Database.DataLayers.Admins
             {
                 userProductMapping = ctx.UpdateUserProductMapping(userProductMappingId, permissions, userProductToCars);
                 
-                return userProductMapping != null;
+                return userProductMapping != null && ctx.SaveChanges() > 0;
             });
 
             return isSucces ? userProductMapping : null;

TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs

@@ -15,6 +15,7 @@ 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;
 

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.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Users;
 
 namespace TIAM.Database.DataLayers.TransferDestinations;

TIAM.Database/DbContexts/Admins/AdminDbContext.cs

@@ -16,6 +16,7 @@ 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;
 

TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using AyCode.Database.DbContexts;
 using Microsoft.EntityFrameworkCore;
 using TIAM.Entities.Auctions;
+using TIAM.Entities.TransferDestinations;
 
 namespace TIAM.Database.DbContexts.Auctions
 {

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.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Users;
 
 namespace TIAM.Database.DbContexts.ServiceProviders

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.Transfers;
+using TIAM.Entities.TransferDestinations;
 
 namespace TIAM.Database.DbContexts.Transfers
 {

TIAM.Database/DbContexts/Users/UserDbContext.cs

@@ -21,6 +21,7 @@ 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;
 

TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs

@@ -16,7 +16,7 @@ public static class EmailMessageDbSetExtension
         => ctx.EmailMessages.Where(x => x.SenderId == senderId);
 
     public static IQueryable<EmailMessage> GetEmailMessagesBySenderEmailAddress(this IEmailMessageDbSet ctx, string senderEmailAddress)
-        => ctx.EmailMessages.Where(x => x.EmailAddress == senderEmailAddress);
+        => ctx.EmailMessages.Where(x => x.SenderEmailAddress == senderEmailAddress);
 
     private static IQueryable<EmailMessage> GetEmailMessages(this IQueryable<EmailMessage> queryableEmails, Guid userId, Guid userProductMappingId)
         => queryableEmails.Where(x => x.SenderId == userId || x.SenderId == userProductMappingId || x.Recipients.Any(recipient => recipient.RecipientId == userId || recipient.RecipientId == userProductMappingId));

TIAM.Database/DbSets/Transfers/ITransferDbSet.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Transfers;
 
 namespace TIAM.Database.DbSets.Transfers;

TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using TIAM.Entities.Addresses;
 using TIAM.Entities.Products;
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 
 namespace TIAM.Database.DbSets.Transfers;
 

TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Transfers;
 
 namespace TIAM.Database.DbSets.Transfers;

TIAM.Entities/Emails/EmailMessage.cs

@@ -3,25 +3,24 @@ 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, IEmailAddress
+public class EmailMessage : IEntityGuid, ITimeStampInfo, IEmailRecipientsRelation
 {
     public EmailMessage()
     {
     }
 
-    public EmailMessage(Guid id, Guid? senderId, Guid contextId, string subject, string? text, string emailAddress) : this()
+    public EmailMessage(Guid id, Guid? senderId, Guid contextId, string subject, string? text, string senderEmailAddress) : this()
     {
         Id = id;
         SenderId = senderId;
         ContextId = contextId;
         Subject = subject;
         Text = text;
-        EmailAddress = emailAddress;
+        SenderEmailAddress = senderEmailAddress;
     }
 
     [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -33,7 +32,7 @@ public class EmailMessage : IEntityGuid, ITimeStampInfo, IEmailRecipientsRelatio
     public virtual List<EmailRecipient> Recipients { get; set; } = [];
 
     [MaxLength(150)]
-    public string EmailAddress { get; set; }
+    public string SenderEmailAddress { get; set; }
     [MaxLength(100)]
     public string Subject { get; set; }
     public string? Text { get; set; }

TIAM.Entities/Emails/EmailRecipient.cs

@@ -2,23 +2,21 @@
 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, IEmailAddress
+public class EmailRecipient : IEntityGuid, ITimeStampInfo, IEmailMessageRelation
 {
     public EmailRecipient()
     {
     }
 
-    public EmailRecipient(Guid id, Guid recipientId, Guid emailMessageId, string emailAddress) : this()
+    public EmailRecipient(Guid id, Guid recipientId, Guid emailMessageId) : this()
     {
         Id = id;
         RecipientId = recipientId;
         EmailMessageId = emailMessageId;
-        EmailAddress = emailAddress;
     }
 
     [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -26,9 +24,6 @@ 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; }

TIAM.Entities/Transfers/TransferDestination.cs

@@ -1,11 +1,13 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
-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.Transfers
+namespace TIAM.Entities.TransferDestinations
 {
     [Table("TransferDestination")]
     public class TransferDestination : IEntityGuid, ITimeStampInfo //LocationBase
@@ -21,10 +23,8 @@ namespace TIAM.Entities.Transfers
 
         public string Description { get; set; }
 
-        public PriceType PriceType { get; set; }
         public double Price { get; set; }
-        public double Price2 { get; set; }
+        public PriceType PriceType { get; set; }
-        public double Price3 { get; set; }
 
         //TEMPORARY!!!
         public string? AddressString { get; set; }

TIAMMobileApp/Services/WizardProcessor.cs

@@ -1,4 +1,4 @@
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models;
 using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels;

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.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models;
 

TIAMSharedUI/Pages/Components/InputWizard.razor.cs

@@ -4,6 +4,7 @@ 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;

TIAMSharedUI/Pages/Index.razor

@@ -10,6 +10,7 @@
 @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;

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.Transfers
+@using TIAM.Entities.TransferDestinations
 @inject LogToBrowserConsole logToBrowserConsole
 @inject IWizardProcessor WizardProcessor
 <h3>TestPage</h3>

TIAMSharedUI/Pages/Transfer.razor

@@ -1,4 +1,5 @@
 @page "/transfer"
+@using TIAM.Entities.TransferDestinations
 @using TIAMSharedUI.Pages.Components
 @using TIAMSharedUI.Shared
 @using TIAMWebApp.Shared.Application.Interfaces

TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs

@@ -8,6 +8,7 @@ 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
 {

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
 
 <style>

TIAMWebApp/Client/Services/PermissionService.cs

@@ -4,6 +4,7 @@ using System.Net.Http.Json;
 using System.Text.Json;
 using TIAM.Entities.Permissions;
 using TIAM.Entities.Products;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Models.Dtos.Products;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models;

TIAMWebApp/Client/Services/UserDataServiceWeb.cs

@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
 using Newtonsoft.Json;
 using System.Net.Http.Json;
 using System.Text;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Users;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models;

TIAMWebApp/Client/Services/WizardProcessor.cs

@@ -1,4 +1,4 @@
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels;
 

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -11,7 +11,7 @@ using TIAM.Database.DataLayers.Admins;
 using TIAM.Database.DataLayers.TransferDestinations;
 using TIAM.Database.DataLayers.Users;
 using TIAM.Database.DbContexts;
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Entities.Users;
 using TIAMWebApp.Shared.Application.Models;
 using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels;
@@ -102,8 +102,6 @@ namespace TIAMWebApp.Server.Controllers
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.AddressId}");
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.Name}");
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.Price}");
-                        Console.WriteLine($"TransferDestination to be created: {transferDestination.Price2}");
-                        Console.WriteLine($"TransferDestination to be created: {transferDestination.Price3}");
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.PriceType}");
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.AddressString}");
                         Console.WriteLine($"TransferDestination to be created: {transferDestination.Description}");                        
@@ -160,8 +158,6 @@ namespace TIAMWebApp.Server.Controllers
                         Console.WriteLine($"TransferDestination to be updated: {transferDestination.Id}");
                         Console.WriteLine($"TransferDestination to be updated new name: {transferDestination.Name}");
                         Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price}");
-                        Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price2}");
-                        Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price3}");
                         Console.WriteLine($"TransferDestination to be updated new priceType: {transferDestination.PriceType}");
                         Console.WriteLine($"TransferDestination to be updated new address: {transferDestination.AddressString}");
                         Console.WriteLine($"TransferDestination to be updated new description: {transferDestination.Description}");

TIAMWebApp/Shared/Interfaces/ITransferDataService.cs

@@ -1,4 +1,4 @@
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Models;
 using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels;
 

TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs

@@ -11,7 +11,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TIAM.Core.Enums;
 using TIAM.Entities.Addresses;
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAM.Resources;
 
 namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@@ -81,8 +81,6 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
             destination.Description = model.Description;
             destination.AddressString = model.AddressString;
             destination.Price = model.Price;
-            destination.Price2 = model.Price;
-            destination.Price3 = model.Price;
             destination.PriceType = model.PriceType;
             destination.Address = model.Address;
 

TIAMWebApp/Shared/Services/TransferDataService.cs

@@ -1,5 +1,5 @@
 using System.Net.Http.Json;
-using TIAM.Entities.Transfers;
+using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models;
 using TIAMWebApp.Shared.Application.Models.ClientSide;