TIAM.Database/DataLayers/Admins/AdminDal.cs

@@ -4,15 +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 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;
@@ -223,7 +220,11 @@ namespace TIAM.Database.DataLayers.Admins
         #endregion EmailMessage
 
         //15. (IServiceProviderDataService) Create service provider
-        public Task<bool> CreateServiceProviderAsync(Company serviceProvider) => SessionAsync(ctx => ctx.AddServiceProvider(serviceProvider));
+        public Task<bool> CreateServiceProviderAsync(Company serviceProvider)
+        {
+            Context.CreateServiceProvider(serviceProvider);
+            return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0);
+        }
 
         public bool CreateProductAsync(Product product)
         {
@@ -233,15 +234,21 @@ namespace TIAM.Database.DataLayers.Admins
             return result.Result > 0;
         }
 
-        public Task<List<Company>> GetServiceProvidersAsync() => SessionAsync(ctx => ctx.GetServiceProviders().ToList());
+        public Task<List<Company>> GetServiceProvidersAsync()
+        {
+            return SessionAsync(ctx => ctx.ServiceProviders.ToList());
+        }
 
         public Task<string> GetServiceProvidersJsonAsync()
         {
             return SessionAsync(ctx => ctx.ServiceProviders.ToJson());
         }
 
-
+        public virtual Task<Company?> GetServiceProviderByIdAsync(Guid id)
-        public virtual Task<Company?> GetServiceProviderByIdAsync(Guid id) => SessionAsync(ctx => ctx.GetServiceProviderById(id));
+        {
+            GlobalLogger.Info($@"Getting serviceProvider from db {id}");
+            return Context.ServiceProviders.SingleOrDefaultAsync(x => x.Id == id);
+        }
 
         //public Task<UserProductMapping> CreateUserProductMappingAsync(UserProductMapping userProductMapping)
         //{
@@ -253,12 +260,64 @@ namespace TIAM.Database.DataLayers.Admins
         #region ServiceProviders
 
         //14. (IserviceProviderDataService) Update service provider
-        public Task<bool> UpdateServiceProviderAsync(Company company) => TransactionAsync(ctx => ctx.UpdateServiceProvider(company));
+        public Task<bool> UpdateServiceProviderAsync(Company serviceProvider)
-
+        {
+            var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id);
+            if (dbServiceProvider != null)
+            {
+                dbServiceProvider = serviceProvider;
+                Context.ServiceProviders.Update(dbServiceProvider);
+                return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0);
+            }
+            else
+            {
+                throw new Exception("ServiceProvider not found");
+            }
+        }
 
         //13. (IserviceProviderDataService) delete service provider
-        public Task<bool> DeleteServiceProviderAsync(Guid id) => TransactionAsync(ctx => ctx.RemoveServiceProvider(id));
+        public Task<bool> DeleteServiceProviderAsync(Guid id)
+        {
+            using (var transaction = Context.Database.BeginTransaction())
+            {
+                var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == id);
+                if (dbServiceProvider != null)
+                {
+                    //get products for this provider
+                    var products = Context.Products.Where(x => x.ServiceProviderId == id).ToList();
 
+                    /*foreach (var productItem in products)
+                    {
+                        //delete products
+                        var permissionContextMappings = Context.PermissionContextMappings.Where(x => x.ContextId == productItem.Id).ToList();
+                        //iterate through every row
+                        foreach (var item in permissionContextMappings)
+                        {
+
+                            if (item.SubjectType == (int)PermissionContextMappingSubjectType.Group)
+                            {
+                                //get users in the permissiongroup
+                                var permissionGroupUserMapping = Context.PermissionGroupUserMappings.Where(x => x.PermissionContextMappingId == item.Id).ToList();
+                                //remove every row (users) from permissiongroup 
+                                foreach (var user in permissionGroupUserMapping)
+                                {
+                                    Context.PermissionGroupUserMappings.Remove(user);
+                                }
+                            }
+                        }                        
+                        //remove permissioncontextmappings
+                        Context.PermissionContextMappings.RemoveRange(permissionContextMappings);
+                    }*/
+                    Context.Products.RemoveRange(products);
+                    Context.ServiceProviders.Remove(dbServiceProvider);
+                    return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0);
+                }
+                else
+                {
+                    return Task.FromResult(false);
+                }
+            }
+        }
 
         //17. (IServiceProviderDataService) get service provider by ownerId
         public Task<List<Company>> GetServiceProvidersByOwnerIdAsync()

TIAM.Database/DbContexts/Admins/AdminDbContextExtension.cs

@@ -1,12 +1,9 @@
-using Microsoft.EntityFrameworkCore;
+using TIAM.Database.DbSets.Permissions;
-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
@@ -126,8 +123,16 @@ namespace TIAM.Database.DbContexts.Admins
             return serviceProvider;
         }
 
+        public static Company UpdateServiceProvider(this IAdminDbContext ctx, Company serviceProvider)
+        {
+            if (serviceProvider == null) return null;
 
-        public static bool UpdateServiceProvider(this IAdminDbContext ctx, Company serviceProvider)
+            var existingServiceProvider = ctx.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id);
-        => ctx.ServiceProviders.Update(serviceProvider).State == EntityState.Modified;
+            if (existingServiceProvider == null) return null;
+
+            existingServiceProvider.Name = serviceProvider.Name;
+            existingServiceProvider.OwnerId = serviceProvider.OwnerId;
+            return existingServiceProvider;
+        }
     }
 }

TIAM.Database/DbSets/ServiceProvider/ServiceProviderDbSetExtensions.cs

@@ -1,38 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using TIAM.Database.DbSets.Transfers;
-using TIAM.Entities.ServiceProviders;
-using TIAM.Entities.Transfers;
-
-
-namespace TIAM.Database.DbSets.ServiceProvider;
-
-public static class ServiceProviderDbSetExtensions
-{
-    #region Add, Update, Remove
-
-    public static bool AddServiceProvider(this IServiceProviderDbSet ctx, Company company)
-        => ctx.ServiceProviders.Add(company).State == EntityState.Added;
-
-    public static bool RemoveServiceProvider(this IServiceProviderDbSet ctx, Company company)
-        => ctx.ServiceProviders.Remove(company).State == EntityState.Deleted;
-
-    public static bool RemoveServiceProvider(this IServiceProviderDbSet ctx, Guid companyId)
-    {
-        var company = ctx.GetServiceProviderById(companyId);
-        return company == null || ctx.RemoveServiceProvider(company);
-    }
-
-    #endregion Add, Update, Remove
-
-    public static Company? GetServiceProviderById(this IServiceProviderDbSet ctx, Guid companyId)
-        => ctx.ServiceProviders.FirstOrDefault(x => x.Id == companyId);
-
-    public static IQueryable<Company> GetServiceProviders(this IServiceProviderDbSet ctx)
-        => ctx.ServiceProviders;
-
-    public static List<Company> GetServiceProvidersByOwnerId(this IServiceProviderDbSet ctx, Guid ownerId)
-        => ctx.ServiceProviders.Where(x => x.OwnerId == ownerId).ToList();
-
-
-
-}

TIAM.Database/TIAM.Database.csproj

@@ -18,6 +18,7 @@
     <Folder Include="DataLayers\Permissions\" />
     <Folder Include="DataLayers\Products\" />
     <Folder Include="DbSets\Addresses\" />
+    <Folder Include="DbSets\ServiceProvider\" />
     <Folder Include="Extensions\" />
     <Folder Include="ModelBuilders\Emails\" />
     <Folder Include="ModelBuilders\Profiles\" />

TIAM.Services/SignalRTags.cs

@@ -15,6 +15,4 @@ public class SignalRTags : AcSignalRTags
     public const int AddTransferAsync = 8;
     public const int DeleteTransferAsync = 9;
     public const int GetCompaniesAsync = 10;
-    public const int UpdateCompanyAsync = 11;
-    public const int CreateCompanyAsync = 12;
 }

TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor

@@ -198,7 +198,7 @@
         SetOwnerPopupVisible = true;
     }
 
-    async Task<Company> SetOwner(Guid CompanyId)
+    async Task<bool> SetOwner(Guid CompanyId)
     {
         //get user id from DB
         var userModelDto = await userDataService.GetUserByEmailAsync(UpdateOwnerIdText);
@@ -207,13 +207,13 @@
         var target = await serviceProviderDataService.GetServiceProviderByIdAsync(CompanyId);
         if (target == null)
         {            
-            return null;
+            return false;
         }
         else
         {
             target.OwnerId = userModelDto.Id;
             var result = await serviceProviderDataService.UpdateServiceProviderAsync(target);            
-            return result;
+                return result;
             
         }
 
@@ -277,34 +277,45 @@
         }
         else
         {
-            var companyEditModel = (Company)e.EditModel; //TODO not valid cast
+            var transferEditModel = (Company)e.EditModel; //TODO not valid cast
-            companyEditModel.Id = Guid.NewGuid();
+            transferEditModel.Id = Guid.NewGuid();
-            companyEditModel.AffiliateId = Guid.NewGuid();
+            transferEditModel.AffiliateId = Guid.NewGuid();
-            companyEditModel.Name = "Company name";
+            transferEditModel.Name = "Company name";
-            companyEditModel.OwnerId = Guid.Empty;
+            transferEditModel.OwnerId = Guid.Empty;
-            companyEditModel.ProfileId = Guid.NewGuid();
+            transferEditModel.ProfileId = Guid.NewGuid();
         }
 
     }
 
     async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e)
     {
-        Company resultCompany = null;
+        bool success = false;
         if (e.IsNew)
         {
             //add new orderData to orderData array
             _logger.Info("New orderData added");
-            resultCompany = await serviceProviderDataService.CreateServiceProviderAsync((Company)e.EditModel);
+            //await transferDataService.CreateTransfer((TransferWizardModel)e.EditModel);
         }
         else
         {
             _logger.Info("orderData updated at id " + ((Company)e.EditModel).Id);
 
-            resultCompany = await serviceProviderDataService.UpdateServiceProviderAsync((Company)e.EditModel);
+            success = await serviceProviderDataService.UpdateServiceProviderAsync((Company)e.EditModel);
 
         }
+        //get transfer from TransferData by Id
 
-        if (resultCompany!=null)
+        // foreach (var transferToModify in (List<Transfer>)TransferData)
+        // {
+        //     myModel = (Transfer)e.EditModel;
+
+        //     if (transferToModify.Id == myModel.Id)
+        //     {
+        //         //transferToModify.Driver = myModel.Driver;
+        //     }
+        // }
+
+        if (success)
         {
             //TODO: ne a teljes grid-et refresh-eljük, elég lenne csak az adott sort! - J.
             await UpdateDataAsync();

TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs

@@ -10,10 +10,6 @@ using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Users;
 using TIAMWebApp.Shared.Application.Models;
 using Product = TIAM.Entities.Products.Product;
-using TIAM.Entities.Transfers;
-using System.Text.Json.Nodes;
-using System.Text.Json;
-using Newtonsoft.Json.Linq;
 
 namespace TIAMWebApp.Server.Controllers
 {
@@ -33,43 +29,36 @@ namespace TIAMWebApp.Server.Controllers
         }
 
         //15.
-        [AllowAnonymous]
         [HttpPost]
         [Route(APIUrls.CreateServiceProviderRouteName)]
         [Tags("In-Progress", "ServiceProvider")]
-        [EndpointSummary("Create service provider")]
+        [EndpointSummary("Create assigned user")]
         public async Task<IActionResult> CreateServiceProvider([FromBody] ServiceProviderModel serializedServiceProviderModel)
         {
             GlobalLogger.Info(@"CreateUser called");
-            //if (serializedServiceProviderModel.GetArrayLength() == 0)
             if (serializedServiceProviderModel == null)
             {
                 return BadRequest("SerializedLoginModel is required");
             }
             else
             {
-                
+                //ServiceProviderModel? serviceProvider = JObject.Parse(serializedServiceProviderModel.GetRawText()).ToObject<ServiceProviderModel>();
-                //Company? serviceProvider = JObject.Parse(serializedServiceProviderModel.GetRawText()).ToObject<Company>();                
                 var serviceProvider = serializedServiceProviderModel;
+
+
                 if (serviceProvider != null)
                 {
-                    
+                    //add userModel to users array
+                    //Array.Resize(ref users, users.Length + 1);
+                    //users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password);
 
                     var id = Guid.NewGuid();
-                    var name = serviceProvider.Name;
+                    var name = serializedServiceProviderModel.Name;
-                    var commissionRate = serviceProvider.CommissionPercent;
+                    var ownerId = serializedServiceProviderModel.OwnerId;
-                    Guid ownerId;
-                    if(serviceProvider.OwnerId == Guid.Empty)
-                    {
-                        //no owner set yet
-                        ownerId = serviceProvider.OwnerId;
-                    }                    
-                    else
-                    {
-                        ownerId = serviceProvider.OwnerId;
-                    }
 
-                    if (name is null)
+
+
+                    if (name is null || ownerId == Guid.Empty)
                     {
                         return BadRequest("Invalid request");
                     }
@@ -77,27 +66,12 @@ namespace TIAMWebApp.Server.Controllers
                     {
 
                         GlobalLogger.Info($@"ServiceProvider to be created: {id}, {name}, {ownerId}");
-                        Company toCreate = new Company(id, name, ownerId, Guid.NewGuid());
-                        toCreate.CommissionPercent = commissionRate;
-                        var result = await _adminDal.CreateServiceProviderAsync(toCreate);
-                        if (!result)
-                        {
-                            serviceProvider = null;
-                            return BadRequest(result);
-                        }
-                        else
-                        {
 
-                            return Ok(toCreate);
+                        await _adminDal.CreateServiceProviderAsync(new Company(id, name, ownerId, Guid.NewGuid()));
-                        }
                     }
                 }
 
-                else {
+                return Ok("yes");
-
-                    return BadRequest();
-                        
-                }
             }
         }
 
@@ -121,24 +95,6 @@ namespace TIAMWebApp.Server.Controllers
             return await _adminDal.GetServiceProviderByIdAsync(id);
         }
 
-        [AllowAnonymous]
-        [HttpPost]
-        [Route(APIUrls.UpdateServiceProviderRouteName)]
-        public async Task<Company> UpdateServiceProvider(Company companyToModify)
-        {
-            GlobalLogger.Info($"UpdateServiceProvider called! + {companyToModify.Id}");
-            var result = await _adminDal.UpdateServiceProviderAsync(companyToModify);
-            if(result)
-            {
-                return companyToModify;
-
-            }
-            else
-            {
-                return null;
-            }
-        }
-
         //17.
         [Authorize]
         [HttpPost]

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -293,7 +293,6 @@ namespace TIAMWebApp.Server.Controllers
 
         }
 
-
         [AllowAnonymous]
         [HttpPost]
         [Route(APIUrls.CreateTransfersRouteName)]

TIAMWebApp/Server/Services/DevAdminSignalRhub.cs

@@ -84,14 +84,6 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController
                     await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, await serviceProviderAPIController.GetServiceProviders()), requestId);
                     return;
 
-                case SignalRTags.CreateCompanyAsync:
-
-                    //var company = message!.MessagePackTo<SignalPostJsonDataMessage<Company>>().PostData;
-
-                    //await serviceProviderAPIController.CreateServiceProvider(company);
-                    //await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, company.ToJson()), requestId);
-                    return;
-
                 default:
                     _logger.Error($"Server OnReceiveMessage; messageTag not found! messageTag: {messageTag}");
                     break;

TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs

@@ -21,10 +21,10 @@ namespace TIAMWebApp.Shared.Application.Interfaces
         public Task DeleteServiceProviderAsync(Guid serviceProviderId);
 
         //14 Update service provider
-        public Task<Company> UpdateServiceProviderAsync(Company serviceProvider);
+        public Task<bool> UpdateServiceProviderAsync(Company serviceProvider);
 
         //15. Create service provider
-        public Task<Company> CreateServiceProviderAsync(Company serviceProvider);
+        public Task<bool> CreateServiceProviderAsync(Company serviceProvider);
 
         //16. (IServiceProviderDataService) get all service providers
         public Task<List<Company>> GetServiceProvidersAsync();

TIAMWebApp/Shared/Models/APIUrls.cs

@@ -102,7 +102,7 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName;
 
         //serviceprovider
-        public const string CreateServiceProviderRouteName = "CreateServiceProvider/";
+        public const string CreateServiceProviderRouteName = "CreateServiceProvider";
         public const string CreateServiceProvider = ServiceProviderAPI+CreateServiceProviderRouteName;
 
         public const string GetServiceProviderByIdRouteName = "GetServiceProviderById";
@@ -111,11 +111,6 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string GetServiceProvidersByOwnerIdRouteName = "GetServiceProvidersByOwnerId";
         public const string GetServiceProvidersByOwnerId = ServiceProviderAPI+GetServiceProvidersByOwnerIdRouteName;
 
-        public const string UpdateServiceProviderRouteName = "UpdateServiceProvider";
-        public const string UpdateServiceProviderUrl = ServiceProviderAPI + UpdateServiceProviderRouteName;
-
-
-
         public const string GetQrCodeByProductIdRouteName = "GetQRCodeByProductId";
         public const string GetQrCodeByProductId = ServiceProviderAPI+GetQrCodeByProductIdRouteName;
 

TIAMWebApp/Shared/Models/ServiceProviderModel.cs

@@ -11,14 +11,12 @@ namespace TIAMWebApp.Shared.Application.Models
         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 ServiceProviderModel(Guid id, string name, Guid ownerId)
         {
             Id = id;
             Name = name;
             OwnerId = ownerId;
-            CommissionPercent = commissionPercent;
         }
     }
 }

TIAMWebApp/Shared/Services/ServiceProviderDataService.cs

@@ -18,8 +18,6 @@ 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
 {
@@ -53,28 +51,9 @@ namespace TIAMWebApp.Shared.Application.Services
         }
 
         //15.
-        public async Task<Company> CreateServiceProviderAsync(Company serviceProvider)
+        public Task<bool> CreateServiceProviderAsync(Company serviceProvider)
         {
-            var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateServiceProvider}";
+            throw new NotImplementedException();
-            var response = await http.PostAsJsonAsync(url, serviceProvider);
-            if (response != null)
-            {
-                var resultCompany = await response.Content.ReadFromJsonAsync(typeof(Company));
-                if(resultCompany != null)
-                {
-
-                    return (resultCompany as Company)!;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                return null;
-            }
-            
         }
 
         //21.
@@ -165,10 +144,9 @@ namespace TIAMWebApp.Shared.Application.Services
         }
 
         //14. 
-        public async Task<Company> UpdateServiceProviderAsync(Company company)
+        public Task<bool> UpdateServiceProviderAsync(Company serviceProvider)
         {
-            var result = await _devAdminSignalClient.PostDataAsync(SignalRTags.UpdateCompanyAsync, company);
+            throw new NotImplementedException();
-            return result;
         }
 
         public async Task<string> GetQRCodeByProductIdAsync(Guid productId)