Merge pull request #329 from UKGovernmentBEIS/develop

Merge dev to staging
UKGovernmentBEIS · Dec 17, 2024 · 24d46f3 · 24d46f3
2 parents 9c113fe + 4bea87e
commit 24d46f3
Show file tree

Hide file tree

Showing 56 changed files with 7,724 additions and 527 deletions.
diff --git a/DVSRegister.BusinessLogic/Services/Consent/ConsentService.cs b/DVSRegister.BusinessLogic/Services/Consent/ConsentService.cs
@@ -43,9 +43,13 @@ public async Task<bool> RemoveProceedApplicationConsentToken(string token, strin
                 return null ;
             }
         }
-        public async Task<GenericResponse> UpdateServiceStatus(int serviceId, string providerEmail)
+        public async Task<GenericResponse> UpdateServiceStatus(int serviceId, string providerEmail, string companyName, string serviceName)
         {
             GenericResponse genericResponse = await consentRepository.UpdateServiceStatus(serviceId, ServiceStatusEnum.Received, providerEmail);
+            if(genericResponse.Success) 
+            {
+                await emailSender.SendAgreementToProceedApplicationToDSIT(companyName, serviceName);
+            }
             return genericResponse;
         }
 

diff --git a/DVSRegister.BusinessLogic/Services/Consent/IConsentService.cs b/DVSRegister.BusinessLogic/Services/Consent/IConsentService.cs
@@ -8,7 +8,7 @@ public interface IConsentService
         //opening loop
         public Task<bool> RemoveConsentToken(string token, string tokenId, string loggedInUserEmail);
         public Task<ServiceDto?> GetProviderAndCertificateDetailsByToken(string token, string tokenId);
-        public Task<GenericResponse> UpdateServiceStatus(int serviceId, string providerEmail);
+        public Task<GenericResponse> UpdateServiceStatus(int serviceId, string providerEmail, string companyName, string serviceName);
 
 
         //closing loop

diff --git a/DVSRegister.CommonUtility/Email/GovUkNotifyApi.cs b/DVSRegister.CommonUtility/Email/GovUkNotifyApi.cs
@@ -174,6 +174,27 @@ public async Task<bool> SendCertificateInfoSubmittedToDSIT()
             return await SendEmail(emailModel);
         }
 
+
+        #region openong the loop
+        public async Task<bool> SendAgreementToProceedApplicationToDSIT(string companyName, string serviceName)
+        {
+            var template = govUkNotifyConfig.AgreementToProceedApplicationToDSIT;
+
+            var personalisation = new Dictionary<string, dynamic>
+            {
+                { template.CompanyName,  companyName},
+                { template.ServiceName,  serviceName}
+             };
+            var emailModel = new GovUkNotifyEmailModel
+            {
+                EmailAddress = govUkNotifyConfig.OfDiaEmailId,
+                TemplateId = template.Id,
+                Personalisation = personalisation
+            };
+            return await SendEmail(emailModel);
+        }
+        #endregion
+
         #region closing the loop
         public async Task<bool> SendAgreementToPublishToDIP(string companyName, string serviceName, string recipientName, string emailAddress)
         {

diff --git a/DVSRegister.CommonUtility/Email/IEmailSender.cs b/DVSRegister.CommonUtility/Email/IEmailSender.cs
@@ -12,6 +12,9 @@ public interface IEmailSender
         public Task<bool> SendEmailCabInformationSubmitted(string emailAddress, string recipientName);
         public Task<bool> SendCertificateInfoSubmittedToDSIT();
 
+        //opening the loop
+        public Task<bool> SendAgreementToProceedApplicationToDSIT(string companyName, string serviceName);
+
         //closing the loop
         public Task<bool> SendAgreementToPublishToDSIT(string companyName, string serviceName);
         public Task<bool> SendAgreementToPublishToDIP(string companyName, string serviceName, string recipientName, string emailAddress);

diff --git a/DVSRegister.CommonUtility/Models/Email/AgreementToProceedApplicationToDSIT.cs b/DVSRegister.CommonUtility/Models/Email/AgreementToProceedApplicationToDSIT.cs
@@ -0,0 +1,9 @@
+namespace DVSRegister.CommonUtility.Models
+{
+    public class AgreementToProceedApplicationToDSIT
+    {
+        public string Id { get; set; }
+        public string CompanyName { get; set; }
+        public string ServiceName { get; set; }
+    }
+}
diff --git a/DVSRegister.CommonUtility/Models/Email/GovUkNotifyConfiguration.cs b/DVSRegister.CommonUtility/Models/Email/GovUkNotifyConfiguration.cs
@@ -20,5 +20,6 @@ public class GovUkNotifyConfiguration
 
         public AgreementToPublishTemplate AgreementToPublishTemplate { get; set; }
         public AgreementToPublishToDSITTemplate AgreementToPublishToDSITTemplate { get; set; }
+        public AgreementToProceedApplicationToDSIT AgreementToProceedApplicationToDSIT { get; set; }
     }
 }
diff --git a/DVSRegister.Data/CAB/CabRepository.cs b/DVSRegister.Data/CAB/CabRepository.cs
@@ -76,13 +76,12 @@ public async Task<List<ProviderProfile>> GetProviders(int cabId, string searchTe
             .OrderBy(p => p.ModifiedTime != null ? p.ModifiedTime : p.CreatedTime);
             if (!string.IsNullOrEmpty(searchText))
             {
-                searchText = searchText.Trim().ToLower();              
-                providerQuery = providerQuery.Where(p => p.SearchVector.Matches(searchText) ||
-                                                         p.Services.Any(s => s.SearchVector.Matches(searchText)));
-            }           
+                searchText = searchText.Trim().ToLower();
+                providerQuery = providerQuery.Where(p => p.Services.Any(s => EF.Functions.TrigramsSimilarity(s.ServiceName.ToLower(), searchText.ToLower()) > .1));
+            }
             var searchResults = await providerQuery.ToListAsync();
             return searchResults;
-        }
+        }        
 
         public async Task<ProviderProfile> GetProvider(int providerId,int cabId)
         {

diff --git a/DVSRegister.Data/DVSRegisterDbContext.cs b/DVSRegister.Data/DVSRegisterDbContext.cs
@@ -124,15 +124,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<TrustmarkNumber>()
             .ToTable(b => b.HasCheckConstraint("CK_ServiceNumber", "\"ServiceNumber\" BETWEEN 1 AND 99"));  
 
-            modelBuilder.Entity<ProviderProfile>()
-            .HasGeneratedTsVectorColumn(p => p.SearchVector, "english", p => new { p.RegisteredName, p.TradingName })
-            .HasIndex(p => p.SearchVector)
-            .HasMethod("GIN");
-
-            modelBuilder.Entity<Service>()
-           .HasGeneratedTsVectorColumn(p => p.SearchVector, "english", p => new { p.ServiceName })
-           .HasIndex(p => p.SearchVector)
-           .HasMethod("GIN");
 
             modelBuilder.Entity<QualityLevel>().HasData(
             new QualityLevel { Id =1, Level = "Low", QualityType = QualityTypeEnum.Authentication },

diff --git a/DVSRegister.Data/Entities/CertificateReview.cs b/DVSRegister.Data/Entities/CertificateReview.cs
@@ -19,21 +19,21 @@ public CertificateReview() { }
         public int ProviProviderProfileId { get; set; }
         public ProviderProfile ProviderProfile { get; set; }
 
-        public bool IsCabLogoCorrect { get; set; }
-        public bool IsCabDetailsCorrect { get; set; }
-        public bool IsProviderDetailsCorrect { get; set; }
-        public bool IsServiceNameCorrect { get; set; }
-        public bool IsRolesCertifiedCorrect { get; set; }
-        public bool IsCertificationScopeCorrect { get; set; }
-        public bool IsServiceSummaryCorrect { get; set; }
-        public bool IsURLLinkToServiceCorrect { get; set; }
-        public bool IsGPG44Correct { get; set; }
-        public bool IsGPG45Correct { get; set; }
-        public bool IsServiceProvisionCorrect { get; set; }
-        public bool IsLocationCorrect { get; set; }
-        public bool IsDateOfIssueCorrect { get; set; }
-        public bool IsDateOfExpiryCorrect { get; set; }
-        public bool IsAuthenticyVerifiedCorrect { get; set; }
+        public bool? IsCabLogoCorrect { get; set; }
+        public bool? IsCabDetailsCorrect { get; set; }
+        public bool? IsProviderDetailsCorrect { get; set; }
+        public bool? IsServiceNameCorrect { get; set; }
+        public bool? IsRolesCertifiedCorrect { get; set; }
+        public bool? IsCertificationScopeCorrect { get; set; }
+        public bool? IsServiceSummaryCorrect { get; set; }
+        public bool? IsURLLinkToServiceCorrect { get; set; }
+        public bool? IsGPG44Correct { get; set; }
+        public bool? IsGPG45Correct { get; set; }
+        public bool? IsServiceProvisionCorrect { get; set; }
+        public bool? IsLocationCorrect { get; set; }
+        public bool? IsDateOfIssueCorrect { get; set; }
+        public bool? IsDateOfExpiryCorrect { get; set; }
+        public bool? IsAuthenticyVerifiedCorrect { get; set; }
         public string? Comments { get; set; }
         public bool? InformationMatched { get; set; }
         public string CommentsForIncorrect { get; set; }

diff --git a/DVSRegister.Data/Entities/ProviderProfile.cs b/DVSRegister.Data/Entities/ProviderProfile.cs
@@ -34,8 +34,7 @@ public class ProviderProfile
         public int CabUserId { get; set; }
         public CabUser CabUser { get; set; }
         public ProviderStatusEnum ProviderStatus { get; set; }       
-        public ICollection<Service>? Services { get; set; }
-        public NpgsqlTsVector SearchVector { get; set; }
+        public ICollection<Service>? Services { get; set; }    
         public DateTime? CreatedTime { get; set; }
         public DateTime? ModifiedTime { get; set; }
         public DateTime? PublishedTime { get; set; }

diff --git a/DVSRegister.Data/Entities/PublicInterestCheck.cs b/DVSRegister.Data/Entities/PublicInterestCheck.cs
@@ -18,16 +18,16 @@ public PublicInterestCheck() { }
         [ForeignKey("ProviderProfile")]
         public int ProviderProfileId { get; set; }
         public ProviderProfile Provider { get; set; }       
-        public bool IsCompanyHouseNumberApproved { get; set; }      
-        public bool IsDirectorshipsApproved { get; set; }
-        public bool IsDirectorshipsAndRelationApproved { get; set; }
-        public bool IsTradingAddressApproved { get; set; }
-        public bool IsSanctionListApproved { get; set; }
-        public bool IsUNFCApproved { get; set; }
-        public bool IsECCheckApproved { get; set; }
-        public bool IsTARICApproved { get; set; }
-        public bool IsBannedPoliticalApproved { get; set; }
-        public bool IsProvidersWebpageApproved { get; set; }
+        public bool? IsCompanyHouseNumberApproved { get; set; }      
+        public bool? IsDirectorshipsApproved { get; set; }
+        public bool? IsDirectorshipsAndRelationApproved { get; set; }
+        public bool? IsTradingAddressApproved { get; set; }
+        public bool? IsSanctionListApproved { get; set; }
+        public bool? IsUNFCApproved { get; set; }
+        public bool? IsECCheckApproved { get; set; }
+        public bool? IsTARICApproved { get; set; }
+        public bool? IsBannedPoliticalApproved { get; set; }
+        public bool? IsProvidersWebpageApproved { get; set; }
         public PublicInterestCheckEnum PublicInterestCheckStatus { get; set; }
         public RejectionReasonEnum? RejectionReason { get; set; }
         public string? RejectionReasons { get; set; }

diff --git a/DVSRegister.Data/Entities/Service.cs b/DVSRegister.Data/Entities/Service.cs
@@ -40,8 +40,7 @@ public Service() { }
         public CabUser CabUser { get; set; }
         public int ServiceNumber { get;set; }
 
-        public ServiceStatusEnum ServiceStatus { get; set; }
-        public NpgsqlTsVector SearchVector { get; set; }
+        public ServiceStatusEnum ServiceStatus { get; set; }      
         public DateTime? CreatedTime { get; set; }
         public DateTime? ModifiedTime { get; set; }
         public DateTime? PublishedTime { get; set; }