Merge pull request #3278 from TechnologyEnhancedLearning/Develop/Fix/TD-5443-Bulk-upload-Duplicate-flags

TD-5443-Bulk upload - Duplicate flags - existing flag comparison modified.

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs

@@ -583,9 +583,9 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
             if (ModelState.IsValid)
             {
                 var flags = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, null)
-                    .Where(fn => fn.FlagName.ToLower() == model.FlagName.ToLower()).ToList();
+                    .Where(fn => fn.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower()).ToList();
 
-                bool nameExists = flags.Any(x => x.FlagName.ToLower() == model.FlagName.ToLower());
+                bool nameExists = flags.Any(x => x.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower());
                 bool idExists = flags.Any(x => x.FlagId == flagId);
 
                 if (actionname == "Edit")
@@ -596,7 +596,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
                         return View("Developer/EditCustomFlag", model);
                     }
                     else
-                        frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass);
+                        frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
                 }
                 else
                 {
@@ -606,7 +606,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
                         return View("Developer/EditCustomFlag", model);
                     }
                     else
-                        frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass);
+                        frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
                 }
 
                 return RedirectToAction("EditFrameworkFlags", "Frameworks", new { frameworkId });

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -262,7 +262,7 @@ CompetencyTableRow competencyRow
                     {
                         foreach (var frameworkFlag in frameworkFlags)
                         {
-                            if (frameworkFlag.FlagName == flag)
+                            if (frameworkFlag.FlagName?.Trim().ToLower() == flag?.Trim().ToLower())
                             {
                                 flagId = frameworkFlag.FlagId;
                                 break;
@@ -271,7 +271,7 @@ CompetencyTableRow competencyRow
                     }
                     if (flagId == 0)
                     {
-                        flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white");
+                        flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag?.Trim(), "Flag", "nhsuk-tag--white");
                     }
                     flagIds.Add(flagId);
                 }