fix(cab-service): fixes in provider profile edit

UKGovernmentBEIS · Oct 11, 2024 · 50a46b6 · 50a46b6
1 parent 9c96444
commit 50a46b6
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/DVSRegister.BusinessLogic/Services/CAB/CabService.cs b/DVSRegister.BusinessLogic/Services/CAB/CabService.cs
@@ -63,9 +63,17 @@ public async Task<GenericResponse> SaveService(ServiceDto serviceDto)
             return genericResponse;
         }
 
-        public async Task<bool> CheckProviderRegisteredNameExists(string registeredName)
+        public async Task<bool> CheckProviderRegisteredNameExists(string registeredName, int providerId=0)
         {
-            return await cabRepository.CheckProviderRegisteredNameExists(registeredName);
+            if(providerId >0) 
+            {
+                return await cabRepository.CheckProviderRegisteredNameExists(registeredName,providerId);
+            }
+            else
+            {
+                return await cabRepository.CheckProviderRegisteredNameExists(registeredName);
+            }
+
         }
 
         public async Task<List<ProviderProfileDto>> GetProviders(int cabId, string searchText = "")

diff --git a/DVSRegister.BusinessLogic/Services/CAB/ICabService.cs b/DVSRegister.BusinessLogic/Services/CAB/ICabService.cs
@@ -7,8 +7,8 @@ public interface ICabService
     {
         public Task<List<RoleDto>> GetRoles();
         public Task<List<IdentityProfileDto>> GetIdentityProfiles();
-        public Task<List<SupplementarySchemeDto>> GetSupplementarySchemes();    
-        public Task<bool> CheckProviderRegisteredNameExists(string registeredName);
+        public Task<List<SupplementarySchemeDto>> GetSupplementarySchemes();
+        public Task<bool> CheckProviderRegisteredNameExists(string registeredName, int providerId = 0);
         public Task<GenericResponse> SaveProviderProfile(ProviderProfileDto providerProfile);
         public Task<GenericResponse> UpdateProviderProfile(ProviderProfileDto providerProfileDto);
         public Task<GenericResponse> SaveService(ServiceDto serviceDto);

diff --git a/DVSRegister.Data/CAB/CabRepository.cs b/DVSRegister.Data/CAB/CabRepository.cs
@@ -75,6 +75,20 @@ public async Task<bool> CheckProviderRegisteredNameExists(string registeredName)
             }
         }
 
+        public async Task<bool> CheckProviderRegisteredNameExists(string registeredName, int providerId)
+        {
+            var existingProvider = await context.ProviderProfile.FirstOrDefaultAsync(p => p.RegisteredName.ToLower() == registeredName.ToLower() && p.Id != providerId);
+
+            if (existingProvider !=null)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         public async Task<GenericResponse> UpdateProviderProfile(ProviderProfile providerProfile)
         {
             GenericResponse genericResponse = new();

diff --git a/DVSRegister.Data/CAB/ICabRepository.cs b/DVSRegister.Data/CAB/ICabRepository.cs
@@ -11,6 +11,7 @@ public interface ICabRepository
         public Task<GenericResponse> SaveProviderProfile(ProviderProfile providerProfile);
         public Task<GenericResponse> UpdateProviderProfile(ProviderProfile providerProfile);
         public Task<bool> CheckProviderRegisteredNameExists(string registeredName);
+        public Task<bool> CheckProviderRegisteredNameExists(string registeredName, int providerId);
         public Task<GenericResponse> SaveService(Service service);
         public Task<List<ProviderProfile>> GetProviders(int cabId,string searchText = "");
         public Task<ProviderProfile> GetProvider(int providerId, int cabId);

diff --git a/DVSRegister/Controllers/CabController.cs b/DVSRegister/Controllers/CabController.cs
@@ -106,7 +106,7 @@ public async Task<IActionResult> ProviderProfileDetails(int providerId)
                 {
                     Provider = providerProfileDto,
                     IsEditable = providerProfileDto.Services == null ||providerProfileDto.Services.Count==0 ||
-                providerProfileDto.Services.All(service => service.ServiceStatus == ServiceStatusEnum.Submitted)
+                     providerProfileDto.Services.All(service => service.ServiceStatus == ServiceStatusEnum.Submitted && service.CertificateReview == null)
                 };
 
                 return View(providerDetailsViewModel);

diff --git a/DVSRegister/Controllers/CabProviderController.cs b/DVSRegister/Controllers/CabProviderController.cs
@@ -526,6 +526,14 @@ public IActionResult EditCompanyInformation()
         public async Task<IActionResult> UpdateCompanyInformation(CompanyViewModel companyViewModel)
         {
             ProviderProfileDto providerProfileDto = HttpContext?.Session.Get<ProviderProfileDto>("ProviderProfile")??new();
+            if (!string.IsNullOrEmpty(companyViewModel.RegisteredName))
+            {
+                bool registeredNameExist = await cabService.CheckProviderRegisteredNameExists(companyViewModel.RegisteredName,companyViewModel.ProviderId);
+                if (registeredNameExist)
+                {
+                    ModelState.AddModelError("RegisteredName", Constants.RegisteredNameExistsError);
+                }
+            }
             if (ModelState.IsValid)
             {
                 providerProfileDto.RegisteredName = companyViewModel.RegisteredName;