TD-4889 Resolving internal server error when nominating delegate to supervisor

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/RegistrationDataService.cs

@@ -197,7 +197,56 @@ public int RegisterAdmin(
                 isSupervisor = registrationModel.IsSupervisor,
                 isNominatedSupervisor = registrationModel.IsNominatedSupervisor,
             };
+            if (registrationModel.CategoryId == 0)
+            {
+                var adminUserIdwithCategoryIdIsNull = connection.QuerySingle<int>(
+                    @"INSERT INTO AdminAccounts
+                    (
+                        UserID,
+                        CentreID,
+                        CategoryID,
+                        IsCentreAdmin,
+                        IsCentreManager,
+                        Active,
+                        IsContentCreator,
+                        IsContentManager,
+                        ImportOnly,
+                        IsTrainer,
+                        IsSupervisor,
+                        IsNominatedSupervisor
+                    )
+                    OUTPUT Inserted.ID
+                    VALUES
+                    (
+                        @userId,
+                        @centreId,
+                        NULL,
+                        @isCentreAdmin,
+                        @isCentreManager,
+                        @active,
+                        @isContentCreator,
+                        @isContentManager,
+                        @importOnly,
+                        @isTrainer,
+                        @isSupervisor,
+                        @isNominatedSupervisor
+                    )",
+                    adminValues,
+                    transaction
+                );
 
+                connection.Execute(
+                    @"INSERT INTO NotificationUsers (NotificationId, AdminUserId)
+                SELECT N.NotificationId, @adminUserIdwithCategoryIdIsNull
+                FROM Notifications N INNER JOIN NotificationRoles NR
+                ON N.NotificationID = NR.NotificationID
+                WHERE RoleID IN @roles AND AutoOptIn = 1",
+                    new { adminUserIdwithCategoryIdIsNull, roles = registrationModel.GetNotificationRoles() },
+                    transaction
+                );
+                transaction.Commit();
+                return adminUserIdwithCategoryIdIsNull;
+            }
             var adminUserId = connection.QuerySingle<int>(
                 @"INSERT INTO AdminAccounts
                     (

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -1314,7 +1314,7 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
                     supervisorDelegateDetail.DelegateUserID,
                     (int)User.GetCentreId()
                 );
-                supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? adminUser.CategoryId.Value : supervisorDelegate.SelfAssessmentCategory;
+                supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? (adminUser.CategoryId.HasValue ? adminUser.CategoryId.Value : 0) : supervisorDelegate.SelfAssessmentCategory;
                 var centreName = adminUser.CentreName;
 
                 var adminRoles = new AdminRoles(false, false, true, false, false, false, false, false);