Added query for CentreApplications table insert

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CentresDataService.cs

@@ -1,12 +1,14 @@
 namespace DigitalLearningSolutions.Data.DataServices
 {
     using Dapper;
+    using DigitalLearningSolutions.Data.Extensions;
     using DigitalLearningSolutions.Data.Models.Centres;
     using DigitalLearningSolutions.Data.Models.DbModels;
     using Microsoft.Extensions.Logging;
     using System;
     using System.Collections.Generic;
     using System.Data;
+    using System.Transactions;
 
     public interface ICentresDataService
     {
@@ -73,7 +75,8 @@ public int AddCentreForSuperAdmin(
             int? regionId,
             string? registrationEmail,
             string? ipPrefix,
-            bool showOnMap
+            bool showOnMap,
+            bool AddITSPcourses
         );
 
         public void UpdateCentreDetailsForSuperAdmin(
@@ -471,10 +474,15 @@ public int AddCentreForSuperAdmin(
             int? regionId,
             string? registrationEmail,
             string? ipPrefix,
-            bool showOnMap
+            bool showOnMap,
+            bool AddITSPcourses
         )
         {
-            return connection.QuerySingle<int>(
+            int newCentreId;
+            connection.EnsureOpen();
+            using var transaction = connection.BeginTransaction();
+            {
+                newCentreId = connection.QuerySingle<int>(
                 @"Insert INTO Centres 
                     (CentreName,
                     ContactForename,
@@ -513,8 +521,25 @@ OUTPUT Inserted.CentreID
                     registrationEmail,
                     ipPrefix,
                     showOnMap
-                }
+                },
+                transaction
             );
+                if (AddITSPcourses)
+                {
+                    connection.Execute(
+                        @"INSERT INTO [CentreApplications] ([CentreID], [ApplicationID])
+                  SELECT @newCentreId, ApplicationID
+                  FROM  Applications
+                  WHERE (Debug = 0) AND (ArchivedDate IS NULL) AND (ASPMenu = 1) AND (CoreContent = 1) AND (BrandID = 1) AND (LaunchedAssess = 1)",
+                        new { newCentreId },
+                        transaction
+                    );
+                }
+
+                transaction.Commit();
+                return newCentreId;
+            }
+            
         }
 
         public (string firstName, string lastName, string email) GetCentreManagerDetails(int centreId)

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -382,40 +382,25 @@ public IActionResult EditCentreRoleLimits(CentreRoleLimitsViewModel model)
         public IActionResult AddCentre()
         {
             var regions = regionDataService.GetRegionsAlphabetical().ToList();
-
             var centreTypes = this.centresDataService.GetCentreTypes().ToList();
 
-
-            ViewBag.Regions = SelectListHelper.MapOptionsToSelectListItems(regions);
-            ViewBag.CentreTypes = SelectListHelper.MapOptionsToSelectListItems(centreTypes);
-
             var addCentreSuperAdminViewModel = new AddCentreSuperAdminViewModel();
             addCentreSuperAdminViewModel.IpPrefix = "194.176.105";
 
             addCentreSuperAdminViewModel.RegionNameOptions = SelectListHelper.MapOptionsToSelectListItems(regions);
             addCentreSuperAdminViewModel.CentreTypeOptions = SelectListHelper.MapOptionsToSelectListItems(centreTypes);
 
-
             return View(addCentreSuperAdminViewModel);
         }
 
         [HttpPost]
         [Route("SuperAdmin/Centres/AddCentre")]
         public IActionResult AddCentre(AddCentreSuperAdminViewModel model)
         {
-            var centreTypes = this.centresDataService.GetCentreTypes().ToList();
-            var regions = regionDataService.GetRegionsAlphabetical().ToList();
-
             if (!ModelState.IsValid)
             {
-                //ViewBag.Regions = SelectListHelper.MapOptionsToSelectListItems(
-                //    regions);                
-                //ViewBag.CentreTypes = SelectListHelper.MapOptionsToSelectListItems(
-                //    centreTypes);
-                ViewBag.Regions = SelectListHelper.MapOptionsToSelectListItems(
-                    regions);
-                ViewBag.CentreTypes = SelectListHelper.MapOptionsToSelectListItems(
-                    centreTypes);
+                var centreTypes = this.centresDataService.GetCentreTypes().ToList();
+                var regions = regionDataService.GetRegionsAlphabetical().ToList();
                 model.RegionNameOptions = SelectListHelper.MapOptionsToSelectListItems(regions);
                 model.CentreTypeOptions = SelectListHelper.MapOptionsToSelectListItems(centreTypes);
                 return View(model);
@@ -431,8 +416,10 @@ public IActionResult AddCentre(AddCentreSuperAdminViewModel model)
                 model.RegionId,
                 model.RegistrationEmail,
                 model.IpPrefix,
-                model.ShowOnMap
+                model.ShowOnMap,
+                model.AddITSPcourses
             );
+
             return RedirectToAction("ManageCentre", "Centres", new { centreId = insertedID });
         }
     }

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Centres/AddCentreSuperAdminViewModel.cs

@@ -55,7 +55,12 @@ public AddCentreSuperAdminViewModel(Centre centre)
         public string? ContactLastName { get; set; }
         public string? ContactEmail { get; set; }
         public string? ContactPhone { get; set; }
+
+        [MaxLength(250, ErrorMessage = "Email must be 250 characters or fewer")]
+        [EmailAddress(ErrorMessage = "Enter an email in the correct format, like [email protected]")]
+        [NoWhitespace(ErrorMessage = "Email must not contain any whitespace characters")]
         public string? RegistrationEmail { get; set; }
+
         public bool AddITSPcourses { get; set; }
 
         public IEnumerable<SelectListItem> CentreTypeOptions { get; set; } = new List<SelectListItem>();

DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/AddCentre.cshtml

@@ -7,12 +7,10 @@
 }
 @if (errorHasOccurred)
 {
-    <vc:error-summary order-of-property-names="@(new [] { nameof(Model.CentreName), nameof(Model.CentreTypeId), nameof(Model.RegionId) })" />
+    <vc:error-summary order-of-property-names="@(new [] { nameof(Model.CentreName), nameof(Model.ContactEmail), nameof(Model.CentreTypeId), nameof(Model.RegionId), nameof(Model.RegistrationEmail) })" />
 }
 <div id="form-group">
     <form method="post" asp-action="AddCentre">
-        @*        @Html.HiddenFor(x=>x.CentreType)
-        @Html.HiddenFor(x=>x.RegionName)*@
         <div>
             <h1 id="form-heading" class="nhsuk-fieldset__heading nhsuk-label--l">
                 Add new centre
@@ -99,7 +97,6 @@
                                             css-class="nhsuk-u-width-full"
                                             default-option="Select a centre type"
                                             select-list-options="Model.CentreTypeOptions" />
-                            @*select-list-options="@ViewBag.CentreTypes" />*@
                         </div>
                     </div>
 
@@ -113,8 +110,6 @@
                                             css-class="nhsuk-u-width-full"
                                             default-option="Select a region"
                                             select-list-options="Model.RegionNameOptions" />
-                            @*select-list-options="@ViewBag.Regions" />*@
-
                         </div>
                     </div>