diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index d808fc47..acb8b21c 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -1,11 +1,9 @@ using AyCode.Database.Tests; using AyCode.Utils.Extensions; using Newtonsoft.Json; -using TIAM.Core; using TIAM.Core.Enums; using TIAM.Database.DataLayers.Admins; using TIAM.Database.DbContexts.Admins; -using TIAM.Database.DbSets.Emails; using TIAM.Entities.Addresses; using TIAM.Entities.Drivers; using TIAM.Entities.Emails; @@ -13,7 +11,6 @@ using TIAM.Entities.Products; using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; using TIAM.Entities.Transfers; -using TIAM.Entities.Profiles; using AyCode.Core.Extensions; namespace TIAM.Database.Test diff --git a/TIAM.Database.Test/DatabaseTestBase.cs b/TIAM.Database.Test/DatabaseTestBase.cs index 6e09d40c..2382d3b3 100644 --- a/TIAM.Database.Test/DatabaseTestBase.cs +++ b/TIAM.Database.Test/DatabaseTestBase.cs @@ -1,9 +1,5 @@ -using AyCode.Database.DbContexts; using AyCode.Database.Tests; -using Microsoft.EntityFrameworkCore; using TIAM.Database.DbContexts; -using TIAM.Database.DbContexts.Transfers; -using TIAM.Database.DbContexts.Users; namespace TIAM.Database.Test { diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index 16943433..e23691a0 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -1,6 +1,5 @@ using AyCode.Database.Tests.Users; using Newtonsoft.Json; -using AyCode.Core.Consts; using AyCode.Core.Helpers; using TIAM.Database.DataLayers.Users; using TIAM.Database.DbContexts.Users; diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index aaacd18e..d36256e2 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -4,17 +4,12 @@ using AyCode.Database.DbSets.Messages; using AyCode.Database.DbSets.Users; using AyCode.Models.Enums; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using System; using AyCode.Database.DbSets.Addresses; using AyCode.Database.DbSets.Companies; -using TIAM.Core; //using TIAM.Database.DataLayers.ServiceProviders; using TIAM.Database.DbContexts.Admins; -using TIAM.Database.DbSets.Emails; using TIAM.Database.DbSets.Permissions; using TIAM.Database.DbSets.Products; -using TIAM.Database.DbSets.ServiceProvider; using TIAM.Database.DbSets.Transfers; using TIAM.Database.DbSets.Users; using TIAM.Entities.Addresses; @@ -27,7 +22,6 @@ using TIAM.Entities.ServiceProviders; using TIAM.Entities.Transfers; using TIAM.Entities.Users; using TIAM.Models.Dtos.Products; -using TIAM.Models.Dtos.Users; using AyCode.Database.DbSets.Profiles; namespace TIAM.Database.DataLayers.Admins diff --git a/TIAM.Database/DataLayers/Auctions/AuctionDal.cs b/TIAM.Database/DataLayers/Auctions/AuctionDal.cs index 944b8211..405284ab 100644 --- a/TIAM.Database/DataLayers/Auctions/AuctionDal.cs +++ b/TIAM.Database/DataLayers/Auctions/AuctionDal.cs @@ -1,5 +1,4 @@ -using AyCode.Core.Loggers; -using AyCode.Core.Server.Loggers; +using AyCode.Core.Server.Loggers; using Microsoft.EntityFrameworkCore; using TIAM.Database.DbContexts.Auctions; using TIAM.Entities.Auctions; diff --git a/TIAM.Database/DataLayers/DalBase.cs b/TIAM.Database/DataLayers/DalBase.cs index c4d54843..0236549d 100644 --- a/TIAM.Database/DataLayers/DalBase.cs +++ b/TIAM.Database/DataLayers/DalBase.cs @@ -1,11 +1,4 @@ -using AyCode.Database; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DataLayers; +using AyCode.Database.DataLayers; using TIAM.Database.DbContexts; namespace TIAM.Database.DataLayers; diff --git a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs index 99d8a677..391509eb 100644 --- a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs +++ b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs @@ -1,25 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Models.Enums; -using Microsoft.EntityFrameworkCore; -using TIAM.Entities.Permissions; -using TIAM.Entities.Products; -using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Users; -using TIAM.Database.DbContexts.ServiceProviders; -using TIAM.Database.DbSets.Permissions; -using TIAM.Database.DbSets.Users; -using AyCode.Database.DataLayers; -using AyCode.Database.DbSets.Users; -using TIAM.Database.DbSets.Products; -using TIAM.Models.Dtos.Users; -using Newtonsoft.Json; - - -namespace TIAM.Database.DataLayers.ServiceProviders +namespace TIAM.Database.DataLayers.ServiceProviders { //public class ServiceProviderDal : DalBase //{ diff --git a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDalExtension.cs b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDalExtension.cs index dbd95f89..f71a6363 100644 --- a/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDalExtension.cs +++ b/TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDalExtension.cs @@ -1,19 +1,4 @@ -using AyCode.Database.DataLayers.Users; -using AyCode.Interfaces.Entities; -using AyCode.Models.Enums; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Diagnostics; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Newtonsoft.Json; -using TIAM.Database.DbContexts; -using TIAM.Database.DbContexts.ServiceProviders; -using TIAM.Database.DbSets.Permissions; -using TIAM.Database.DbSets.Products; -using TIAM.Database.DbSets.Users; -using TIAM.Entities.Permissions; -using TIAM.Entities.Products; -using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Users; + //namespace TIAM.Database.DataLayers.ServiceProviders; diff --git a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs index f12a44e4..66608a7a 100644 --- a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs +++ b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database; -using AyCode.Utils.Extensions; +using AyCode.Core.Extensions; using Microsoft.EntityFrameworkCore; -using Microsoft.Identity.Client; using TIAM.Database.DbContexts.Transfers; using TIAM.Entities.Transfers; -using TIAM.Entities.Users; namespace TIAM.Database.DataLayers.TransferDestinations; diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs index 4daa1ff6..96f3043f 100644 --- a/TIAM.Database/DataLayers/Users/UserDal.cs +++ b/TIAM.Database/DataLayers/Users/UserDal.cs @@ -1,21 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DataLayers; -using AyCode.Database.DataLayers.Users; -using AyCode.Database.DbSets.Users; -using AyCode.Entities.Users; +using AyCode.Database.DataLayers.Users; using Microsoft.EntityFrameworkCore; using TIAM.Database.DbContexts.Users; -using TIAM.Database.DbSets.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Emails; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAM.Models.Dtos.Users; namespace TIAM.Database.DataLayers.Users { diff --git a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs index 9b6a1bac..710b6488 100644 --- a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs +++ b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DbContexts; -using AyCode.Database.ModelBuilders.Users; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TIAM.Database.ModelBuilders.Companies; using TIAM.Database.ModelBuilders.Emails; using TIAM.Database.ModelBuilders.Products; diff --git a/TIAM.Database/DbContexts/Admins/AdminDbContextExtension.cs b/TIAM.Database/DbContexts/Admins/AdminDbContextExtension.cs index c27a6c63..3069f3db 100644 --- a/TIAM.Database/DbContexts/Admins/AdminDbContextExtension.cs +++ b/TIAM.Database/DbContexts/Admins/AdminDbContextExtension.cs @@ -1,13 +1,11 @@ -using AyCode.Utils.Extensions; -using Microsoft.EntityFrameworkCore; +using AyCode.Core.Extensions; +using AyCode.Utils.Extensions; using TIAM.Database.DbSets.Permissions; using TIAM.Database.DbSets.Products; -using TIAM.Database.DbSets.Transfers; using TIAM.Database.DbSets.Users; using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Transfers; using TIAM.Entities.Users; namespace TIAM.Database.DbContexts.Admins diff --git a/TIAM.Database/DbContexts/Admins/IAdminDbContext.cs b/TIAM.Database/DbContexts/Admins/IAdminDbContext.cs index 864cc65d..0aa15e51 100644 --- a/TIAM.Database/DbContexts/Admins/IAdminDbContext.cs +++ b/TIAM.Database/DbContexts/Admins/IAdminDbContext.cs @@ -1,5 +1,4 @@ using AyCode.Database.DbContexts.Users; -using TIAM.Database.DbSets.Addresses; using TIAM.Database.DbSets.Emails; using TIAM.Database.DbSets.Permissions; using TIAM.Database.DbSets.Products; diff --git a/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs b/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs index da981354..12ec3c62 100644 --- a/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs +++ b/TIAM.Database/DbContexts/Auctions/AuctionDbContext.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DbContexts; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TIAM.Entities.Auctions; namespace TIAM.Database.DbContexts.Auctions diff --git a/TIAM.Database/DbContexts/DbContextBase.cs b/TIAM.Database/DbContexts/DbContextBase.cs index 18bf05e9..ebd7f15c 100644 --- a/TIAM.Database/DbContexts/DbContextBase.cs +++ b/TIAM.Database/DbContexts/DbContextBase.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DbContexts; +using AyCode.Database.DbContexts; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; namespace TIAM.Database.DbContexts { diff --git a/TIAM.Database/DbContexts/ServiceProviders/IServiceProviderDbContext.cs b/TIAM.Database/DbContexts/ServiceProviders/IServiceProviderDbContext.cs index a657557c..69f90d80 100644 --- a/TIAM.Database/DbContexts/ServiceProviders/IServiceProviderDbContext.cs +++ b/TIAM.Database/DbContexts/ServiceProviders/IServiceProviderDbContext.cs @@ -1,5 +1,4 @@ -using AyCode.Database.DbSets.Users; -using TIAM.Database.DbSets.Addresses; +using TIAM.Database.DbSets.Addresses; using TIAM.Database.DbSets.Permissions; using TIAM.Database.DbSets.Products; using TIAM.Database.DbSets.ServiceProvider; diff --git a/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs b/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs index 2c601fd6..950a0424 100644 --- a/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs +++ b/TIAM.Database/DbContexts/ServiceProviders/ServiceProviderDbContext.cs @@ -1,15 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DbContexts; -using AyCode.Database.DbContexts.Users; -using AyCode.Entities.Users; -using Microsoft.EntityFrameworkCore; -using TIAM.Database.DbContexts.Users; -using TIAM.Database.DbSets.Users; -using TIAM.Database.ModelBuilders.Products; +using Microsoft.EntityFrameworkCore; using TIAM.Database.ModelBuilders.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Permissions; diff --git a/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs b/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs index 91fc67de..bfa7a75b 100644 --- a/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs +++ b/TIAM.Database/DbContexts/Transfers/TransferDestinationDbContext.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TIAM.Entities.Transfers; namespace TIAM.Database.DbContexts.Transfers diff --git a/TIAM.Database/DbContexts/Users/IUserDbContext.cs b/TIAM.Database/DbContexts/Users/IUserDbContext.cs index b2010960..d8a083d9 100644 --- a/TIAM.Database/DbContexts/Users/IUserDbContext.cs +++ b/TIAM.Database/DbContexts/Users/IUserDbContext.cs @@ -1,5 +1,4 @@ using AyCode.Database.DbContexts.Users; -using AyCode.Entities.Users; using TIAM.Database.DbSets.Addresses; using TIAM.Database.DbSets.Emails; using TIAM.Database.DbSets.Transfers; diff --git a/TIAM.Database/DbContexts/Users/UserDbContext.cs b/TIAM.Database/DbContexts/Users/UserDbContext.cs index 0adea911..e00d5536 100644 --- a/TIAM.Database/DbContexts/Users/UserDbContext.cs +++ b/TIAM.Database/DbContexts/Users/UserDbContext.cs @@ -1,24 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection.Emit; -using System.Reflection.Metadata; -using System.Text; -using System.Threading.Tasks; -using AyCode.Database.DbContexts; -using AyCode.Database.DbContexts.Users; -using AyCode.Database.ModelBuilders.Profiles; -using AyCode.Entities.Users; -using AyCode.Interfaces.Users; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; +using Microsoft.EntityFrameworkCore; using TIAM.Database.ModelBuilders.Emails; using TIAM.Database.ModelBuilders.Products; using TIAM.Database.ModelBuilders.Transfers; using TIAM.Database.ModelBuilders.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Emails; -using TIAM.Entities.Permissions; using TIAM.Entities.Products; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; diff --git a/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs b/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs index c3e7e3b4..d09cb8fb 100644 --- a/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs +++ b/TIAM.Database/DbSets/Emails/EmailMessageDbSetExtension.cs @@ -1,8 +1,4 @@ -using Microsoft.EntityFrameworkCore; -using TIAM.Entities.Emails; -using TIAM.Entities.Products; - -namespace TIAM.Database.DbSets.Emails; +namespace TIAM.Database.DbSets.Emails; //public static class EmailMessageDbSetExtension //{ diff --git a/TIAM.Database/DbSets/Emails/IEmailMessageDbSet.cs b/TIAM.Database/DbSets/Emails/IEmailMessageDbSet.cs index 3cf497e7..8cc216ac 100644 --- a/TIAM.Database/DbSets/Emails/IEmailMessageDbSet.cs +++ b/TIAM.Database/DbSets/Emails/IEmailMessageDbSet.cs @@ -1,7 +1,5 @@ using AyCode.Database.DbSets.Messages; -using Microsoft.EntityFrameworkCore; using TIAM.Entities.Emails; -using TIAM.Entities.Permissions; namespace TIAM.Database.DbSets.Emails; diff --git a/TIAM.Database/DbSets/Permissions/PermissionsDbSetExtensions.cs b/TIAM.Database/DbSets/Permissions/PermissionsDbSetExtensions.cs index e3543f2b..4a066c12 100644 --- a/TIAM.Database/DbSets/Permissions/PermissionsDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Permissions/PermissionsDbSetExtensions.cs @@ -1,11 +1,6 @@ using AyCode.Database; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.ChangeTracking; -using TIAM.Database.DbContexts; -using TIAM.Database.DbContexts.ServiceProviders; -using TIAM.Database.DbSets.Users; using TIAM.Entities.Permissions; -using TIAM.Entities.Products; namespace TIAM.Database.DbSets.Permissions; diff --git a/TIAM.Database/DbSets/Products/ProductDbSetExtensions.cs b/TIAM.Database/DbSets/Products/ProductDbSetExtensions.cs index 6331e364..53309a48 100644 --- a/TIAM.Database/DbSets/Products/ProductDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Products/ProductDbSetExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using TIAM.Entities.Products; namespace TIAM.Database.DbSets.Products; diff --git a/TIAM.Database/DbSets/ServiceProvider/CompanyDbSetExtensions.cs b/TIAM.Database/DbSets/ServiceProvider/CompanyDbSetExtensions.cs index 449e1a47..56587c02 100644 --- a/TIAM.Database/DbSets/ServiceProvider/CompanyDbSetExtensions.cs +++ b/TIAM.Database/DbSets/ServiceProvider/CompanyDbSetExtensions.cs @@ -1,11 +1,4 @@ -using AyCode.Utils.Extensions; -using Microsoft.EntityFrameworkCore; -using TIAM.Database.DbSets.Transfers; -using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Transfers; - - -namespace TIAM.Database.DbSets.ServiceProvider; +namespace TIAM.Database.DbSets.ServiceProvider; //public static class CompanyDbSetExtensions //{ diff --git a/TIAM.Database/DbSets/ServiceProvider/ICompanyDbSet.cs b/TIAM.Database/DbSets/ServiceProvider/ICompanyDbSet.cs index 43e531f6..edeba805 100644 --- a/TIAM.Database/DbSets/ServiceProvider/ICompanyDbSet.cs +++ b/TIAM.Database/DbSets/ServiceProvider/ICompanyDbSet.cs @@ -1,5 +1,4 @@ using AyCode.Database.DbSets.Companies; -using Microsoft.EntityFrameworkCore; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; diff --git a/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs b/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs index 370c290a..7f263b44 100644 --- a/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs +++ b/TIAM.Database/DbSets/Transfers/ITransferDestinationDbSet.cs @@ -1,7 +1,5 @@ using Microsoft.EntityFrameworkCore; using TIAM.Database.DbSets.Addresses; -using TIAM.Entities.Addresses; -using TIAM.Entities.Products; using TIAM.Entities.Transfers; namespace TIAM.Database.DbSets.Transfers; diff --git a/TIAM.Database/DbSets/Users/IUserDbSet.cs b/TIAM.Database/DbSets/Users/IUserDbSet.cs index d807ce43..d736700b 100644 --- a/TIAM.Database/DbSets/Users/IUserDbSet.cs +++ b/TIAM.Database/DbSets/Users/IUserDbSet.cs @@ -1,6 +1,5 @@ using AyCode.Database.DbSets.Users; using TIAM.Entities.Addresses; -using TIAM.Entities.Emails; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; diff --git a/TIAM.Database/DbSets/Users/IUserTokenDbSet.cs b/TIAM.Database/DbSets/Users/IUserTokenDbSet.cs index cd09c880..702eaa7a 100644 --- a/TIAM.Database/DbSets/Users/IUserTokenDbSet.cs +++ b/TIAM.Database/DbSets/Users/IUserTokenDbSet.cs @@ -1,5 +1,4 @@ using AyCode.Database.DbSets.Users; -using AyCode.Entities.Users; using TIAM.Entities.Users; namespace TIAM.Database.DbSets.Users; diff --git a/TIAM.Database/DbSets/Users/UserDbSetExtensions.cs b/TIAM.Database/DbSets/Users/UserDbSetExtensions.cs index 1f6a7a75..17ad352b 100644 --- a/TIAM.Database/DbSets/Users/UserDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Users/UserDbSetExtensions.cs @@ -1,9 +1,5 @@ -using System.Security.Cryptography.X509Certificates; -using AyCode.Database.DbSets.Users; -using AyCode.Database.Extensions; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TIAM.Entities.Users; -using TIAM.Models.Dtos.Users; namespace TIAM.Database.DbSets.Users; diff --git a/TIAM.Database/DbSets/Users/UserProductMappingDbSetExtensions.cs b/TIAM.Database/DbSets/Users/UserProductMappingDbSetExtensions.cs index 9fe01c71..70d4a72d 100644 --- a/TIAM.Database/DbSets/Users/UserProductMappingDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Users/UserProductMappingDbSetExtensions.cs @@ -1,6 +1,5 @@ -using AyCode.Utils.Extensions; +using AyCode.Core.Extensions; using Microsoft.EntityFrameworkCore; -using TIAM.Database.DbContexts.ServiceProviders; using TIAM.Entities.Drivers; using TIAM.Entities.Users; diff --git a/TIAM.Database/ModelBuilders/Companies/CompanyEntityTypeDefaultConfiguration.cs b/TIAM.Database/ModelBuilders/Companies/CompanyEntityTypeDefaultConfiguration.cs index ecc85f39..2a0b2fb1 100644 --- a/TIAM.Database/ModelBuilders/Companies/CompanyEntityTypeDefaultConfiguration.cs +++ b/TIAM.Database/ModelBuilders/Companies/CompanyEntityTypeDefaultConfiguration.cs @@ -1,8 +1,5 @@ -using AyCode.Database.DbContexts; -using AyCode.Database.ModelBuilders.Profiles; -using AyCode.Database.ModelBuilders.Users; +using AyCode.Database.ModelBuilders.Users; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using TIAM.Database.ModelBuilders.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; diff --git a/TIAM.Database/ModelBuilders/Emails/EmailMessageEntityTypeConfigurations.cs b/TIAM.Database/ModelBuilders/Emails/EmailMessageEntityTypeConfigurations.cs index 34884170..dd65cc80 100644 --- a/TIAM.Database/ModelBuilders/Emails/EmailMessageEntityTypeConfigurations.cs +++ b/TIAM.Database/ModelBuilders/Emails/EmailMessageEntityTypeConfigurations.cs @@ -1,8 +1,6 @@ using AyCode.Database.DbContexts; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using TIAM.Database.ModelBuilders.Products; using TIAM.Entities.Emails; -using TIAM.Entities.Products; namespace TIAM.Database.ModelBuilders.Emails; diff --git a/TIAM.Database/ModelBuilders/Products/ProductEntityTypeBuilderExtensions.cs b/TIAM.Database/ModelBuilders/Products/ProductEntityTypeBuilderExtensions.cs index 4e7acdac..f5064614 100644 --- a/TIAM.Database/ModelBuilders/Products/ProductEntityTypeBuilderExtensions.cs +++ b/TIAM.Database/ModelBuilders/Products/ProductEntityTypeBuilderExtensions.cs @@ -1,9 +1,7 @@ -using System.Security.Cryptography.X509Certificates; -using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using TIAM.Entities.Users; using TIAM.Entities.Products; using AyCode.Database.ModelBuilders.Users; -using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; namespace TIAM.Database.ModelBuilders.Products; diff --git a/TIAM.Database/ModelBuilders/Products/ProductEntityTypeConfigurations.cs b/TIAM.Database/ModelBuilders/Products/ProductEntityTypeConfigurations.cs index cdbb16ea..bebb8c9f 100644 --- a/TIAM.Database/ModelBuilders/Products/ProductEntityTypeConfigurations.cs +++ b/TIAM.Database/ModelBuilders/Products/ProductEntityTypeConfigurations.cs @@ -1,10 +1,6 @@ using AyCode.Database.DbContexts; -using AyCode.Database.ModelBuilders.Users; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using TIAM.Database.ModelBuilders.Users; using TIAM.Entities.Products; -using TIAM.Entities.Profiles; -using TIAM.Entities.Users; namespace TIAM.Database.ModelBuilders.Products; diff --git a/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeBuilderExtensions.cs b/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeBuilderExtensions.cs index 6dab7ab9..d44f5ca9 100644 --- a/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeBuilderExtensions.cs +++ b/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeBuilderExtensions.cs @@ -1,8 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using TIAM.Database.ModelBuilders.Users; using TIAM.Entities.Transfers; -using TIAM.Entities.Users; namespace TIAM.Database.ModelBuilders.Transfers; diff --git a/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeDefaultConfigurations.cs b/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeDefaultConfigurations.cs index 87553cef..215bf70d 100644 --- a/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeDefaultConfigurations.cs +++ b/TIAM.Database/ModelBuilders/Transfers/TransferEntityTypeDefaultConfigurations.cs @@ -1,7 +1,6 @@ using AyCode.Database.DbContexts; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using TIAM.Entities.Products; using TIAM.Entities.Transfers; namespace TIAM.Database.ModelBuilders.Transfers; diff --git a/TIAM.Database/ModelBuilders/Users/UserEntityTypeBuilderExtensions.cs b/TIAM.Database/ModelBuilders/Users/UserEntityTypeBuilderExtensions.cs index 2bf7fbf9..17416944 100644 --- a/TIAM.Database/ModelBuilders/Users/UserEntityTypeBuilderExtensions.cs +++ b/TIAM.Database/ModelBuilders/Users/UserEntityTypeBuilderExtensions.cs @@ -1,10 +1,4 @@ -using AyCode.Interfaces.Users; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using System.Numerics; -using AyCode.Interfaces.Profiles; -using TIAM.Entities.Products; -using TIAM.Entities.Transfers; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using TIAM.Entities.Users; namespace TIAM.Database.ModelBuilders.Users; diff --git a/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs b/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs index 822a0e70..60a5208c 100644 --- a/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs +++ b/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs @@ -1,8 +1,6 @@ using AyCode.Database.DbContexts; using AyCode.Database.ModelBuilders.Profiles; using AyCode.Database.ModelBuilders.Users; -using AyCode.Interfaces.Users; -using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; diff --git a/TIAM.Entities/Addresses/Address.cs b/TIAM.Entities/Addresses/Address.cs index 7140894a..6a965c37 100644 --- a/TIAM.Entities/Addresses/Address.cs +++ b/TIAM.Entities/Addresses/Address.cs @@ -1,6 +1,5 @@ using AyCode.Entities.Addresses; using System.ComponentModel.DataAnnotations.Schema; -using TIAM.Entities.Profiles; namespace TIAM.Entities.Addresses; diff --git a/TIAM.Entities/Addresses/IAddress.cs b/TIAM.Entities/Addresses/IAddress.cs index 77b1fac3..571f58e9 100644 --- a/TIAM.Entities/Addresses/IAddress.cs +++ b/TIAM.Entities/Addresses/IAddress.cs @@ -1,7 +1,4 @@ using AyCode.Interfaces.Addresses; -using AyCode.Interfaces.Addresses.Dtos; -using AyCode.Interfaces.Profiles; -using TIAM.Entities.Profiles; namespace TIAM.Entities.Addresses; diff --git a/TIAM.Entities/Auctions/AuctionBid.cs b/TIAM.Entities/Auctions/AuctionBid.cs index a3a76a4a..92585566 100644 --- a/TIAM.Entities/Auctions/AuctionBid.cs +++ b/TIAM.Entities/Auctions/AuctionBid.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Entities.Users; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; diff --git a/TIAM.Entities/Drivers/UserProductToCar.cs b/TIAM.Entities/Drivers/UserProductToCar.cs index a8983bbe..ed39b1ff 100644 --- a/TIAM.Entities/Drivers/UserProductToCar.cs +++ b/TIAM.Entities/Drivers/UserProductToCar.cs @@ -1,9 +1,4 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text.Json.Serialization; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using Microsoft.EntityFrameworkCore; +using System.ComponentModel.DataAnnotations.Schema; namespace TIAM.Entities.Drivers; diff --git a/TIAM.Entities/Emails/EmailMessage.cs b/TIAM.Entities/Emails/EmailMessage.cs index ca412f34..195dfa74 100644 --- a/TIAM.Entities/Emails/EmailMessage.cs +++ b/TIAM.Entities/Emails/EmailMessage.cs @@ -1,10 +1,5 @@ -using System.Collections.Specialized; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.Messages; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using AyCode.Interfaces.Users; namespace TIAM.Entities.Emails; diff --git a/TIAM.Entities/Emails/EmailRecipient.cs b/TIAM.Entities/Emails/EmailRecipient.cs index 61b81749..e3c99a76 100644 --- a/TIAM.Entities/Emails/EmailRecipient.cs +++ b/TIAM.Entities/Emails/EmailRecipient.cs @@ -1,9 +1,5 @@ -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.Messages; -using AyCode.Interfaces.Users; namespace TIAM.Entities.Emails; diff --git a/TIAM.Entities/Emails/IEmailRecipientsRelation.cs b/TIAM.Entities/Emails/IEmailRecipientsRelation.cs index 69749eb6..1fa29cf6 100644 --- a/TIAM.Entities/Emails/IEmailRecipientsRelation.cs +++ b/TIAM.Entities/Emails/IEmailRecipientsRelation.cs @@ -1,5 +1,4 @@ -using AyCode.Entities.Messages; -using AyCode.Interfaces.Messages; +using AyCode.Interfaces.Messages; namespace TIAM.Entities.Emails; diff --git a/TIAM.Entities/Emails/IMessageSenderService.cs b/TIAM.Entities/Emails/IMessageSenderService.cs index 5003b0cb..c313e118 100644 --- a/TIAM.Entities/Emails/IMessageSenderService.cs +++ b/TIAM.Entities/Emails/IMessageSenderService.cs @@ -1,5 +1,4 @@ -using AyCode.Entities.Messages; -using AyCode.Interfaces.Messages; +using AyCode.Interfaces.Messages; namespace TIAM.Entities.Emails; diff --git a/TIAM.Entities/Groups/Group.cs b/TIAM.Entities/Groups/Group.cs index a7071b6d..19051316 100644 --- a/TIAM.Entities/Groups/Group.cs +++ b/TIAM.Entities/Groups/Group.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Entities.Groups; +using AyCode.Entities.Groups; namespace TIAM.Entities.Groups { diff --git a/TIAM.Entities/Permissions/PermissionGroup.cs b/TIAM.Entities/Permissions/PermissionGroup.cs index 3020f441..f8554c22 100644 --- a/TIAM.Entities/Permissions/PermissionGroup.cs +++ b/TIAM.Entities/Permissions/PermissionGroup.cs @@ -1,9 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.Groups; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using TIAM.Entities.Groups; namespace TIAM.Entities.Permissions; diff --git a/TIAM.Entities/Products/IProductsRelation.cs b/TIAM.Entities/Products/IProductsRelation.cs index a056a5a2..fc483442 100644 --- a/TIAM.Entities/Products/IProductsRelation.cs +++ b/TIAM.Entities/Products/IProductsRelation.cs @@ -1,6 +1,4 @@ -using AyCode.Interfaces.ServiceProviders; -using AyCode.Interfaces.Users; -using TIAM.Entities.Users; +using TIAM.Entities.Users; namespace TIAM.Entities.Products; diff --git a/TIAM.Entities/Products/Product.cs b/TIAM.Entities/Products/Product.cs index f7c6c080..ca821ca6 100644 --- a/TIAM.Entities/Products/Product.cs +++ b/TIAM.Entities/Products/Product.cs @@ -1,7 +1,5 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; using TIAM.Core.Enums; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; diff --git a/TIAM.Entities/Products/ProductBase.cs b/TIAM.Entities/Products/ProductBase.cs index 92ce1843..d6d71708 100644 --- a/TIAM.Entities/Products/ProductBase.cs +++ b/TIAM.Entities/Products/ProductBase.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using AyCode.Interfaces.Profiles; using AyCode.Interfaces.TimeStampInfo; using TIAM.Core.Enums; using TIAM.Entities.Profiles; diff --git a/TIAM.Entities/Profiles/IProfile.cs b/TIAM.Entities/Profiles/IProfile.cs index 06abcc5a..7a8a633d 100644 --- a/TIAM.Entities/Profiles/IProfile.cs +++ b/TIAM.Entities/Profiles/IProfile.cs @@ -1,5 +1,4 @@ -using AyCode.Interfaces.Addresses; -using AyCode.Interfaces.Profiles; +using AyCode.Interfaces.Profiles; using TIAM.Entities.Addresses; namespace TIAM.Entities.Profiles; diff --git a/TIAM.Entities/Profiles/IProfileRelation.cs b/TIAM.Entities/Profiles/IProfileRelation.cs index 0700cffc..b1eb49b6 100644 --- a/TIAM.Entities/Profiles/IProfileRelation.cs +++ b/TIAM.Entities/Profiles/IProfileRelation.cs @@ -1,5 +1,4 @@ using AyCode.Interfaces.Profiles; -using AyCode.Interfaces.Profiles.Dtos; namespace TIAM.Entities.Profiles; diff --git a/TIAM.Entities/ServiceProviders/Company.cs b/TIAM.Entities/ServiceProviders/Company.cs index c4d891a6..3b201d9c 100644 --- a/TIAM.Entities/ServiceProviders/Company.cs +++ b/TIAM.Entities/ServiceProviders/Company.cs @@ -1,10 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.ServiceProviders; -using AyCode.Interfaces; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using AyCode.Interfaces.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Products; using TIAM.Entities.Profiles; @@ -21,15 +16,19 @@ public class Company : AcCompany, ICompan { } - public Company(string name, Guid ownerId) : this(Guid.NewGuid(), name, ownerId) + public Company(string name, Guid? ownerId) : this(Guid.NewGuid(), name, ownerId) { } - public Company(Guid id, string name, Guid ownerId) : this(id, name, ownerId, Guid.NewGuid()) + public Company(Guid id, string name, Guid? ownerId) : this(id, name, ownerId, Guid.NewGuid()) { } + public Company(Guid id, string name, Guid? ownerId, double commissionPercent) : this(id, name, ownerId, Guid.NewGuid()) + { + CommissionPercent = commissionPercent; + } + public Company(Guid id, string name, Guid? ownerId, Guid affiliateId) : base(id, name, ownerId, affiliateId) - { - } + { } } \ No newline at end of file diff --git a/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs b/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs index fc297c03..c9872b91 100644 --- a/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs +++ b/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs @@ -1,6 +1,4 @@ -using TIAM.Core.Enums; - -namespace TIAM.Entities.Transfers; +namespace TIAM.Entities.Transfers; public interface ITransfeDestinationPrices { diff --git a/TIAM.Entities/Transfers/Transfer.cs b/TIAM.Entities/Transfers/Transfer.cs index a1944cd8..cf589973 100644 --- a/TIAM.Entities/Transfers/Transfer.cs +++ b/TIAM.Entities/Transfers/Transfer.cs @@ -2,7 +2,6 @@ using AyCode.Interfaces.TimeStampInfo; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Dynamic; using AyCode.Interfaces.Profiles.Dtos; using TIAM.Core.Enums; using TIAM.Entities.Products; diff --git a/TIAM.Entities/Transfers/TransferDestination.cs b/TIAM.Entities/Transfers/TransferDestination.cs index a659bb64..6a4432f3 100644 --- a/TIAM.Entities/Transfers/TransferDestination.cs +++ b/TIAM.Entities/Transfers/TransferDestination.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -using TIAM.Core.Enums; using TIAM.Entities.Addresses; namespace TIAM.Entities.Transfers diff --git a/TIAM.Entities/Transfers/TransferDestinationToProduct.cs b/TIAM.Entities/Transfers/TransferDestinationToProduct.cs index 449bbdc4..258e654a 100644 --- a/TIAM.Entities/Transfers/TransferDestinationToProduct.cs +++ b/TIAM.Entities/Transfers/TransferDestinationToProduct.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -using TIAM.Core.Enums; using TIAM.Entities.Products; namespace TIAM.Entities.Transfers diff --git a/TIAM.Entities/Transfers/TransferToDriver.cs b/TIAM.Entities/Transfers/TransferToDriver.cs index 07c92ffb..6ee48ded 100644 --- a/TIAM.Entities/Transfers/TransferToDriver.cs +++ b/TIAM.Entities/Transfers/TransferToDriver.cs @@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; using TIAM.Entities.Drivers; -using TIAM.Entities.Products; using TIAM.Entities.Users; namespace TIAM.Entities.Transfers; diff --git a/TIAM.Entities/Users/IUserDto.cs b/TIAM.Entities/Users/IUserDto.cs index 8210de9e..5e44a0a7 100644 --- a/TIAM.Entities/Users/IUserDto.cs +++ b/TIAM.Entities/Users/IUserDto.cs @@ -1,10 +1,4 @@ -using AyCode.Interfaces.Addresses; -using AyCode.Interfaces.Profiles; -using AyCode.Interfaces.ServiceProviders; -using AyCode.Interfaces.Users; -using AyCode.Interfaces.Users.Dtos; -using TIAM.Entities.Addresses; -using TIAM.Entities.Products; +using AyCode.Interfaces.Users.Dtos; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; diff --git a/TIAM.Entities/Users/IUserDtoDetail.cs b/TIAM.Entities/Users/IUserDtoDetail.cs index acdd5cbc..a226d6c4 100644 --- a/TIAM.Entities/Users/IUserDtoDetail.cs +++ b/TIAM.Entities/Users/IUserDtoDetail.cs @@ -1,9 +1,4 @@ using AyCode.Interfaces.Users.Dtos; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; diff --git a/TIAM.Entities/Users/IUserModelDtoMinBase.cs b/TIAM.Entities/Users/IUserModelDtoMinBase.cs index b0a9e04e..8c83083e 100644 --- a/TIAM.Entities/Users/IUserModelDtoMinBase.cs +++ b/TIAM.Entities/Users/IUserModelDtoMinBase.cs @@ -1,5 +1,4 @@ -using AyCode.Interfaces; -using AyCode.Interfaces.Users; +using AyCode.Interfaces.Users; namespace TIAM.Entities.Users; diff --git a/TIAM.Entities/Users/IUserProductMappingForeignKey.cs b/TIAM.Entities/Users/IUserProductMappingForeignKey.cs index 7fef11b6..969d38ee 100644 --- a/TIAM.Entities/Users/IUserProductMappingForeignKey.cs +++ b/TIAM.Entities/Users/IUserProductMappingForeignKey.cs @@ -1,8 +1,4 @@ -using AyCode.Interfaces.Users; -using System.Runtime; -using TIAM.Entities.Products; - -namespace TIAM.Entities.Users; +namespace TIAM.Entities.Users; public interface IUserProductMappingForeignKey { diff --git a/TIAM.Entities/Users/User.cs b/TIAM.Entities/Users/User.cs index f9af2f84..f8697eb1 100644 --- a/TIAM.Entities/Users/User.cs +++ b/TIAM.Entities/Users/User.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Products; diff --git a/TIAM.Entities/Users/UserProductMapping.cs b/TIAM.Entities/Users/UserProductMapping.cs index 04539f0b..6898dd7c 100644 --- a/TIAM.Entities/Users/UserProductMapping.cs +++ b/TIAM.Entities/Users/UserProductMapping.cs @@ -1,13 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Runtime.Serialization; -using System.Text.Json.Serialization; using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -using AyCode.Interfaces.Users; using TIAM.Entities.Drivers; using TIAM.Entities.Products; -using TIAM.Entities.Transfers; namespace TIAM.Entities.Users; diff --git a/TIAM.Entities/Users/UserServiceProviderMapping.cs b/TIAM.Entities/Users/UserServiceProviderMapping.cs index c6b4b4c2..e16a7286 100644 --- a/TIAM.Entities/Users/UserServiceProviderMapping.cs +++ b/TIAM.Entities/Users/UserServiceProviderMapping.cs @@ -1,11 +1,4 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using AyCode.Interfaces.Entities; -using AyCode.Interfaces.TimeStampInfo; -using TIAM.Entities.Products; -using TIAM.Entities.ServiceProviders; - -namespace TIAM.Entities.Users; +namespace TIAM.Entities.Users; //[Table("UserServiceProviderMapping")] //public class UserServiceProviderMapping : IEntityGuid, ITimeStampInfo diff --git a/TIAM.Entities/Users/UserToCompany.cs b/TIAM.Entities/Users/UserToCompany.cs index 9091f8d2..c5e707db 100644 --- a/TIAM.Entities/Users/UserToCompany.cs +++ b/TIAM.Entities/Users/UserToCompany.cs @@ -1,6 +1,4 @@ using AyCode.Entities.Users; -using AyCode.Interfaces.ServiceProviders; -using AyCode.Interfaces.Users; using TIAM.Entities.ServiceProviders; namespace TIAM.Entities.Users; diff --git a/TIAM.Entities/Users/UserToken.cs b/TIAM.Entities/Users/UserToken.cs index 2fb0b27c..0556cdc9 100644 --- a/TIAM.Entities/Users/UserToken.cs +++ b/TIAM.Entities/Users/UserToken.cs @@ -1,5 +1,4 @@ using AyCode.Entities.Users; -using AyCode.Interfaces.Users; using System.ComponentModel.DataAnnotations.Schema; namespace TIAM.Entities.Users; diff --git a/TIAM.Models/Drivers/DriverModel.cs b/TIAM.Models/Drivers/DriverModel.cs index 7a29b890..783f1a92 100644 --- a/TIAM.Models/Drivers/DriverModel.cs +++ b/TIAM.Models/Drivers/DriverModel.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Drivers; - -namespace TIAM.Models.Drivers +namespace TIAM.Models.Drivers { public class DriverModel { diff --git a/TIAM.Models/Dtos/Profiles/ProfileDto.cs b/TIAM.Models/Dtos/Profiles/ProfileDto.cs index 44c7555a..c2fef1f7 100644 --- a/TIAM.Models/Dtos/Profiles/ProfileDto.cs +++ b/TIAM.Models/Dtos/Profiles/ProfileDto.cs @@ -1,5 +1,4 @@ -using AyCode.Interfaces.Profiles.Dtos; -using TIAM.Entities.Addresses; +using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; namespace TIAM.Models.Dtos.Profiles; diff --git a/TIAM.Models/Dtos/Users/UserDto.cs b/TIAM.Models/Dtos/Users/UserDto.cs index 8b2fcf05..3a967807 100644 --- a/TIAM.Models/Dtos/Users/UserDto.cs +++ b/TIAM.Models/Dtos/Users/UserDto.cs @@ -1,6 +1,4 @@ -using AyCode.Interfaces.Users.Dtos; -using TIAM.Entities.Addresses; -using TIAM.Entities.Profiles; +using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; diff --git a/TIAM.Models/Dtos/Users/UserDtoDetail.cs b/TIAM.Models/Dtos/Users/UserDtoDetail.cs index 15e49616..7139c130 100644 --- a/TIAM.Models/Dtos/Users/UserDtoDetail.cs +++ b/TIAM.Models/Dtos/Users/UserDtoDetail.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Users; +using TIAM.Entities.Users; namespace TIAM.Models.Dtos.Users { diff --git a/TIAM.Models/Dtos/Users/UserModelDto.cs b/TIAM.Models/Dtos/Users/UserModelDto.cs index ad64e51f..f83095a3 100644 --- a/TIAM.Models/Dtos/Users/UserModelDto.cs +++ b/TIAM.Models/Dtos/Users/UserModelDto.cs @@ -1,12 +1,8 @@ -using AyCode.Entities.Profiles; -using AyCode.Interfaces.Users.Dtos; -using AyCode.Models.Users; -using TIAM.Entities.Addresses; +using AyCode.Models.Users; using TIAM.Entities.Products; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAM.Models.Dtos.Profiles; namespace TIAM.Models.Dtos.Users; diff --git a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs index cdc396b0..8fcbf4a5 100644 --- a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs +++ b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs @@ -1,15 +1,9 @@ using AyCode.Models.Users; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TIAM.Entities.Addresses; using TIAM.Entities.Products; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAM.Models.Dtos.Profiles; namespace TIAM.Models.Dtos.Users { diff --git a/TIAM.Services.Server/MessageSenderService.cs b/TIAM.Services.Server/MessageSenderService.cs index 08e197ff..5b8f0bcb 100644 --- a/TIAM.Services.Server/MessageSenderService.cs +++ b/TIAM.Services.Server/MessageSenderService.cs @@ -1,6 +1,5 @@ using System.Net; using AyCode.Core.Helpers; -using AyCode.Core.Loggers; using AyCode.Models.Enums; using Microsoft.Extensions.Configuration; using SendGrid; diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs index 75650c45..d3e47a7c 100644 --- a/TIAM.Services/SignalRTags.cs +++ b/TIAM.Services/SignalRTags.cs @@ -1,44 +1,53 @@ using AyCode.Services.SignalRs; -using TIAM.Entities.Transfers; namespace TIAM.Services; public class SignalRTags : AcSignalRTags { - //[SignalMessageTag(null, typeof(SignalResponseMessage), null, null)] - public const int GetTransfers = 5; - public const int GetPropertiesByOwnerId = 6; + public const int GetTransfer = 3; + public const int GetTransfers = 4; + public const int GetTransfersByContextId = 5; public const int UpdateTransfer = 7; public const int AddTransfer = 8; public const int RemoveTransfer = 9; - public const int GetCompanies = 10; - public const int UpdateCompany = 11; - public const int AddCompany = 12; - public const int RemoveCompany = 13; + public const int GetPropertiesByOwnerId = 10; - public const int GetTransferToDrivers = 14; - public const int AddTransferToDrivers = 15; - public const int UpdateTransferToDrivers = 16; - public const int RemoveTransferToDrivers = 17; + public const int GetCompany = 12; + public const int GetCompanies = 13; + public const int GetCompaniesByContextId = 14; + public const int UpdateCompany = 15; + public const int AddCompany = 16; + public const int RemoveCompany = 17; - public const int GetAddressById = 18; - public const int UpdateAddress = 19; - //public const int AddAddress = 20; - //public const int RemoveAddress = 21; + public const int GetTransferToDriver = 22; + //public const int GetTransferToDrivers = 23; + public const int GetTransferToDriversByContextId = 24; + public const int AddTransferToDriver = 25; + public const int UpdateTransferToDriver = 26; + public const int RemoveTransferToDriver = 27; - public const int GetProfileById = 22; - public const int UpdateProfile = 23; - //public const int AddProfile = 24; - //public const int RemoveProfile = 25; + public const int GetAddress = 28; + //public const int GetAddresses = 29; + public const int GetAddressesByContextId = 30; + public const int UpdateAddress = 31; + //public const int AddAddress = 32; + //public const int RemoveAddress = 33; - public const int GetUserProductMappingsForProduct = 26; - public const int CreateUserProductMapping = 27; - public const int UpdateUserProductMapping = 28; - public const int DeleteUserProductMapping = 29; //set permissions to 0 + public const int GetProfile = 35; + //public const int GetProfiles = 36; + public const int GetProfilesByContextId = 37; + public const int UpdateProfile = 38; - public const int GetCarsForUserProductMapping = 30; - public const int CreateCar = 31; - public const int UpdateCar = 32; - public const int DeleteCar = 33; -} \ No newline at end of file + //public const int AddAddress = 39; + //public const int RemoveAddress = 40; + + public const int CreateUserProductMapping = 47; + public const int UpdateUserProductMapping = 48; + public const int DeleteUserProductMapping = 49; //set permissions to 0 + + public const int GetCarsForUserProductMapping = 50; + public const int CreateCar = 51; + public const int UpdateCar = 52; + public const int DeleteCar = 53; +} diff --git a/TIAMSharedUI/Pages/Auction.razor b/TIAMSharedUI/Pages/Auction.razor index ea315267..be2660c4 100644 --- a/TIAMSharedUI/Pages/Auction.razor +++ b/TIAMSharedUI/Pages/Auction.razor @@ -1,7 +1,6 @@ @page "/auction" @using TIAMSharedUI.Pages.Components @using TIAMWebApp.Shared.Application.Interfaces; -@using TIAMWebApp.Shared.Application.Models; @inject ISessionService sessionService
diff --git a/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs b/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs index 8065c94d..76267243 100644 --- a/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs +++ b/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs @@ -1,10 +1,5 @@ using DevExpress.Blazor; using Microsoft.AspNetCore.Components; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace TIAMSharedUI.Pages.Components { diff --git a/TIAMSharedUI/Pages/Components/TestUserData.cs b/TIAMSharedUI/Pages/Components/TestUserData.cs index 00724568..52c0691f 100644 --- a/TIAMSharedUI/Pages/Components/TestUserData.cs +++ b/TIAMSharedUI/Pages/Components/TestUserData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; namespace TIAMSharedUI.Pages.Components { diff --git a/TIAMSharedUI/Pages/Components/TransferStep0.razor b/TIAMSharedUI/Pages/Components/TransferStep0.razor index 587f3b21..a8995e26 100644 --- a/TIAMSharedUI/Pages/Components/TransferStep0.razor +++ b/TIAMSharedUI/Pages/Components/TransferStep0.razor @@ -1,5 +1,4 @@ @using TIAMWebApp.Shared.Application.Interfaces; -@using TIAMWebApp.Shared.Application.Models.PageModels; @using TIAMWebApp.Shared.Application.Models; @inject ISessionService sessionService; diff --git a/TIAMSharedUI/Pages/Components/TransferStep1.razor b/TIAMSharedUI/Pages/Components/TransferStep1.razor index cd8fb15e..675b7d31 100644 --- a/TIAMSharedUI/Pages/Components/TransferStep1.razor +++ b/TIAMSharedUI/Pages/Components/TransferStep1.razor @@ -1,5 +1,4 @@ -@using TIAMWebApp.Shared.Application.Models.PageModels; -@using TIAMWebApp.Shared.Application.Models; +@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @inject ISessionService sessionService; diff --git a/TIAMSharedUI/Pages/Components/TransferStep3.razor b/TIAMSharedUI/Pages/Components/TransferStep3.razor index 83d71134..aea5efb8 100644 --- a/TIAMSharedUI/Pages/Components/TransferStep3.razor +++ b/TIAMSharedUI/Pages/Components/TransferStep3.razor @@ -1,5 +1,4 @@ @using System.Globalization; -@using TIAMWebApp.Shared.Application.Models.PageModels; @using TIAMWebApp.Shared.Application.Models;

Step 3: Password

diff --git a/TIAMSharedUI/Pages/CreateSumupPaymentPage.razor b/TIAMSharedUI/Pages/CreateSumupPaymentPage.razor index 099e9311..d62daafe 100644 --- a/TIAMSharedUI/Pages/CreateSumupPaymentPage.razor +++ b/TIAMSharedUI/Pages/CreateSumupPaymentPage.razor @@ -1,7 +1,6 @@ @page "/create-payment" @using TIAM.Entities.Transfers @using TIAMWebApp.Shared.Application.Services; -@using TIAMWebApp.Shared.Application.Models.ClientSide.Payment; @inject SumupService SumUpService

Create Payment

diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index a6ccb0f3..1aa79188 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -1,9 +1,7 @@ @page "/mytransfers/{transferId:guid}" @using TIAM.Entities.Transfers @using TIAMWebApp.Shared.Application.Interfaces -@using AyCode.Core.Loggers @using AyCode.Services.Loggers -@using TIAM.Core.Loggers @using TIAM.Core.Enums @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility diff --git a/TIAMSharedUI/Pages/Formula1.razor b/TIAMSharedUI/Pages/Formula1.razor index 84676515..df7ba6c9 100644 --- a/TIAMSharedUI/Pages/Formula1.razor +++ b/TIAMSharedUI/Pages/Formula1.razor @@ -1,18 +1,10 @@ @page "/formulaone" @using AyCode.Interfaces.StorageHandlers; -@using BlazorAnimation -@using Newtonsoft.Json; @using TIAM.Entities.Transfers @using TIAMSharedUI.Shared.Components @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models.ClientSide; -@using AyCode.Blazor.Components; -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Models.ClientSide.UI @using TIAMWebApp.Shared.Application.Models.PageModels -@using TIAMWebApp.Shared.Application.Utility; -@using System.IdentityModel.Tokens.Jwt; -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMSharedUI.Pages.Components; @using TIAMSharedUI.Shared diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 57407900..c508bcd6 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -1,15 +1,8 @@ @page "/" @using AyCode.Interfaces.StorageHandlers; @using BlazorAnimation -@using Newtonsoft.Json; @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models.ClientSide; -@using AyCode.Blazor.Components; -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Models.ClientSide.UI -@using TIAMWebApp.Shared.Application.Utility; -@using System.IdentityModel.Tokens.Jwt; -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMSharedUI.Pages.Components; @using TIAMSharedUI.Shared diff --git a/TIAMSharedUI/Pages/LaunchAdmin.razor b/TIAMSharedUI/Pages/LaunchAdmin.razor index 493685dd..235728eb 100644 --- a/TIAMSharedUI/Pages/LaunchAdmin.razor +++ b/TIAMSharedUI/Pages/LaunchAdmin.razor @@ -1,11 +1,8 @@ @page "/adminstart"; @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models @using TIAMWebApp.Shared.Application.Utility @using Newtonsoft.Json @using System.IdentityModel.Tokens.Jwt -@using AyCode.Core.Loggers -@using TIAMWebApp.Shared.Application.Models.ClientSide @using AyCode.Interfaces.StorageHandlers; @using AyCode.Services.Loggers @using TIAM.Core.Loggers diff --git a/TIAMSharedUI/Pages/Login.razor b/TIAMSharedUI/Pages/Login.razor index 2486b80c..b1097ff6 100644 --- a/TIAMSharedUI/Pages/Login.razor +++ b/TIAMSharedUI/Pages/Login.razor @@ -1,17 +1,7 @@ @page "/login" -@using System.IdentityModel.Tokens.Jwt; -@using System.Security.Claims; @using BlazorAnimation -@using Newtonsoft.Json.Linq; -@using System.Text.Json; -@using System.Reflection; -@using TIAMWebApp.Shared.Application.Interfaces; @using TIAMWebApp.Shared.Application.Models.PageModels; @using TIAMSharedUI.Pages.Components; -@using TIAMWebApp.Shared.Application.Models.ClientSide; -@using TIAMWebApp.Shared.Application.Models; -@using TIAMWebApp.Shared.Application.Utility; -@using AyCode.Interfaces.StorageHandlers; Login diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 55074c72..c9caa369 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -4,17 +4,11 @@ using System.Text.Json; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Interfaces; -using TIAMWebApp.Shared.Application.Utility; using Microsoft.JSInterop; using AyCode.Interfaces.StorageHandlers; -using System.ComponentModel.DataAnnotations; using TIAMSharedUI.Resources; -using System.Resources; using Microsoft.Extensions.Localization; -using AyCode.Blazor.Components; -using AyCode.Core.Loggers; using AyCode.Services.Loggers; -using Azure.Core; using Microsoft.AspNetCore.Components.Authorization; namespace TIAMSharedUI.Pages diff --git a/TIAMSharedUI/Pages/Login_old.razor b/TIAMSharedUI/Pages/Login_old.razor index 7b56e9d8..75218890 100644 --- a/TIAMSharedUI/Pages/Login_old.razor +++ b/TIAMSharedUI/Pages/Login_old.razor @@ -1,6 +1,5 @@ @page "/login_old" @using TIAMWebApp.Shared.Application.Interfaces; -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Models.PageModels; @inject NavigationManager navManager @inject IUserDataService userDataService diff --git a/TIAMSharedUI/Pages/Settings.razor b/TIAMSharedUI/Pages/Settings.razor index 776aa6a0..edb72caf 100644 --- a/TIAMSharedUI/Pages/Settings.razor +++ b/TIAMSharedUI/Pages/Settings.razor @@ -1,7 +1,5 @@ @page "/settings" @using TIAMSharedUI.Pages.Components -@using TIAMSharedUI.Pages.User -@using TIAMWebApp.Shared.Application.Models.ClientSide;
diff --git a/TIAMSharedUI/Pages/Settings.razor.cs b/TIAMSharedUI/Pages/Settings.razor.cs index bda2a9e7..2c923409 100644 --- a/TIAMSharedUI/Pages/Settings.razor.cs +++ b/TIAMSharedUI/Pages/Settings.razor.cs @@ -1,5 +1,4 @@ -using AyCode.Blazor.Components; -using AyCode.Interfaces.StorageHandlers; +using AyCode.Interfaces.StorageHandlers; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; using TIAMSharedUI.Pages.Components; diff --git a/TIAMSharedUI/Pages/SumupPayment.razor b/TIAMSharedUI/Pages/SumupPayment.razor index b52331fe..725139f3 100644 --- a/TIAMSharedUI/Pages/SumupPayment.razor +++ b/TIAMSharedUI/Pages/SumupPayment.razor @@ -1,7 +1,6 @@ @page "/sumuppayment/{checkoutId}" @using AyCode.Services.Loggers @using System.Text.Json.Serialization -@using TIAM.Core.Loggers @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/TestPage.razor b/TIAMSharedUI/Pages/TestPage.razor index 4daedbe0..6a035f22 100644 --- a/TIAMSharedUI/Pages/TestPage.razor +++ b/TIAMSharedUI/Pages/TestPage.razor @@ -2,9 +2,7 @@ @using TIAMSharedUI.Pages.Components @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Utility @using TIAM.Entities.Transfers -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject IWizardProcessor WizardProcessor diff --git a/TIAMSharedUI/Pages/TicTacToe.razor b/TIAMSharedUI/Pages/TicTacToe.razor index 558a6ff1..9ca2d60e 100644 --- a/TIAMSharedUI/Pages/TicTacToe.razor +++ b/TIAMSharedUI/Pages/TicTacToe.razor @@ -1,8 +1,6 @@ @page "/tictactoe" @using Microsoft.AspNetCore.SignalR.Client -@using AyCode.Core.Loggers @using AyCode.Services.Loggers -@using TIAM.Core.Loggers @using TIAMWebApp.Shared.Application.Utility @inject NavigationManager Navigation @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/TransferPage.razor b/TIAMSharedUI/Pages/TransferPage.razor index 6360f4fa..e90b8293 100644 --- a/TIAMSharedUI/Pages/TransferPage.razor +++ b/TIAMSharedUI/Pages/TransferPage.razor @@ -4,8 +4,6 @@ @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Utility -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @inject NavigationManager navManager @inject IAcLogWriterClientBase BrowserConsoleLogWriter diff --git a/TIAMSharedUI/Pages/User/Admin.razor b/TIAMSharedUI/Pages/User/Admin.razor index 7297643c..22bc6105 100644 --- a/TIAMSharedUI/Pages/User/Admin.razor +++ b/TIAMSharedUI/Pages/User/Admin.razor @@ -1,8 +1,6 @@ @page "/user/admin" @using Microsoft.AspNetCore.Authorization -@using TIAMSharedUI.Pages.User.SysAdmins @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider diff --git a/TIAMSharedUI/Pages/User/Admin.razor.cs b/TIAMSharedUI/Pages/User/Admin.razor.cs index b8ba5846..c785adad 100644 --- a/TIAMSharedUI/Pages/User/Admin.razor.cs +++ b/TIAMSharedUI/Pages/User/Admin.razor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMSharedUI.Pages.User +namespace TIAMSharedUI.Pages.User { public partial class Home { diff --git a/TIAMSharedUI/Pages/User/Home.razor.cs b/TIAMSharedUI/Pages/User/Home.razor.cs index b8ba5846..c785adad 100644 --- a/TIAMSharedUI/Pages/User/Home.razor.cs +++ b/TIAMSharedUI/Pages/User/Home.razor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMSharedUI.Pages.User +namespace TIAMSharedUI.Pages.User { public partial class Home { diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor index 399b7da6..67b3c183 100644 --- a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor +++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor @@ -1,6 +1,5 @@ @page "/user/createAndManageTransfer" @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor index 3054950a..b5b780ab 100644 --- a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor +++ b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor @@ -1,6 +1,5 @@ @page "/user/hoteladmin" @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor.cs b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor.cs index b8ba5846..c785adad 100644 --- a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor.cs +++ b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMSharedUI.Pages.User +namespace TIAMSharedUI.Pages.User { public partial class Home { diff --git a/TIAMSharedUI/Pages/User/Media.razor b/TIAMSharedUI/Pages/User/Media.razor index 40565375..3fa8d9d0 100644 --- a/TIAMSharedUI/Pages/User/Media.razor +++ b/TIAMSharedUI/Pages/User/Media.razor @@ -36,12 +36,9 @@ @rendermode RenderMode.InteractiveWebAssembly @page "/user/media" @using System.Net.Http.Headers -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models -@using TIAMWebApp.Shared.Application.Utility @layout AdminLayout @inject IJSRuntime JSRuntime; @inject IImageDataService imageDataService; diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index 801c282c..fd04f340 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -1,12 +1,10 @@ @page "/user/properties" @using TIAM.Entities.ServiceProviders @using TIAM.Resources -@using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Utility -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMWebApp.Shared.Application.Services @using AyCode.Core.Helpers diff --git a/TIAMSharedUI/Pages/User/ServiceProvider.razor b/TIAMSharedUI/Pages/User/ServiceProvider.razor index 4a0988bc..c39b1bda 100644 --- a/TIAMSharedUI/Pages/User/ServiceProvider.razor +++ b/TIAMSharedUI/Pages/User/ServiceProvider.razor @@ -1,8 +1,5 @@ @page "/user/serviceprovider/{id}" -@using TIAMSharedUI.Pages.User.SysAdmins @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models; -@using TIAMWebApp.Shared.Application.Interfaces; @layout AdminLayout @inject NavigationManager navigationManager diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor index a0fc64f9..2d99bc54 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor @@ -21,6 +21,7 @@ ? DataSource { get; set; } [Parameter] public EventCallback
OnAddressChanged { get; set; } + private Guid? _contextId = null!; private AddressDetailGrid _addressGrid = null!; private LoggerClient _logger = null!; @@ -69,6 +71,7 @@ { _logger = new LoggerClient(LogWriters.ToArray()); + //DataSource = new List
(); DataSource ??= new List
{ ParentData.Address }; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor index 60394f80..33cbad92 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor @@ -1,7 +1,4 @@ -@using TIAM.Entities.Products -@using TIAM.Entities.ServiceProviders -@using TIAM.Entities.Transfers -@using TIAM.Entities.Drivers +@using TIAM.Entities.ServiceProviders @using TIAM.Entities.Users @using TIAM.Models.Dtos.Users @using TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor index 1b42f973..d8148c09 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor @@ -1,13 +1,7 @@ @page "/user/products" -@using TIAM.Entities.ServiceProviders @using TIAM.Resources -@using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages -@using TIAMWebApp.Shared.Application.Utility -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @layout AdminLayout @inject IStringLocalizer localizer diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs index 1d4ad9b0..b5b52ed7 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs @@ -1,17 +1,8 @@ using DevExpress.Blazor; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; 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.ServiceProviders; using TIAM.Core.Enums; -using TIAM.Core.Loggers; -using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Shared.Application.Utility; namespace TIAMSharedUI.Pages.User.SysAdmins diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor index c9846924..ab7f7ea7 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor @@ -1,25 +1,15 @@ @page "/user/companies" -@using AyCode.Core.Helpers @using BlazorAnimation -@using TIAM.Core.Enums @using TIAM.Entities.ServiceProviders -@using TIAM.Entities.Transfers @using TIAM.Resources -@using TIAM.Services @using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models.ClientSide.UI @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Models.PageModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Services.Loggers -@using AyCode.Services.SignalRs @using TIAMWebApp.Shared.Application.Services -@using MessagePack -@using MessagePack.Resolvers @using AyCode.Core.Extensions; -@using AyCode.Utils.Extensions @using TIAM.Entities.Addresses @using TIAMSharedUI.Shared.Components.Grids @layout AdminLayout diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 5100f94a..dad07555 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -11,12 +11,8 @@ @using TIAMWebApp.Shared.Application.Models.PageModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Services.Loggers -@using TIAM.Entities.Addresses -@using TIAM.Services @using TIAMWebApp.Shared.Application.Services -@using TIAMSharedUI.Shared.Components @using TIAMSharedUI.Shared.Components.Grids -@using TIAM.Models.Dtos.Users @using AyCode.Core.Enums @using AyCode.Core.Extensions @layout AdminLayout diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index f752a382..7835f075 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -1,27 +1,14 @@ @page "/user/users" @using BlazorAnimation -@using TIAM.Core.Enums -@using TIAM.Entities.Products -@using TIAM.Entities.ServiceProviders -@using TIAM.Entities.Transfers -@using TIAM.Entities.Users -@using TIAM.Models.Dtos.Profiles @using TIAM.Models.Dtos.Users @using TIAM.Resources @using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models -@using TIAMWebApp.Shared.Application.Models.ClientSide.UI @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages @using TIAMWebApp.Shared.Application.Models.PageModels @using TIAMWebApp.Shared.Application.Utility -@using AyCode.Core.Loggers @using AyCode.Services.Loggers -@using TIAM.Core.Loggers -@using TIAM.Entities.Addresses -@using TIAMSharedUI.Shared.Components.Grids @layout AdminLayout @inject IEnumerable LogWriters @inject IStringLocalizer Localizer diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor index e6162284..7fe56619 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor @@ -1,8 +1,5 @@ @using TIAM.Entities.Products @using TIAM.Entities.ServiceProviders -@using TIAM.Entities.Transfers -@using TIAM.Entities.Drivers -@using TIAM.Entities.Users @using TIAM.Models.Dtos.Users @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility diff --git a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor index ea6bb1e1..1f90bef0 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor @@ -1,6 +1,5 @@ @page "/user/sysadmin" @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider diff --git a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor.cs index 155e7add..4cc99fce 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMSharedUI.Pages.User.SysAdmins +namespace TIAMSharedUI.Pages.User.SysAdmins { public partial class SysAdmin { diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor index 858b9329..2ef97c61 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor @@ -1,14 +1,8 @@ @page "/user/destinations" @using BlazorAnimation -@using TIAM.Entities.ServiceProviders @using TIAM.Resources -@using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared -@using TIAMWebApp.Shared.Application.Models @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels -@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages -@using TIAMWebApp.Shared.Application.Utility -@using AyCode.Core.Loggers @using AyCode.Services.Loggers @layout AdminLayout @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs index 6bd7fe95..2dfa14fe 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs @@ -1,15 +1,7 @@ using DevExpress.Blazor; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; -using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Interfaces; using Microsoft.AspNetCore.Components; -using TIAM.Core.Loggers; -using TIAMSharedUI.Pages.Components; using TIAMWebApp.Shared.Application.Utility; namespace TIAMSharedUI.Pages.User.SysAdmins diff --git a/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs b/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs index d2b839ef..b8dd06a9 100644 --- a/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs +++ b/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using DevExpress.Blazor; +using DevExpress.Blazor; namespace TIAMSharedUI.Shared.AcComponents { diff --git a/TIAMSharedUI/Shared/AdminLayout.razor b/TIAMSharedUI/Shared/AdminLayout.razor index 58768b6b..ecee9adc 100644 --- a/TIAMSharedUI/Shared/AdminLayout.razor +++ b/TIAMSharedUI/Shared/AdminLayout.razor @@ -2,22 +2,10 @@ @using Microsoft.AspNetCore.Authorization @using TIAMSharedUI.Shared.Users -@using AyCode.Core.Extensions @using AyCode.Interfaces.StorageHandlers; @using AyCode.Services.Loggers -@using Newtonsoft.Json; -@using TIAMSharedUI.Pages @using TIAMSharedUI.Shared.Components @using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models.ClientSide; -@using AyCode.Blazor.Components; -@using TIAMWebApp.Shared.Application.Models; -@using TIAMWebApp.Shared.Application.Utility; -@using System.IdentityModel.Tokens.Jwt; -@using System.Runtime.CompilerServices -@using TIAM.Core.Loggers; -@using System.Diagnostics -@using AyCode.Utils.Extensions @inject NavigationManager NavManager @inject IJSRuntime jsRuntime @inject ISecureStorageHandler SecureStorageHandler diff --git a/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs index 0b40fe95..06d426c4 100644 --- a/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs @@ -9,7 +9,7 @@ public class AddressGrid : TiamGrid
{ public AddressGrid() : base() { - //GetAllMessageTag = SignalRTags.GetAddressesById; + GetAllMessageTag = SignalRTags.GetAddressesByContextId; //AddMessageTag = SignalRTags.AddAddress; UpdateMessageTag = SignalRTags.UpdateAddress; //RemoveMessageTag = SignalRTags.RemoveAddress; - nem törlünk címet - J. diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 6635a5d0..868c3fd9 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -3,14 +3,10 @@ using AyCode.Core.Enums; using AyCode.Core.Extensions; using AyCode.Core.Helpers; using AyCode.Core.Interfaces; -using AyCode.Interfaces.Entities; using AyCode.Services.SignalRs; using AyCode.Utils.Extensions; using DevExpress.Blazor; -using DevExpress.Blazor.Internal; -using DevExpress.Blazor.Navigation.Internal; using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Forms; using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Shared.Application.Utility; @@ -41,7 +37,7 @@ namespace TIAMSharedUI.Shared.Components.Grids public class TiamGrid : DxGrid where TDataItem : class, IId { protected bool IsFirstInitializeParameters; - private IList? _dataSource; + private IList _dataSource = null!; private string _gridLogName; public TiamGrid() : base() @@ -49,6 +45,7 @@ namespace TIAMSharedUI.Shared.Components.Grids [Parameter] public LoggerClient Logger { get; set; } [Parameter] public string GridName { get; set; } + [Parameter] public Guid? ContextId { get; set; } [Parameter] public AcSignalRClientBase SignalRClient { get; set; } [Parameter] public int GetAllMessageTag { get; set; } @@ -70,7 +67,7 @@ namespace TIAMSharedUI.Shared.Components.Grids [Parameter] [DefaultValue(null)] [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "BL0007:Component parameters should be auto properties", Justification = "")] - public IList? DataSource + public IList DataSource { get { @@ -80,14 +77,18 @@ namespace TIAMSharedUI.Shared.Components.Grids throw new NullReferenceException($"{_gridLogName} Use the DataSource parameter instead of Data!"); } - return _dataSource; + return _dataSource!; } set { + if (value == null) throw new ArgumentNullException(nameof(value)); + + var equals = Equals(_dataSource, value); + _dataSource = value; Data = _dataSource; - OnDataSourceChanged.InvokeAsync(_dataSource); + if (!equals) OnDataSourceChanged.InvokeAsync(_dataSource); } } @@ -106,7 +107,10 @@ namespace TIAMSharedUI.Shared.Components.Grids { await base.OnAfterRenderAsync(firstRender); - if (firstRender && DataSource == null) RefreshDataSourceAsync().Forget(); + if (firstRender) + { + if (_dataSource == null || _dataSource.Count == 0) RefreshDataSourceAsync().Forget(); + } } public Task AddDataItem(TDataItem dataItem) => AddDataItem(dataItem, AddMessageTag); @@ -165,9 +169,9 @@ namespace TIAMSharedUI.Shared.Components.Grids { if (GetAllMessageTag == 0) return Task.CompletedTask; - Logger.Info($"{_gridLogName} UpdateAllDataAsync called"); + Logger.Info($"{_gridLogName} RefreshDataSourceAsync called"); - return SignalRClient.GetAllAsync>(GetAllMessageTag, response => + return SignalRClient.GetAllAsync>(GetAllMessageTag, ContextId, response => { if (response.Status == SignalResponseStatus.Error) return; @@ -216,26 +220,6 @@ namespace TIAMSharedUI.Shared.Components.Grids //transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer); } - //protected virtual bool RefreshDataItem(TDataItem dataItem, bool isDelete) - //{ - // if (dataItem.Id.IsNullOrEmpty()) - // { - // Logger.Error($"{_gridLogName} dataItem.Id.IsNullOrEmpty()"); - // return false; - // } - - // var transferIndex = _dataSource.FindIndex(x => x.Id == dataItem.Id); - - // if (isDelete && transferIndex > -1) _dataSource.RemoveAt(transferIndex); - // else - // { - // if (transferIndex > -1) _dataSource[transferIndex] = dataItem; - // else _dataSource.Add(dataItem); - // } - - // return true; - //} - protected override Task SetParametersAsyncCore(ParameterView parameters) { if (!IsFirstInitializeParameters) diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs index 32150964..257634ed 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs @@ -8,10 +8,10 @@ public class TransferToDriversGrid : TiamGrid { public TransferToDriversGrid() : base() { - //GetAllMessageTag = SignalRTags.GetTransferToDrivers; - AddMessageTag = SignalRTags.AddTransferToDrivers; - UpdateMessageTag = SignalRTags.UpdateTransferToDrivers; - RemoveMessageTag = SignalRTags.RemoveTransferToDrivers; + GetAllMessageTag = SignalRTags.GetTransferToDriversByContextId; + AddMessageTag = SignalRTags.AddTransferToDriver; + UpdateMessageTag = SignalRTags.UpdateTransferToDriver; + RemoveMessageTag = SignalRTags.RemoveTransferToDriver; } protected override Task SetParametersAsyncCore(ParameterView parameters) diff --git a/TIAMSharedUI/Shared/Components/TIAMGridExample.razor b/TIAMSharedUI/Shared/Components/TIAMGridExample.razor index 4b2773eb..4cebb7b6 100644 --- a/TIAMSharedUI/Shared/Components/TIAMGridExample.razor +++ b/TIAMSharedUI/Shared/Components/TIAMGridExample.razor @@ -2,8 +2,6 @@ @using TIAMWebApp.Shared.Application.Interfaces; @using TIAMWebApp.Shared.Application.Models; -@using TIAMSharedUI.Shared.Components; -@using TIAMSharedUI.Shared.AcComponents; @inject IWeatherForecastService WeatherForecastService; diff --git a/TIAMSharedUI/Shared/MainLayout.razor b/TIAMSharedUI/Shared/MainLayout.razor index c8225ec0..784ac450 100644 --- a/TIAMSharedUI/Shared/MainLayout.razor +++ b/TIAMSharedUI/Shared/MainLayout.razor @@ -1,20 +1,8 @@ @inherits LayoutComponentBase -@using AyCode.Core.Extensions @using AyCode.Interfaces.StorageHandlers; @using AyCode.Services.Loggers -@using Newtonsoft.Json; @using TIAMSharedUI.Pages @using TIAMSharedUI.Shared.Components -@using TIAMWebApp.Shared.Application.Interfaces -@using TIAMWebApp.Shared.Application.Models.ClientSide; -@using AyCode.Blazor.Components; -@using TIAMWebApp.Shared.Application.Models; -@using TIAMWebApp.Shared.Application.Utility; -@using System.IdentityModel.Tokens.Jwt; -@using System.Runtime.CompilerServices -@using TIAM.Core.Loggers; -@using System.Diagnostics -@using AyCode.Utils.Extensions @inject NavigationManager NavManager @inject IJSRuntime jsRuntime @inject ISecureStorageHandler SecureStorageHandler diff --git a/TIAMSharedUI/Shared/NavMenu.razor b/TIAMSharedUI/Shared/NavMenu.razor index 86641371..559e29da 100644 --- a/TIAMSharedUI/Shared/NavMenu.razor +++ b/TIAMSharedUI/Shared/NavMenu.razor @@ -1,6 +1,4 @@ -@using TIAMWebApp.Shared.Application.Interfaces -@using AyCode.Interfaces.StorageHandlers -@using Microsoft.Extensions.Localization +@using AyCode.Interfaces.StorageHandlers @inject ISecureStorageHandler SecureStorageHandler @inject IStringLocalizer localizer diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index 28cda571..8e5ec20e 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -4,10 +4,7 @@ using Blazored.LocalStorage; using DevExpress.Blazor; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using Microsoft.AspNetCore.Components.WebAssembly.Authentication; -using System.Reflection; using System.Resources; -using AyCode.Core.Loggers; using TIAMWebApp.Client; using TIAMWebApp.Client.Services; using TIAMWebApp.Shared.Application.Interfaces; diff --git a/TIAMWebApp/Client/Services/PermissionService.cs b/TIAMWebApp/Client/Services/PermissionService.cs index caa5fc69..9de05e2c 100644 --- a/TIAMWebApp/Client/Services/PermissionService.cs +++ b/TIAMWebApp/Client/Services/PermissionService.cs @@ -1,16 +1,10 @@ -using AyCode.Core.Loggers; -using AyCode.Services.Loggers; -using System.Collections; -using System.Collections.Generic; +using AyCode.Services.Loggers; using System.Net.Http.Json; using System.Text.Json; using TIAM.Entities.Permissions; -using TIAM.Entities.Products; using TIAM.Models.Dtos.Products; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; -using TIAMWebApp.Shared.Application.Models.ClientSide; -using TIAMWebApp.Shared.Application.Utility; namespace TIAMWebApp.Client.Services { diff --git a/TIAMWebApp/Client/Services/SecureStorageHandler.cs b/TIAMWebApp/Client/Services/SecureStorageHandler.cs index 9b7d664f..37473ae9 100644 --- a/TIAMWebApp/Client/Services/SecureStorageHandler.cs +++ b/TIAMWebApp/Client/Services/SecureStorageHandler.cs @@ -1,6 +1,5 @@ using AyCode.Interfaces.StorageHandlers; using Blazored.LocalStorage; -using TIAMWebApp.Shared.Application.Interfaces; namespace TIAMWebApp.Client.Services { diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 0e6b10c0..e5ad0bc8 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -1,21 +1,14 @@ -using Microsoft.JSInterop; -using Newtonsoft.Json; +using Newtonsoft.Json; using System.Net.Http.Json; using System.Text; -using AyCode.Core.Enums; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models.PageModels; using TIAMWebApp.Shared.Application.Utility; using AyCode.Interfaces.StorageHandlers; -using TIAM.Core.Loggers; using TIAM.Models.Dtos.Users; -using ILogger = TIAM.Core.Loggers.ILogger; -using LogLevel = AyCode.Core.Loggers.LogLevel; -using AyCode.Core.Loggers; using AyCode.Services.Loggers; -using TIAMWebApp.Shared.Application.Services; namespace TIAMWebApp.Client.Services diff --git a/TIAMWebApp/Client/Services/WizardProcessor.cs b/TIAMWebApp/Client/Services/WizardProcessor.cs index e2310c17..20a3e960 100644 --- a/TIAMWebApp/Client/Services/WizardProcessor.cs +++ b/TIAMWebApp/Client/Services/WizardProcessor.cs @@ -1,12 +1,8 @@ -using AyCode.Interfaces.Enums; -using System.Diagnostics; -using TIAM.Entities.Transfers; +using TIAM.Entities.Transfers; using TIAM.Entities.Emails; //using TIAM.Entities.TransferDestinations; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; -using TIAMWebApp.Shared.Application.Utility; -using static AyCode.Interfaces.Enums.IMessageTypes; namespace TIAMWebApp.Client.Services { diff --git a/TIAMWebApp/Server/Controllers/AuctionAPIController.cs b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs index 66e4ac8f..1b2c08dc 100644 --- a/TIAMWebApp/Server/Controllers/AuctionAPIController.cs +++ b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs @@ -1,4 +1,3 @@ -using AyCode.Core.Loggers; using AyCode.Core.Server.Loggers; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/TIAMWebApp/Server/Controllers/FileAPIController.cs b/TIAMWebApp/Server/Controllers/FileAPIController.cs index c95094cc..77347859 100644 --- a/TIAMWebApp/Server/Controllers/FileAPIController.cs +++ b/TIAMWebApp/Server/Controllers/FileAPIController.cs @@ -3,10 +3,7 @@ using AyCode.Core.Server.Loggers; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Mvc; -using System.Drawing; using TIAM.Database.DataLayers.Admins; -using TIAM.Database.DataLayers.Auctions; -using TIAM.Entities.Auctions; using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Server.Controllers diff --git a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs index 1daaa612..b607a4d0 100644 --- a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs +++ b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs @@ -5,13 +5,10 @@ using GoogleApi.Entities.Common.Enums; using GoogleApi.Entities.Maps.AddressValidation.Request; using GoogleApi.Entities.Maps.Common; using GoogleApi.Entities.Maps.Common.Enums; - -using GoogleApi.Entities.Maps.Directions.Response; using GoogleApi.Entities.Maps.DistanceMatrix.Request; using GoogleApi.Entities.Maps.DistanceMatrix.Response; using GoogleApi.Entities.Maps.Geocoding.Location.Request; using Microsoft.AspNetCore.Mvc; -using System; using System.Net; using TIAMWebApp.Shared.Application.Models; diff --git a/TIAMWebApp/Server/Controllers/LoggerApiController.cs b/TIAMWebApp/Server/Controllers/LoggerApiController.cs index 0d63193b..f39eb6f2 100644 --- a/TIAMWebApp/Server/Controllers/LoggerApiController.cs +++ b/TIAMWebApp/Server/Controllers/LoggerApiController.cs @@ -1,7 +1,4 @@ using AyCode.Core.Consts; -using AyCode.Core.Loggers; -using AyCode.Core.Server.Loggers; -using AyCode.Entities; using AyCode.Entities.Server.LogItems; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Cors; diff --git a/TIAMWebApp/Server/Controllers/MessageAPIController.cs b/TIAMWebApp/Server/Controllers/MessageAPIController.cs index 3eebef98..c7506c16 100644 --- a/TIAMWebApp/Server/Controllers/MessageAPIController.cs +++ b/TIAMWebApp/Server/Controllers/MessageAPIController.cs @@ -1,32 +1,13 @@ -using DevExpress.Office.Crypto; -using DevExpress.Xpo.DB; -using DevExpress.XtraPrinting; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using Microsoft.IdentityModel.Tokens; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Security.Cryptography; using System.Text.Json; -using TIAMWebApp.Shared.Application.Models; -using TIAMWebApp.Shared.Application.Models.PageModels; -using TIAMWebApp.Server.Models; -using System.Text; -using Microsoft.AspNetCore.Hosting; -using Microsoft.EntityFrameworkCore; -using TIAM.Database.DataLayers.Users; using AyCode.Core.Helpers; -using TIAM.Entities.Users; -using TIAMWebApp.Server.ModelsTIAMWebApp.Shared.Application.Models; -using TIAMWebApp.Shared.Application.Utility; -using TIAM.Entities.Auctions; +using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; using AyCode.Models.Enums; using TIAM.Database.DataLayers.Admins; using TIAM.Entities.Emails; -using TIAM.Models.Dtos.Users; namespace TIAMWebApp.Server.Controllers { @@ -73,7 +54,7 @@ namespace TIAMWebApp.Server.Controllers var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType); //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); messageElement.EmailAddress = "noreply@anataworld.com"; - _adminDal.AddEmailMessageAsync(messageElement).Forget(); + await _adminDal.AddEmailMessageAsync(messageElement); Console.WriteLine("SendEmail result: " + result); return Ok(result); diff --git a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs index ab153d89..075f7a58 100644 --- a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs +++ b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs @@ -1,24 +1,15 @@ -using AyCode.Core.Consts; using AyCode.Core.Loggers; -using AyCode.Core.Server.Loggers; -using AyCode.Entities; -using AyCode.Entities.Server.LogItems; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using System.Net.Http; using System.Text.Json; using TIAM.Database.DataLayers.Admins; -using TIAM.Database.DataLayers.Users; using TIAM.Entities.Emails; using TIAM.Entities.Transfers; -using TIAM.Services.Server; -using TIAM.Services.Server.Logins; using TIAMWebApp.Server.Services; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.Payment; -using TIAMWebApp.Shared.Application.Models.PageModels; namespace TIAMWebApp.Server.Controllers { diff --git a/TIAMWebApp/Server/Controllers/PopulationStructureAPIController.cs b/TIAMWebApp/Server/Controllers/PopulationStructureAPIController.cs index 904ea621..dca714bf 100644 --- a/TIAMWebApp/Server/Controllers/PopulationStructureAPIController.cs +++ b/TIAMWebApp/Server/Controllers/PopulationStructureAPIController.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Mvc; -using System.Reflection.Metadata; using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Server.Controllers diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index 7a7b4750..fc9f428d 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -1,9 +1,9 @@ -using System.Diagnostics.CodeAnalysis; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using QRCoder; using System.Drawing; using System.Drawing.Imaging; +using AyCode.Core.Enums; using AyCode.Core.Extensions; using TIAM.Database.DataLayers.Admins; using TIAM.Entities.ServiceProviders; @@ -15,11 +15,8 @@ using TIAM.Entities.Profiles; using AyCode.Core.Loggers; using AyCode.Services.SignalRs; using AyCode.Utils.Extensions; -using TIAM.Services; -using TIAMWebApp.Server.Services; -using TIAM.Entities.Transfers; -using TIAMWebApp.Shared.Application.Services; using TIAM.Entities.Drivers; +using TIAM.Services; namespace TIAMWebApp.Server.Controllers { @@ -30,6 +27,62 @@ namespace TIAMWebApp.Server.Controllers { private readonly TIAM.Core.Loggers.Logger _logger = new(logWriters.ToArray()); + [NonAction] + [ApiExplorerSettings(IgnoreApi = true)] + private async Task CompanyDataChanging(Company company, DataChangeMode dataChangeMode) + { + var logText = $"[{dataChangeMode.ToString().ToUpper()}] CompanyDataChanging called; Id: {company.Id}; OwnerId: {company.OwnerId}; Name: {company.Name}"; + + if (company.Name.IsNullOrEmpty()) + { + _logger.Error(logText); + return false; + } + + _logger.Info(logText); + + switch (dataChangeMode) + { + case DataChangeMode.Add: + if (company.Id.IsNullOrEmpty()) company.Id = Guid.NewGuid(); + + //if (company.OwnerId.IsNullOrEmpty()) company.OwnerId = Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00"); //TESZT - J. + + company.SetProfile(new Profile(Guid.NewGuid(), company.Name)); + company.Profile.SetAddress(new Address(Guid.NewGuid(), "Controller AddCompanyAsync; address text...")); + + return await adminDal.CreateServiceProviderAsync(company); + + case DataChangeMode.Update: + return await adminDal.UpdateCompanyAsync(company); + case DataChangeMode.Remove: + return await adminDal.RemoveCompanyAsync(company); + + default: + throw new ArgumentOutOfRangeException(nameof(dataChangeMode), dataChangeMode, null); + } + } + + [NonAction] + [ApiExplorerSettings(IgnoreApi = true)] + [SignalR(SignalRTags.AddCompany)] + public async Task AddCompanyAsync(Company company) + => await CompanyDataChanging(company, DataChangeMode.Add) ? company.ToJson() : string.Empty; + + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UpdateServiceProviderRouteName)] + [SignalR(SignalRTags.UpdateCompany)] + public async Task UpdateServiceProvider(Company company) + => await CompanyDataChanging(company, DataChangeMode.Update) ? company.ToJson() : string.Empty; + + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.RemoveServiceProviderRouteName)] + [SignalR(SignalRTags.RemoveCompany)] + public async Task RemoveServiceProvider(Company company) + => await CompanyDataChanging(company, DataChangeMode.Remove) ? company.ToJson() : string.Empty; + //15. [AllowAnonymous] [HttpPost] @@ -38,77 +91,13 @@ namespace TIAMWebApp.Server.Controllers [EndpointSummary("Create service provider")] public async Task CreateServiceProvider([FromBody] ServiceProviderModel serializedServiceProviderModel) { - _logger.Info(@"CreateServiceProvider called"); + _logger.Info($"CreateServiceProvider called; Id: {serializedServiceProviderModel.Id}"); - //if (serializedServiceProviderModel.GetArrayLength() == 0) - if (serializedServiceProviderModel == null) - { - return string.Empty;//BadRequest("SerializedLoginModel is required").ToJson(); - } - else - { - - //Company? serviceProvider = JObject.Parse(serializedServiceProviderModel.GetRawText()).ToObject(); - var serviceProvider = serializedServiceProviderModel; - if (serviceProvider != null) - { - var id = Guid.NewGuid(); - var name = serviceProvider.Name; - var commissionRate = serviceProvider.CommissionPercent; - - - //no owner set yet - var ownerId = serviceProvider.OwnerId == Guid.Empty ? null : serviceProvider.OwnerId; - //ownerId = Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00"); //TESZT - J. - - if (name is null) - { - return string.Empty;//BadRequest("Invalid request"); - } - else - { - var company = new Company(id, name, ownerId, Guid.NewGuid()) - { - CommissionPercent = commissionRate - }; - - return await AddCompanyAsync(company); - } - } - - else { - - return string.Empty;//BadRequest(); - - } - } - } - [AllowAnonymous] - [HttpPost] - [Route("AddCompany")] - [SignalR(SignalRTags.AddCompany)] - public async Task AddCompanyAsync(Company company) - { - if (company.Id.IsNullOrEmpty()) company.Id = Guid.NewGuid(); - - _logger.Info($@"ServiceProvider to be creating; id: {company.Id}, name: {company.Name}, ownerId: {company.OwnerId}"); - - company.SetProfile(new Profile(Guid.NewGuid(), company.Name)); - company.Profile.SetAddress(new Address(Guid.NewGuid(), "Controller AddCompanyAsync; address text...")); - - var result = await adminDal.CreateServiceProviderAsync(company); - if (!result) - { - return string.Empty;//BadRequest(result); - } - else - { - return company.ToJson();//Ok(toCreate); - } + return await AddCompanyAsync(serializedServiceProviderModel.CreateMainEntity()); } //16. - [AllowAnonymous] + [AllowAnonymous] [HttpGet] [Route(APIUrls.GetServiceProvidersRouteName)] [SignalR(SignalRTags.GetCompanies)] @@ -117,17 +106,6 @@ namespace TIAMWebApp.Server.Controllers return await adminDal.GetServiceProvidersJsonAsync(); } - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetServiceProvidersRouteName)] - //public Task GetServiceProviders() => Task.FromResult(GetServiceProvidersMethod()); - - //[SignalR(SignalRTags.GetCompaniesAsync)] - //public string GetServiceProvidersMethod() - //{ - // return adminDal.GetServiceProvidersJson(); - //} - //18. [AllowAnonymous] [HttpPost] @@ -139,18 +117,6 @@ namespace TIAMWebApp.Server.Controllers return await adminDal.GetServiceProviderByIdAsync(id); } - [AllowAnonymous] - [HttpPost] - [Route(APIUrls.UpdateServiceProviderRouteName)] - [SignalR(SignalRTags.UpdateCompany)] - public async Task UpdateServiceProvider(Company companyToModify) - { - _logger.Info($"UpdateServiceProvider called! + {companyToModify.Id}"); - - var result = await adminDal.UpdateCompanyAsync(companyToModify); - - return result ? companyToModify.ToJson() : string.Empty; - } //17. [Authorize] @@ -251,6 +217,36 @@ namespace TIAMWebApp.Server.Controllers return cars; } + [NonAction] + [ApiExplorerSettings(IgnoreApi = true)] + private async Task CarDataChanging(Car car, DataChangeMode dataChangeMode) + { + var logText = $"[{dataChangeMode.ToString().ToUpper()}] CarDataChanging called; Id: {car.Id}; OwnerId: {car.UserProductMappingId}; LicensePlate: {car.LicencePlate}"; + + if (car.UserProductMappingId.IsNullOrEmpty() || car.LicencePlate.IsNullOrWhiteSpace()) + { + _logger.Error(logText); + return false; + } + + _logger.Info(logText); + + switch (dataChangeMode) + { + case DataChangeMode.Add: + if (car.Id.IsNullOrEmpty()) car.Id = Guid.NewGuid(); + + return await adminDal.AddCarAsync(car); + case DataChangeMode.Update: + return await adminDal.UpdateCarAsync(car); + case DataChangeMode.Remove: + return await adminDal.RemoveCarAsync(car); + + default: + throw new ArgumentOutOfRangeException(nameof(dataChangeMode), dataChangeMode, null); + } + } + [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateCarRouteName)] @@ -258,20 +254,7 @@ namespace TIAMWebApp.Server.Controllers [EndpointSummary("Create car")] [SignalR(SignalRTags.CreateCar)] public async Task CreateCar(Car car) - { - if (car.UserProductMappingId == Guid.Empty || car.LicencePlate == null) - { - return BadRequest("Invalid request"); - } - else - { - _logger.Info($@"CreateCar called with ownerId: {car.UserProductMappingId}, {car.LicencePlate}"); - - var result = await adminDal.AddCarAsync(car); - - return Ok(car); - } - } + => await CarDataChanging(car, DataChangeMode.Add) ? Ok(car) : BadRequest("Invalid request"); [AllowAnonymous] [HttpPost] @@ -280,20 +263,7 @@ namespace TIAMWebApp.Server.Controllers [EndpointSummary("Update car")] [SignalR(SignalRTags.UpdateCar)] public async Task UpdateCar(Car car) - { - if (car.UserProductMappingId == Guid.Empty || car.LicencePlate == null) - { - return BadRequest("Invalid request"); - } - else - { - _logger.Info($@"CreateCar called with ownerId: {car.UserProductMappingId}, {car.LicencePlate}"); - - var result = await adminDal.UpdateCarAsync(car); - - return Ok(car); - } - } + => await CarDataChanging(car, DataChangeMode.Update) ? Ok(car) : BadRequest("Invalid request"); [AllowAnonymous] [HttpPost] @@ -302,20 +272,7 @@ namespace TIAMWebApp.Server.Controllers [EndpointSummary("Delete car")] [SignalR(SignalRTags.DeleteCar)] public async Task DeleteCar(Car car) - { - if (car.UserProductMappingId == Guid.Empty || car.LicencePlate == null) - { - return BadRequest("Invalid request"); - } - else - { - _logger.Info($@"CreateCar called with ownerId: {car.UserProductMappingId}, {car.LicencePlate}"); - - var result = await adminDal.RemoveCarAsync(car); - - return Ok(car); - } - } + => await CarDataChanging(car, DataChangeMode.Remove) ? Ok(car) : BadRequest("Invalid request"); [HttpPost] [Route(APIUrls.AddProductRouteName)] diff --git a/TIAMWebApp/Server/Controllers/SupplierAPIController.cs b/TIAMWebApp/Server/Controllers/SupplierAPIController.cs index 65bfac57..ceaf7385 100644 --- a/TIAMWebApp/Server/Controllers/SupplierAPIController.cs +++ b/TIAMWebApp/Server/Controllers/SupplierAPIController.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Mvc; -using System.Reflection.Metadata; using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Server.Controllers diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 01687352..433356f9 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -16,9 +16,9 @@ using TIAM.Services; using TIAM.Services.Server; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; -using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Server.Services; using TIAMWebApp.Shared.Application.Models.ClientSide; +using AyCode.Core.Extensions; namespace TIAMWebApp.Server.Controllers { diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 08fcf84e..2fc8cb90 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -10,8 +10,6 @@ using AyCode.Core.Loggers; using TIAM.Database.DataLayers.Users; using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; -using TIAM.Database.DataLayers.Admins; -using AyCode.Entities.Server.LogItems; using TIAM.Entities.Profiles; using TIAM.Entities.Addresses; using TIAM.Services.Server.Logins; diff --git a/TIAMWebApp/Server/Controllers/UserPermissionAPIController.cs b/TIAMWebApp/Server/Controllers/UserPermissionAPIController.cs index fe7508ea..836f6330 100644 --- a/TIAMWebApp/Server/Controllers/UserPermissionAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserPermissionAPIController.cs @@ -1,16 +1,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; -using System.Text.Json; using TIAM.Database.DataLayers.Admins; //using TIAM.Database.DataLayers.ServiceProviders; -using TIAM.Database.DataLayers.Users; using TIAM.Entities.Permissions; -using TIAM.Entities.Products; -using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Users; using TIAMWebApp.Shared.Application.Models; -using TIAMWebApp.Shared.Application.Models.PageModels; namespace TIAMWebApp.Server.Controllers { diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 490a9dd9..adeccf3f 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -4,7 +4,6 @@ using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using System.Text; using AyCode.Core.Loggers; -using MessagePack; using TIAM.Core.Loggers; using TIAM.Database; using TIAM.Database.DataLayers.Admins; @@ -13,14 +12,9 @@ using TIAM.Database.DataLayers.TransferDestinations; using TIAM.Database.DataLayers.Users; using TIAM.Entities.Emails; using TIAM.Services.Server; -using TIAMWebApp.Shared.Application.Utility; -using Microsoft.Extensions.DependencyInjection; using TIAMWebApp.Server.Controllers; using TIAMWebApp.Server.Services; using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.AspNetCore.SignalR; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.Hosting; using Microsoft.AspNetCore.ResponseCompression; using System.IO.Compression; diff --git a/TIAMWebApp/Server/Services/AuthService.cs b/TIAMWebApp/Server/Services/AuthService.cs index 7f3a1691..2913ad7b 100644 --- a/TIAMWebApp/Server/Services/AuthService.cs +++ b/TIAMWebApp/Server/Services/AuthService.cs @@ -1,8 +1,4 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Authorization; - -namespace TIAMWebApp.Server.Services +namespace TIAMWebApp.Server.Services { public class AuthService { diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index 15a10e2b..be43655d 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -1,6 +1,5 @@ using System.Collections.Concurrent; using System.Reflection; -using System.Reflection.Emit; using AyCode.Core.Extensions; using AyCode.Core.Loggers; using AyCode.Services.SignalRs; @@ -8,16 +7,11 @@ using Microsoft.AspNetCore.SignalR; using TIAM.Database.DataLayers.Admins; using MessagePack.Resolvers; using AyCode.Services.Server.SignalRs; -using DevExpress.Utils.Filtering; -using TIAM.Entities.Transfers; using TIAM.Services; using TIAMWebApp.Server.Controllers; using TIAM.Entities.ServiceProviders; using System.Runtime.CompilerServices; using MessagePack; -using System.Security.Cryptography.Xml; -using DevExpress.XtraPrinting.Native.WebClientUIControl; -using DevExpress.XtraReports.Parameters; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; @@ -141,7 +135,13 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe paramValues = new object[1]; - if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?)) paramValues[0] = message!.MessagePackTo().Id; + if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?)) + { + var msg = message!.MessagePackTo>(); + if (msg.PostData.Id.IsNullOrEmpty()) throw new NullReferenceException($"PostData.Id.IsNullOrEmpty(); Id: {msg.PostData.Id}"); + + paramValues[0] = msg.PostData.Id; + } else paramValues[0] = message!.MessagePackTo>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!; } else _logger.Debug($"{logText}()"); @@ -155,16 +155,24 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe switch (messageTag) { - case SignalRTags.RemoveCompany: - var deleteCompany = message!.MessagePackTo>().PostData; + case SignalRTags.GetAddress: + var id = message!.MessagePackTo>().PostData.Id; - await _adminDal.RemoveCompanyAsync(deleteCompany.Id); - await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success), requestId); + var address = await _adminDal.GetAddressByIdAsync(id); + await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, address), requestId); + + return; + + case SignalRTags.GetAddressesByContextId: + id = message!.MessagePackTo>().PostData.Id; + + address = await _adminDal.GetAddressByIdAsync(id); + await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, new List
{ address! }), requestId); return; case SignalRTags.UpdateAddress: - var address = message!.MessagePackTo>().PostData; + address = message!.MessagePackTo>().PostData; await _adminDal.UpdateAddressAsync(address); await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, address), requestId); diff --git a/TIAMWebApp/Server/Services/GameHub.cs b/TIAMWebApp/Server/Services/GameHub.cs index 938c25fd..e4f4c56d 100644 --- a/TIAMWebApp/Server/Services/GameHub.cs +++ b/TIAMWebApp/Server/Services/GameHub.cs @@ -1,7 +1,5 @@ using AyCode.Core.Loggers; using Microsoft.AspNetCore.SignalR; -using System.Net.Http; -using TIAM.Core.Loggers; namespace TIAMWebApp.Server.Services; public class GameHub : Hub diff --git a/TIAMWebApp/Server/Services/LoggerSignalRHub.cs b/TIAMWebApp/Server/Services/LoggerSignalRHub.cs index 48c357f0..f96781cf 100644 --- a/TIAMWebApp/Server/Services/LoggerSignalRHub.cs +++ b/TIAMWebApp/Server/Services/LoggerSignalRHub.cs @@ -1,7 +1,6 @@ using AyCode.Core.Consts; using AyCode.Entities.Server.LogItems; using Microsoft.AspNetCore.SignalR; -using TIAM.Database; namespace TIAMWebApp.Server.Services; diff --git a/TIAMWebApp/Server/Services/SumupService.cs b/TIAMWebApp/Server/Services/SumupService.cs index bde0a671..e740198d 100644 --- a/TIAMWebApp/Server/Services/SumupService.cs +++ b/TIAMWebApp/Server/Services/SumupService.cs @@ -1,17 +1,9 @@ using AyCode.Core.Loggers; -using AyCode.Services.Loggers; -using System; -using System.Net.Http; using System.Net.Http.Headers; using System.Text; using System.Text.Json; using System.Text.Json.Serialization; -using System.Threading.Tasks; -using TIAM.Core.Loggers; using TIAMWebApp.Shared.Application.Models.ClientSide.Payment; -using TIAMWebApp.Shared.Application.Services; -using TIAMWebApp.Shared.Application.Utility; -using static System.Net.WebRequestMethods; namespace TIAMWebApp.Server.Services { diff --git a/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs b/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs index 45d12e34..bc4ff2d5 100644 --- a/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs +++ b/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs @@ -1,10 +1,4 @@ using TIAM.Entities.Emails; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static AyCode.Interfaces.Enums.IMessageTypes; namespace TIAMWebApp.Shared.Application.Interfaces { diff --git a/TIAMWebApp/Shared/Interfaces/IComponentUpdateService.cs b/TIAMWebApp/Shared/Interfaces/IComponentUpdateService.cs index 7d9c81cb..8c60c09f 100644 --- a/TIAMWebApp/Shared/Interfaces/IComponentUpdateService.cs +++ b/TIAMWebApp/Shared/Interfaces/IComponentUpdateService.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Interfaces +namespace TIAMWebApp.Shared.Application.Interfaces { public interface IComponentUpdateService { diff --git a/TIAMWebApp/Shared/Interfaces/IImageDataService.cs b/TIAMWebApp/Shared/Interfaces/IImageDataService.cs index 615d5e3c..7c0d32de 100644 --- a/TIAMWebApp/Shared/Interfaces/IImageDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IImageDataService.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Interfaces +namespace TIAMWebApp.Shared.Application.Interfaces { public interface IImageDataService { diff --git a/TIAMWebApp/Shared/Interfaces/IPermissionService.cs b/TIAMWebApp/Shared/Interfaces/IPermissionService.cs index 9fb29bad..8914ad68 100644 --- a/TIAMWebApp/Shared/Interfaces/IPermissionService.cs +++ b/TIAMWebApp/Shared/Interfaces/IPermissionService.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Permissions; -using TIAM.Entities.Products; -using TIAM.Entities.ServiceProviders; +using TIAM.Entities.Permissions; using TIAM.Models.Dtos.Products; namespace TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMWebApp/Shared/Interfaces/IPopulationStructureDataProvider.cs b/TIAMWebApp/Shared/Interfaces/IPopulationStructureDataProvider.cs index e2e0fbfd..74895e1d 100644 --- a/TIAMWebApp/Shared/Interfaces/IPopulationStructureDataProvider.cs +++ b/TIAMWebApp/Shared/Interfaces/IPopulationStructureDataProvider.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Shared.Application.Interfaces { diff --git a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs index c6550cf9..dc488ac3 100644 --- a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs @@ -1,13 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Drawing; -using TIAM.Entities.Products; +using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAMWebApp.Shared.Application.Models; -using SkiaSharp; namespace TIAMWebApp.Shared.Application.Interfaces { diff --git a/TIAMWebApp/Shared/Interfaces/ISessionService.cs b/TIAMWebApp/Shared/Interfaces/ISessionService.cs index 361377d2..7d40c16c 100644 --- a/TIAMWebApp/Shared/Interfaces/ISessionService.cs +++ b/TIAMWebApp/Shared/Interfaces/ISessionService.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; +using System.Net; using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMWebApp/Shared/Interfaces/ISupplierService.cs b/TIAMWebApp/Shared/Interfaces/ISupplierService.cs index 4049a874..1cce24f5 100644 --- a/TIAMWebApp/Shared/Interfaces/ISupplierService.cs +++ b/TIAMWebApp/Shared/Interfaces/ISupplierService.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Shared.Application.Interfaces { diff --git a/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs b/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs index d26a7794..f243700e 100644 --- a/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs @@ -1,5 +1,4 @@ using TIAM.Entities.Transfers; -using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; namespace TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs index 93fa11e0..cf918b60 100644 --- a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Users; -using TIAM.Models.Dtos.Users; +using TIAM.Models.Dtos.Users; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.PageModels; diff --git a/TIAMWebApp/Shared/Interfaces/IWizardProcessor.cs b/TIAMWebApp/Shared/Interfaces/IWizardProcessor.cs index 1a244e81..15f69ada 100644 --- a/TIAMWebApp/Shared/Interfaces/IWizardProcessor.cs +++ b/TIAMWebApp/Shared/Interfaces/IWizardProcessor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Interfaces +namespace TIAMWebApp.Shared.Application.Interfaces { public interface IWizardProcessor { diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 0700ced5..f850dbc7 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -114,6 +114,9 @@ namespace TIAMWebApp.Shared.Application.Models public const string UpdateServiceProviderRouteName = "UpdateServiceProvider"; public const string UpdateServiceProviderUrl = ServiceProviderAPI + UpdateServiceProviderRouteName; + public const string RemoveServiceProviderRouteName = "RemoveServiceProvider"; + public const string RemoveServiceProviderUrl = ServiceProviderAPI + UpdateServiceProviderRouteName; + public const string GetQrCodeByProductIdRouteName = "GetQRCodeByProductId"; diff --git a/TIAMWebApp/Shared/Models/AssignPermissionModel.cs b/TIAMWebApp/Shared/Models/AssignPermissionModel.cs index 6d13d3b1..e60e006a 100644 --- a/TIAMWebApp/Shared/Models/AssignPermissionModel.cs +++ b/TIAMWebApp/Shared/Models/AssignPermissionModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Permissions; +using TIAM.Entities.Permissions; using TIAM.Entities.Users; namespace TIAMWebApp.Shared.Application.Models diff --git a/TIAMWebApp/Shared/Models/CarModel.cs b/TIAMWebApp/Shared/Models/CarModel.cs index 3456a0f6..a43bf376 100644 --- a/TIAMWebApp/Shared/Models/CarModel.cs +++ b/TIAMWebApp/Shared/Models/CarModel.cs @@ -1,10 +1,5 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace TIAMWebApp.Shared.Application.Models { diff --git a/TIAMWebApp/Shared/Models/ClientSide/Messages/EmaiMessageSenderModel.cs b/TIAMWebApp/Shared/Models/ClientSide/Messages/EmaiMessageSenderModel.cs index ab22935d..09196716 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Messages/EmaiMessageSenderModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Messages/EmaiMessageSenderModel.cs @@ -1,9 +1,4 @@ using AyCode.Models.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TIAM.Entities.Emails; namespace TIAMWebApp.Shared.Application.Models.ClientSide.Messages diff --git a/TIAMWebApp/Shared/Models/ClientSide/Messages/MessageSenderModel.cs b/TIAMWebApp/Shared/Models/ClientSide/Messages/MessageSenderModel.cs index a976c707..ba7401ae 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Messages/MessageSenderModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Messages/MessageSenderModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Models.Enums; +using AyCode.Models.Enums; using TIAM.Entities.Emails; namespace TIAMWebApp.Shared.Application.Models.ClientSide.Messages diff --git a/TIAMWebApp/Shared/Models/ClientSide/Payment/SumupPaymentRequest.cs b/TIAMWebApp/Shared/Models/ClientSide/Payment/SumupPaymentRequest.cs index bf8d68cb..067df372 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Payment/SumupPaymentRequest.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Payment/SumupPaymentRequest.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.Json.Serialization; -using System.Threading.Tasks; +using System.Text.Json.Serialization; namespace TIAMWebApp.Shared.Application.Models.ClientSide.Payment { diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index a354429d..a229339c 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models.ClientSide +namespace TIAMWebApp.Shared.Application.Models.ClientSide { public class Setting { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/ACStepModelBase.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/ACStepModelBase.cs index c9d97445..0e20be88 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/ACStepModelBase.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/ACStepModelBase.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; +using System.Reflection; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/HeroSliderItem.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/HeroSliderItem.cs index 63ec9f42..29961994 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/HeroSliderItem.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/HeroSliderItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI +namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI { public class HeroSliderItem { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs index e2fe28ac..7bdc4dd3 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI +namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI { public class TransferStatusModel { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs index b1e9bd9e..7a565f9b 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs @@ -1,12 +1,4 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using TIAM.Entities.Emails; +using System.ComponentModel.DataAnnotations; using TIAM.Resources; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModelExtensions.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModelExtensions.cs index 19b57cd6..9cd53c48 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModelExtensions.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModelExtensions.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Emails; +using TIAM.Entities.Emails; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs index b3640c08..30d1e701 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; using TIAM.Core.Enums; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/RegisterWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/RegisterWizardModel.cs index 56194fd6..77552d52 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/RegisterWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/RegisterWizardModel.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; +using System.ComponentModel.DataAnnotations; using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ServiceProviderWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ServiceProviderWizardModel.cs index 25df9b1c..80b91943 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ServiceProviderWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ServiceProviderWizardModel.cs @@ -1,12 +1,4 @@ -using AyCode.Entities.Locations; -using AyCode.Interfaces.TimeStampInfo; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; using TIAM.Resources; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs index e8ef9997..e6c0c06a 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs @@ -1,14 +1,4 @@ -using AyCode.Entities.Locations; -using AyCode.Interfaces.TimeStampInfo; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Net.NetworkInformation; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; using TIAM.Core.Enums; using TIAM.Entities.Addresses; using TIAM.Entities.Transfers; diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs index e3ed0489..1cf10421 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs @@ -1,14 +1,4 @@ -using AyCode.Entities.Locations; -using AyCode.Interfaces.TimeStampInfo; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using TIAM.Entities.Addresses; -using TIAM.Entities.Transfers; +using System.ComponentModel.DataAnnotations; using TIAM.Resources; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs index e7492943..ab0a5aec 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Transfers; +using TIAM.Entities.Transfers; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels { diff --git a/TIAMWebApp/Shared/Models/ClientSide/UserBasicDetails.cs b/TIAMWebApp/Shared/Models/ClientSide/UserBasicDetails.cs index 731bb662..e427133e 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UserBasicDetails.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UserBasicDetails.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models.ClientSide +namespace TIAMWebApp.Shared.Application.Models.ClientSide { public class UserBasicDetails { diff --git a/TIAMWebApp/Shared/Models/CreateAssignedUserModel.cs b/TIAMWebApp/Shared/Models/CreateAssignedUserModel.cs index 886d7078..4d5acf85 100644 --- a/TIAMWebApp/Shared/Models/CreateAssignedUserModel.cs +++ b/TIAMWebApp/Shared/Models/CreateAssignedUserModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class CreateUserProductMappingModel { diff --git a/TIAMWebApp/Shared/Models/DriverModel.cs b/TIAMWebApp/Shared/Models/DriverModel.cs index d09fc61f..d3c10ef6 100644 --- a/TIAMWebApp/Shared/Models/DriverModel.cs +++ b/TIAMWebApp/Shared/Models/DriverModel.cs @@ -1,10 +1,5 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace TIAMWebApp.Shared.Application.Models { diff --git a/TIAMWebApp/Shared/Models/Event.cs b/TIAMWebApp/Shared/Models/Event.cs index 5601810f..e77bcc0e 100644 --- a/TIAMWebApp/Shared/Models/Event.cs +++ b/TIAMWebApp/Shared/Models/Event.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class Event { diff --git a/TIAMWebApp/Shared/Models/PageModels/AppointmentModel.cs b/TIAMWebApp/Shared/Models/PageModels/AppointmentModel.cs index 2d036690..1434a967 100644 --- a/TIAMWebApp/Shared/Models/PageModels/AppointmentModel.cs +++ b/TIAMWebApp/Shared/Models/PageModels/AppointmentModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Core.Interfaces; -using AyCode.Interfaces.Entities; +using AyCode.Core.Interfaces; namespace TIAMWebApp.Shared.Application.Models.PageModels { diff --git a/TIAMWebApp/Shared/Models/PageModels/LoginModel.cs b/TIAMWebApp/Shared/Models/PageModels/LoginModel.cs index 7d09e374..d8477bce 100644 --- a/TIAMWebApp/Shared/Models/PageModels/LoginModel.cs +++ b/TIAMWebApp/Shared/Models/PageModels/LoginModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Resources; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; namespace TIAMWebApp.Shared.Application.Models.PageModels { diff --git a/TIAMWebApp/Shared/Models/PageModels/RegistrationModel.cs b/TIAMWebApp/Shared/Models/PageModels/RegistrationModel.cs index db401aba..6a0c329f 100644 --- a/TIAMWebApp/Shared/Models/PageModels/RegistrationModel.cs +++ b/TIAMWebApp/Shared/Models/PageModels/RegistrationModel.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models.PageModels +namespace TIAMWebApp.Shared.Application.Models.PageModels { public class RegistrationModel { diff --git a/TIAMWebApp/Shared/Models/PopulationAgeStructureItem.cs b/TIAMWebApp/Shared/Models/PopulationAgeStructureItem.cs index 89f905b4..ff200f07 100644 --- a/TIAMWebApp/Shared/Models/PopulationAgeStructureItem.cs +++ b/TIAMWebApp/Shared/Models/PopulationAgeStructureItem.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class PopulationAgeStructureItem diff --git a/TIAMWebApp/Shared/Models/ProductDTO.cs b/TIAMWebApp/Shared/Models/ProductDTO.cs index 8b9cfa0e..2f56b77f 100644 --- a/TIAMWebApp/Shared/Models/ProductDTO.cs +++ b/TIAMWebApp/Shared/Models/ProductDTO.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class ProductDTO { diff --git a/TIAMWebApp/Shared/Models/RoleType.cs b/TIAMWebApp/Shared/Models/RoleType.cs index c927fde3..b2a4dc8c 100644 --- a/TIAMWebApp/Shared/Models/RoleType.cs +++ b/TIAMWebApp/Shared/Models/RoleType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class RoleType diff --git a/TIAMWebApp/Shared/Models/ServiceProviderModel.cs b/TIAMWebApp/Shared/Models/ServiceProviderModel.cs index fce13b92..2e1f70ba 100644 --- a/TIAMWebApp/Shared/Models/ServiceProviderModel.cs +++ b/TIAMWebApp/Shared/Models/ServiceProviderModel.cs @@ -1,24 +1,31 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using AyCode.Models; +using TIAM.Entities.ServiceProviders; namespace TIAMWebApp.Shared.Application.Models { - public class ServiceProviderModel + public class ServiceProviderModel : AcModelDtoBase { - public Guid Id { get; set; } public string? Name { get; set; } public Guid? OwnerId { get; set; } - public int CommissionPercent { get; set; } - public ServiceProviderModel() { } - public ServiceProviderModel(Guid id, string name, Guid? ownerId, int commissionPercent) + public double CommissionPercent { get; set; } + + public ServiceProviderModel() : base() + { } + + public ServiceProviderModel(Guid id, string name, Guid? ownerId, double commissionPercent) : base(id) { - Id = id; Name = name; OwnerId = ownerId; CommissionPercent = commissionPercent; } + + public ServiceProviderModel(ICompanyBase company) : this(company.Id, company.Name, company.OwnerId, company.CommissionPercent) + { + } + + public override Company CreateMainEntity() + { + return new Company(Id, Name!, OwnerId, CommissionPercent); + } } } diff --git a/TIAMWebApp/Shared/Models/Supplier.cs b/TIAMWebApp/Shared/Models/Supplier.cs index a318ac11..53eae068 100644 --- a/TIAMWebApp/Shared/Models/Supplier.cs +++ b/TIAMWebApp/Shared/Models/Supplier.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class Supplier { diff --git a/TIAMWebApp/Shared/Models/TripInfo.cs b/TIAMWebApp/Shared/Models/TripInfo.cs index 8e2384be..42b114e9 100644 --- a/TIAMWebApp/Shared/Models/TripInfo.cs +++ b/TIAMWebApp/Shared/Models/TripInfo.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Models +namespace TIAMWebApp.Shared.Application.Models { public class TripInfo { diff --git a/TIAMWebApp/Shared/Models/UserSessionModel.cs b/TIAMWebApp/Shared/Models/UserSessionModel.cs index bca5ef27..b9542fc2 100644 --- a/TIAMWebApp/Shared/Models/UserSessionModel.cs +++ b/TIAMWebApp/Shared/Models/UserSessionModel.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using Microsoft.IdentityModel.Tokens; -using TIAM.Entities.Users; -using TIAM.Models.Dtos.Users; +using TIAM.Models.Dtos.Users; namespace TIAMWebApp.Shared.Application.Models { diff --git a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs index 1b5cce43..cefac36e 100644 --- a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs +++ b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs @@ -1,21 +1,11 @@ using System.Collections.Concurrent; -using System.Security.Cryptography.X509Certificates; using AyCode.Core; -using AyCode.Core.Enums; using AyCode.Core.Extensions; using AyCode.Core.Helpers; -using AyCode.Core.Loggers; -using AyCode.Entities.LogItems; using AyCode.Services.Loggers; using AyCode.Services.SignalRs; -using Azure.Core; -using MessagePack; using MessagePack.Resolvers; using Microsoft.AspNetCore.SignalR.Client; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; -using TIAM.Entities.Transfers; -using TIAM.Services; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Utility; @@ -100,17 +90,16 @@ namespace TIAMWebApp.Shared.Application.Services #region CRUD public virtual Task GetByIdAsync(int messageTag, Guid id) where TResponse : class - => SendMessageToServerAsync(messageTag, new SignalRequestByIdMessage(id), AcDomain.NextUniqueInt32); + => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(new IdMessage(id)), AcDomain.NextUniqueInt32); public virtual Task GetByIdAsync(int messageTag, Guid id, Action> responseCallback) - => SendMessageToServerAsync(messageTag, new SignalRequestByIdMessage(id), responseCallback); + => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(new IdMessage(id)), responseCallback); public virtual Task GetAllAsync(int messageTag) where TResponse : class => SendMessageToServerAsync(messageTag); public virtual Task GetAllAsync(int messageTag, Action> responseCallback) => SendMessageToServerAsync(messageTag, null, responseCallback); - - public virtual Task GetAllAsync(int messageTag, Guid contextId, Action> responseCallback) - => throw new NotImplementedException(); + public virtual Task GetAllAsync(int messageTag, Guid? contextId, Action> responseCallback) + => SendMessageToServerAsync(messageTag, (contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage(new IdMessage(contextId.Value))), responseCallback); public virtual Task PostDataAsync(int messageTag, TPostData postData) where TPostData : class => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(postData), AcDomain.NextUniqueInt32); diff --git a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs index 33e36d50..a7702f45 100644 --- a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs +++ b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs @@ -1,17 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TIAM.Entities.Transfers; -using TIAMWebApp.Shared.Application.Interfaces; -using static System.Net.WebRequestMethods; +using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; using System.Net.Http.Json; //using AyCode.Models.Messages; using TIAM.Entities.Emails; -using TIAMWebApp.Shared.Application.Utility; using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; namespace TIAMWebApp.Shared.Application.Services diff --git a/TIAMWebApp/Shared/Services/CustomAuthStateProvider.cs b/TIAMWebApp/Shared/Services/CustomAuthStateProvider.cs index 7db78820..1c852685 100644 --- a/TIAMWebApp/Shared/Services/CustomAuthStateProvider.cs +++ b/TIAMWebApp/Shared/Services/CustomAuthStateProvider.cs @@ -1,10 +1,8 @@ using AyCode.Interfaces.StorageHandlers; using Microsoft.AspNetCore.Components.Authorization; using Newtonsoft.Json; -using System.IdentityModel.Tokens.Jwt; using System.Net.Http.Headers; using System.Security.Claims; -using System.Text.Json; using TIAMWebApp.Shared.Application.Models.ClientSide; namespace TIAMWebApp.Shared.Application.Services diff --git a/TIAMWebApp/Shared/Services/ImageDataService.cs b/TIAMWebApp/Shared/Services/ImageDataService.cs index b4190f65..dbce81e5 100644 --- a/TIAMWebApp/Shared/Services/ImageDataService.cs +++ b/TIAMWebApp/Shared/Services/ImageDataService.cs @@ -1,21 +1,8 @@ -using Azure; -using Microsoft.AspNetCore.Http; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; -using Microsoft.IdentityModel.Tokens; -using Microsoft.SqlServer.Server; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http.Headers; -using System.Net.Http.Json; -using System.Text; -using System.Threading.Tasks; +using System.Net.Http.Json; //using TIAM.Entities.TransferDestinations; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; -using static System.Net.WebRequestMethods; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace TIAMWebApp.Shared.Application.Services { diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index d53b1d9d..2827e839 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -1,14 +1,8 @@ -using AyCode.Core.Loggers; -using AyCode.Interfaces.StorageHandlers; -using Microsoft.JSInterop; +using AyCode.Interfaces.StorageHandlers; using Newtonsoft.Json; -using SkiaSharp; using System.Net.Http.Json; -using AyCode.Core.Helpers; using AyCode.Services.Loggers; using AyCode.Services.SignalRs; -using TIAM.Core.Loggers; -using TIAM.Database.DataLayers.Users; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; @@ -17,9 +11,6 @@ using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Utility; using TIAM.Services; -using System.Linq; -using TIAM.Entities.Transfers; -using System.Net.WebSockets; namespace TIAMWebApp.Shared.Application.Services { diff --git a/TIAMWebApp/Shared/Services/SignalRService.cs b/TIAMWebApp/Shared/Services/SignalRService.cs index 0ce24db1..6b56bfef 100644 --- a/TIAMWebApp/Shared/Services/SignalRService.cs +++ b/TIAMWebApp/Shared/Services/SignalRService.cs @@ -1,6 +1,4 @@ using Microsoft.AspNetCore.SignalR.Client; -using System; -using System.Threading.Tasks; using TIAMWebApp.Shared.Application.Models.ClientSide; namespace TIAMWebApp.Shared.Application.Services diff --git a/TIAMWebApp/Shared/Services/SumupService.cs b/TIAMWebApp/Shared/Services/SumupService.cs index 1ee1e284..51507053 100644 --- a/TIAMWebApp/Shared/Services/SumupService.cs +++ b/TIAMWebApp/Shared/Services/SumupService.cs @@ -1,19 +1,11 @@ using AyCode.Services.Loggers; -using System; -using System.Collections.Generic; -using System.Linq; using System.Net.Http.Json; -using System.Text; -using System.Threading.Tasks; using TIAM.Entities.Transfers; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Utility; using TIAM.Core.Loggers; -using TIAMWebApp.Shared.Application.Models.ClientSide.Payment; -using static System.Net.WebRequestMethods; using System.Text.Json; -using TIAM.Models.Dtos.Users; using System.Text.Json.Serialization; namespace TIAMWebApp.Shared.Application.Services diff --git a/TIAMWebApp/Shared/Services/TransferDataService.cs b/TIAMWebApp/Shared/Services/TransferDataService.cs index a75dc678..60008fd4 100644 --- a/TIAMWebApp/Shared/Services/TransferDataService.cs +++ b/TIAMWebApp/Shared/Services/TransferDataService.cs @@ -1,5 +1,4 @@ -using AyCode.Core.Loggers; -using AyCode.Services.Loggers; +using AyCode.Services.Loggers; using System.Net.Http.Json; using System.Text.Json; using TIAM.Core.Loggers; diff --git a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs index 2f66b61f..e99066be 100644 --- a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs +++ b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs @@ -1,9 +1,6 @@ using AyCode.Services.Loggers; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; -using System.Net.Http.Json; -using AyCode.Core.Helpers; -using AyCode.Core.Loggers; using AyCode.Entities.LogItems; namespace TIAMWebApp.Shared.Application.Utility; diff --git a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs b/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs index cf1ac7d1..9dc53340 100644 --- a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs +++ b/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs @@ -1,6 +1,4 @@ -using Microsoft.JSInterop; - -namespace TIAMWebApp.Shared.Application.Utility +namespace TIAMWebApp.Shared.Application.Utility { //public class LogToBrowserConsole //{ diff --git a/TIAMWebApp/Shared/Utility/RenderWizard.cs b/TIAMWebApp/Shared/Utility/RenderWizard.cs index e0cd0d70..d2c9ce5c 100644 --- a/TIAMWebApp/Shared/Utility/RenderWizard.cs +++ b/TIAMWebApp/Shared/Utility/RenderWizard.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Utility +namespace TIAMWebApp.Shared.Application.Utility { public class RenderWizard { diff --git a/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs b/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs index c3cbd36f..ebe1ff8b 100644 --- a/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs +++ b/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs @@ -5,8 +5,6 @@ using AyCode.Entities; using AyCode.Entities.LogItems; using AyCode.Services.Loggers; using Microsoft.AspNetCore.SignalR.Client; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; using TIAMWebApp.Shared.Application.Models.ClientSide; namespace TIAMWebApp.Shared.Application.Utility