Merge pull request #2142 from TechnologyEnhancedLearning/Develop/Fixes/TD-2503_mismatch_of_the_Admins_listed_on_Delegates_section_compared_to_Centre_administrators_section

kevwhitt-hee · web-flow · commit 43d19750c160 · 2023-09-22T07:50:06.000+01:00
TD-2503 Displayed admin account with inactive user account ,added filter for user account status and reactivate admin account
diff --git a/DigitalLearningSolutions.Data.Tests/DataServices/UserDataServiceTests/AdminUserDataServiceTests.cs b/DigitalLearningSolutions.Data.Tests/DataServices/UserDataServiceTests/AdminUserDataServiceTests.cs
@@ -167,10 +167,10 @@ public void GetAdminUsersByCentreId_populates_correct_properties_on_admin()
         }
 
         [Test]
-        public void GetNumberOfActiveAdminsAtCentre_returns_expected_count()
+        public void GetNumberOfAdminsAtCentre_returns_expected_count()
         {
             // When
-            var count = userDataService.GetNumberOfActiveAdminsAtCentre(2);
+            var count = userDataService.GetNumberOfAdminsAtCentre(2);
 
             // Then
             count.Should().Be(3);
diff --git a/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs b/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
@@ -1,12 +1,12 @@
 ﻿namespace DigitalLearningSolutions.Data.DataServices.UserDataService
 {
+    using Dapper;
+    using DigitalLearningSolutions.Data.Models.Centres;
+    using DigitalLearningSolutions.Data.Models.User;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Dapper;
-    using DigitalLearningSolutions.Data.Models.Centres;
-    using DigitalLearningSolutions.Data.Models.User;
 
     public partial class UserDataService
     {
@@ -177,6 +177,21 @@ public IEnumerable<AdminEntity> GetActiveAdminsByCentreId(int centreId)
             );
         }
 
+        public IEnumerable<AdminEntity> GetAdminsByCentreId(int centreId)
+        {
+            var sql = $@"{BaseAdminEntitySelectQuery} WHERE aa.centreID = @centreId";
+
+            return connection.Query<AdminAccount, UserAccount, UserCentreDetails, AdminEntity>(
+                sql,
+                (adminAccount, userAccount, userCentreDetails) => new AdminEntity(
+                    adminAccount,
+                    userAccount,
+                    userCentreDetails
+                ),
+                new { centreId }
+            );
+        }
+
         [Obsolete("New code should use GetAdminById instead")]
         public AdminUser? GetAdminUserById(int id)
         {
@@ -210,10 +225,10 @@ public List<AdminUser> GetAdminUsersByCentreId(int centreId)
             return users;
         }
 
-        public int GetNumberOfActiveAdminsAtCentre(int centreId)
+        public int GetNumberOfAdminsAtCentre(int centreId)
         {
             return (int)connection.ExecuteScalar(
-                @"SELECT COUNT(*) FROM AdminUsers WHERE Active = 1 AND CentreID = @centreId",
+                @"SELECT COUNT(*) FROM AdminUsers WHERE CentreID = @centreId",
                 new { centreId }
             );
         }
diff --git a/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs b/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs
@@ -20,13 +20,15 @@ public interface IUserDataService
 
         IEnumerable<AdminEntity> GetActiveAdminsByCentreId(int centreId);
 
+        IEnumerable<AdminEntity> GetAdminsByCentreId(int centreId);
+
         AdminUser? GetAdminUserById(int id);
 
         List<AdminUser> GetAdminUsersByCentreId(int centreId);
 
         AdminUser? GetAdminUserByEmailAddress(string emailAddress);
 
-        int GetNumberOfActiveAdminsAtCentre(int centreId);
+        int GetNumberOfAdminsAtCentre(int centreId);
 
         void UpdateAdminUserPermissions(
             int adminId,
diff --git a/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs b/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs
@@ -59,6 +59,7 @@ public override string SearchableName
 
         public string? CategoryName => AdminAccount.CategoryName;
         public bool IsLocked => UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
+        public bool IsUserActive => UserAccount.Active;
         public bool IsCmsAdministrator => AdminAccount.IsCmsAdministrator;
         public bool IsCmsManager => AdminAccount.IsCmsManager;
         public bool IsCentreAdmin => AdminAccount.IsCentreAdmin;
diff --git a/DigitalLearningSolutions.Web.Tests/Helpers/FilterableTagHelperTests.cs b/DigitalLearningSolutions.Web.Tests/Helpers/FilterableTagHelperTests.cs
@@ -28,6 +28,7 @@ public void GetCurrentTagsForAdmin_should_return_correct_tags()
                 new SearchableTagViewModel(AdminRoleFilterOptions.CmsAdministrator),
                 new SearchableTagViewModel(AdminRoleFilterOptions.ContentCreatorLicense),
                 new SearchableTagViewModel(AdminRoleFilterOptions.SuperAdmin),
+                new SearchableTagViewModel(UserAccountStatusFilterOptions.Active),
             };
 
             // When
diff --git a/DigitalLearningSolutions.Web.Tests/Services/DashboardInformationServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/DashboardInformationServiceTests.cs
@@ -136,7 +136,7 @@ int ticketCountForCentre
                         adminUser!.CategoryId
                     )
             ).Returns(courseCount);
-            A.CallTo(() => userDataService.GetNumberOfActiveAdminsAtCentre(CentreId)).Returns(adminCount);
+            A.CallTo(() => userDataService.GetNumberOfAdminsAtCentre(CentreId)).Returns(adminCount);
             A.CallTo(() => centresService.GetCentreRankForCentre(CentreId)).Returns(centreRank);
             A.CallTo(() => supportTicketDataService.GetNumberOfUnarchivedTicketsForAdminId(AdminId))
                 .Returns(ticketCountForAdmin);
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs
@@ -113,7 +113,7 @@ public IActionResult AllAdmins()
             var centreId = User.GetCentreIdKnownNotNull();
             var loggedInAdmin = userDataService.GetAdminById(User.GetAdminId()!.Value);
 
-            var adminsAtCentre = userDataService.GetActiveAdminsByCentreId(centreId);
+            var adminsAtCentre = userDataService.GetAdminsByCentreId(centreId);
             var categories = courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
             var model = new AllAdminsViewModel(
                 adminsAtCentre,
@@ -272,6 +272,17 @@ public IActionResult DeactivateOrDeleteAdmin(int adminId, DeactivateAdminViewMod
             return View("DeactivateOrDeleteAdminConfirmation");
         }
 
+        [Route("{adminId:int}/ReactivateAdmin")]
+        [HttpGet]
+        [ServiceFilter(typeof(VerifyAdminUserCanAccessAdminUser))]
+        public IActionResult ReactivateAdmin(
+            int adminId
+        )
+        {
+            userService.ReactivateAdmin(adminId);
+            return RedirectToAction("Index");
+        }
+
         private bool CurrentUserCanDeactivateAdmin(AdminAccount adminToDeactivate)
         {
             var loggedInAdmin = userDataService.GetAdminById(User.GetAdminId()!.GetValueOrDefault());
diff --git a/DigitalLearningSolutions.Web/Helpers/FilterOptions/AdminFilterOptions.cs b/DigitalLearningSolutions.Web/Helpers/FilterOptions/AdminFilterOptions.cs
@@ -88,4 +88,21 @@ public static class AdminAccountStatusFilterOptions
             FilterStatus.Default
         );
     }
+
+    public static class UserAccountStatusFilterOptions
+    {
+        private const string Group = "UserStatus";
+
+        public static readonly FilterOptionModel Active = new FilterOptionModel(
+            "Active",
+            FilteringHelper.BuildFilterValueString(Group, nameof(AdminEntity.IsUserActive), "true"),
+            FilterStatus.Default
+        );
+
+        public static readonly FilterOptionModel Inactive = new FilterOptionModel(
+            "Inactive",
+            FilteringHelper.BuildFilterValueString(Group, nameof(AdminEntity.IsUserActive), "false"),
+            FilterStatus.Default
+        );
+    }
 }
diff --git a/DigitalLearningSolutions.Web/Helpers/FilterableTagHelper.cs b/DigitalLearningSolutions.Web/Helpers/FilterableTagHelper.cs
@@ -73,6 +73,15 @@ public static IEnumerable<SearchableTagViewModel> GetCurrentTagsForAdmin(AdminEn
                 tags.Add(new SearchableTagViewModel(AdminRoleFilterOptions.ReportsViewer));
             }
 
+            if (admin.UserAccount.Active && admin.AdminAccount.Active)
+            {
+                tags.Add(new SearchableTagViewModel(UserAccountStatusFilterOptions.Active));
+            }
+            else
+            {
+                tags.Add(new SearchableTagViewModel(UserAccountStatusFilterOptions.Inactive));
+            }
+
             return tags;
         }
 
diff --git a/DigitalLearningSolutions.Web/Services/DashboardInformationService.cs b/DigitalLearningSolutions.Web/Services/DashboardInformationService.cs
@@ -47,7 +47,7 @@ ICentresDataService centresDataService
                     centreId,
                     adminUser.CategoryId
                 );
-            var adminCount = userDataService.GetNumberOfActiveAdminsAtCentre(centreId);
+            var adminCount = userDataService.GetNumberOfAdminsAtCentre(centreId);
             var supportTicketCount = adminUser.IsCentreManager
                 ? ticketDataService.GetNumberOfUnarchivedTicketsForCentreId(centreId)
                 : ticketDataService.GetNumberOfUnarchivedTicketsForAdminId(adminId);
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
@@ -74,7 +74,7 @@ void UpdateAdminUserPermissions(
 
         void DeactivateOrDeleteAdmin(int adminId);
 
-        void DeactivateOrDeleteAdminForSuperAdmin(int adminId);        
+        void DeactivateOrDeleteAdminForSuperAdmin(int adminId);
 
         UserEntity? GetUserById(int userId);
 
@@ -109,6 +109,8 @@ string code
         void SetEmailVerified(int userId, string email, DateTime verifiedDateTime);
 
         bool EmailIsHeldAtCentre(string? email, int centreId);
+
+        void ReactivateAdmin(int adminId);
     }
 
     public class UserService : IUserService
@@ -653,5 +655,12 @@ AdminRoles adminRoles
 
             return false;
         }
+
+        public void ReactivateAdmin(int adminId)
+        {
+            userDataService.ReactivateAdmin(adminId);
+            int? userId = userDataService.GetUserIdByAdminId(adminId);
+            userDataService.ActivateUser(userId.GetValueOrDefault());
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdministratorsViewModelFilterOptions.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdministratorsViewModelFilterOptions.cs
@@ -31,6 +31,12 @@ public static class AdministratorsViewModelFilterOptions
             AdminAccountStatusFilterOptions.IsNotLocked,
         };
 
+        public static readonly IEnumerable<FilterOptionModel> UserStatusOptions = new[]
+        {
+            UserAccountStatusFilterOptions.Active,
+            UserAccountStatusFilterOptions.Inactive,
+        };
+
         public static IEnumerable<FilterOptionModel> GetCategoryOptions(IEnumerable<string> categories)
         {
             return categories.Select(
@@ -60,6 +66,11 @@ public static List<FilterModel> GetAllAdministratorsFilterModels(IEnumerable<Cat
                     "Account Status",
                     AccountStatusOptions
                 ),
+                new FilterModel(
+                    "UserStatus",
+                    "User Status",
+                    UserStatusOptions
+                ),
             };
             return filters;
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs
@@ -21,7 +21,7 @@ ReturnPageQuery returnPageQuery
             CategoryName = admin.AdminAccount.CategoryName ?? "All";
             EmailAddress = admin.EmailForCentreNotifications;
             IsLocked = admin.UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
-
+            IsActive = admin.AdminAccount.Active;
             CanShowDeactivateAdminButton =
                 UserPermissionsHelper.LoggedInAdminCanDeactivateUser(admin.AdminAccount, loggedInAdminAccount);
 
@@ -43,6 +43,8 @@ ReturnPageQuery returnPageQuery
 
         public bool IsLocked { get; set; }
 
+        public bool IsActive { get; set; }
+
         public ReturnPageQuery ReturnPageQuery { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml

Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,10 @@ public void GetAdminUsersByCentreId_populates_correct_properties_on_admin()`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`[Test]`
`170`		`- public void GetNumberOfActiveAdminsAtCentre_returns_expected_count()`
	`170`	`+ public void GetNumberOfAdminsAtCentre_returns_expected_count()`
`171`	`171`	`{`
`172`	`172`	`// When`
`173`		`- var count = userDataService.GetNumberOfActiveAdminsAtCentre(2);`
	`173`	`+ var count = userDataService.GetNumberOfAdminsAtCentre(2);`
`174`	`174`
`175`	`175`	`// Then`
`176`	`176`	`count.Should().Be(3);`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ int ticketCountForCentre`
`136`	`136`	`adminUser!.CategoryId`
`137`	`137`	`)`
`138`	`138`	`).Returns(courseCount);`
`139`		`- A.CallTo(() => userDataService.GetNumberOfActiveAdminsAtCentre(CentreId)).Returns(adminCount);`
	`139`	`+ A.CallTo(() => userDataService.GetNumberOfAdminsAtCentre(CentreId)).Returns(adminCount);`
`140`	`140`	`A.CallTo(() => centresService.GetCentreRankForCentre(CentreId)).Returns(centreRank);`
`141`	`141`	`A.CallTo(() => supportTicketDataService.GetNumberOfUnarchivedTicketsForAdminId(AdminId))`
`142`	`142`	`.Returns(ticketCountForAdmin);`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,15 @@ public static IEnumerable<SearchableTagViewModel> GetCurrentTagsForAdmin(AdminEn`
`73`	`73`	`tags.Add(new SearchableTagViewModel(AdminRoleFilterOptions.ReportsViewer));`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ if (admin.UserAccount.Active && admin.AdminAccount.Active)`
	`77`	`+ {`
	`78`	`+ tags.Add(new SearchableTagViewModel(UserAccountStatusFilterOptions.Active));`
	`79`	`+ }`
	`80`	`+ else`
	`81`	`+ {`
	`82`	`+ tags.Add(new SearchableTagViewModel(UserAccountStatusFilterOptions.Inactive));`
	`83`	`+ }`
	`84`	`+`
`76`	`85`	`return tags;`
`77`	`86`	`}`
`78`	`87`