Skip to content

Commit 6ebf69c

Browse files
sherif-olaboyesherif-olaboye
committed
Merge branch 'Develop/Features/TD-3918-RequestSupportTicketController-refactor(Controller-Service-Repositorypattern)' of https://github.com/TechnologyEnhancedLearning/DLSV2 into Develop/Features/TD-3918-RequestSupportTicketController-refactor(Controller-Service-Repositorypattern)
2 parents 3148933 + 1180c43 commit 6ebf69c

File tree

13 files changed

+100
-93
lines changed

13 files changed

+100
-93
lines changed

‎DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterInternalAdminControllerTests.cs‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
using System.Collections.Generic;
55
using System.Data;
66
using System.Threading.Tasks;
7-
using DigitalLearningSolutions.Data.DataServices;
8-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
97
using DigitalLearningSolutions.Data.Models.Register;
10-
using DigitalLearningSolutions.Data.Models.User;
8+
using DigitalLearningSolutions.Data.Models.User;
119
using DigitalLearningSolutions.Web.Controllers.Register;
1210
using DigitalLearningSolutions.Web.Services;
1311
using DigitalLearningSolutions.Web.Tests.ControllerHelpers;
@@ -31,7 +29,6 @@ public class RegisterInternalAdminControllerTests
3129
private const string DefaultCentreSpecificEmail = "[email protected]";
3230
private const int DefaultUserId = 2;
3331
private const int DefaultDelegateId = 5;
34-
private ICentresDataService centresDataService = null!;
3532
private ICentresService centresService = null!;
3633
private IConfiguration config = null!;
3734
private RegisterInternalAdminController controller = null!;
@@ -41,15 +38,12 @@ public class RegisterInternalAdminControllerTests
4138
private IRegisterAdminService registerAdminService = null!;
4239
private IRegistrationService registrationService = null!;
4340
private HttpRequest request = null!;
44-
private IUserDataService userDataService = null!;
4541
private IUserService userService = null!;
4642

4743
[SetUp]
4844
public void Setup()
4945
{
50-
centresDataService = A.Fake<ICentresDataService>();
5146
centresService = A.Fake<ICentresService>();
52-
userDataService = A.Fake<IUserDataService>();
5347
userService = A.Fake<IUserService>();
5448
registrationService = A.Fake<IRegistrationService>();
5549
delegateApprovalsService = A.Fake<IDelegateApprovalsService>();
@@ -59,9 +53,7 @@ public void Setup()
5953
config = A.Fake<IConfiguration>();
6054
request = A.Fake<HttpRequest>();
6155
controller = new RegisterInternalAdminController(
62-
centresDataService,
6356
centresService,
64-
userDataService,
6557
userService,
6658
registrationService,
6759
delegateApprovalsService,
@@ -91,13 +83,13 @@ public void IndexGet_with_no_centreId_param_shows_notfound_error()
9183
public void IndexGet_with_invalid_centreId_param_shows_notfound_error()
9284
{
9385
// Given
94-
A.CallTo(() => centresDataService.GetCentreName(DefaultCentreId)).Returns(null);
86+
A.CallTo(() => centresService.GetCentreName(DefaultCentreId)).Returns(null);
9587

9688
// When
9789
var result = controller.Index(DefaultCentreId);
9890

9991
// Then
100-
A.CallTo(() => centresDataService.GetCentreName(DefaultCentreId)).MustHaveHappenedOnceExactly();
92+
A.CallTo(() => centresService.GetCentreName(DefaultCentreId)).MustHaveHappenedOnceExactly();
10193

10294
result.Should().BeNotFoundResult();
10395
}
@@ -106,7 +98,7 @@ public void IndexGet_with_invalid_centreId_param_shows_notfound_error()
10698
public void IndexGet_with_not_allowed_admin_registration_returns_access_denied()
10799
{
108100
// Given
109-
A.CallTo(() => centresDataService.GetCentreName(DefaultCentreId)).Returns("Some centre");
101+
A.CallTo(() => centresService.GetCentreName(DefaultCentreId)).Returns("Some centre");
110102
A.CallTo(() => registerAdminService.IsRegisterAdminAllowed(DefaultCentreId, DefaultUserId)).Returns(false);
111103

112104
// When
@@ -124,7 +116,7 @@ public void IndexGet_with_not_allowed_admin_registration_returns_access_denied()
124116
public void IndexGet_with_allowed_admin_registration_returns_view_model()
125117
{
126118
// Given
127-
A.CallTo(() => centresDataService.GetCentreName(DefaultCentreId)).Returns("Some centre");
119+
A.CallTo(() => centresService.GetCentreName(DefaultCentreId)).Returns("Some centre");
128120
A.CallTo(() => registerAdminService.IsRegisterAdminAllowed(DefaultCentreId, DefaultUserId)).Returns(true);
129121

130122
// When
@@ -206,7 +198,7 @@ bool isDelegateApproved
206198
centreSpecificEmail
207199
)
208200
).MustHaveHappenedOnceExactly();
209-
A.CallTo(() => userDataService.GetDelegateAccountsByUserId(DefaultUserId)).MustHaveHappenedOnceExactly();
201+
A.CallTo(() => userService.GetDelegateAccountsByUserId(DefaultUserId)).MustHaveHappenedOnceExactly();
210202

211203
if (hasDelegateAccount)
212204
{
@@ -243,7 +235,7 @@ bool isDelegateApproved
243235
).MustHaveHappenedOnceExactly();
244236
A.CallTo(() => delegateApprovalsService.ApproveDelegate(A<int>._, A<int>._)).MustNotHaveHappened();
245237
A.CallTo(
246-
() => userDataService.SetCentreEmail(
238+
() => userService.SetCentreEmail(
247239
A<int>._,
248240
A<int>._,
249241
A<string?>._,
@@ -353,9 +345,9 @@ bool isDelegateApproved
353345
if (centreSpecificEmail != null)
354346
{
355347
A.CallTo(
356-
() => userDataService.CentreSpecificEmailIsInUseAtCentre(centreSpecificEmail, DefaultCentreId)
348+
() => userService.CentreSpecificEmailIsInUseAtCentre(centreSpecificEmail, DefaultCentreId)
357349
).Returns(false);
358-
A.CallTo(() => userDataService.GetCentreEmail(DefaultUserId, DefaultCentreId)).Returns(null);
350+
A.CallTo(() => userService.GetCentreEmail(DefaultUserId, DefaultCentreId)).Returns(null);
359351
}
360352

361353
A.CallTo(() => registerAdminService.IsRegisterAdminAllowed(DefaultCentreId, DefaultUserId)).Returns(true);
@@ -383,7 +375,7 @@ bool isDelegateApproved
383375
centreId: DefaultCentreId,
384376
approved: isDelegateApproved
385377
);
386-
A.CallTo(() => userDataService.GetDelegateAccountsByUserId(DefaultUserId)).Returns(
378+
A.CallTo(() => userService.GetDelegateAccountsByUserId(DefaultUserId)).Returns(
387379
hasDelegateAccount ? new List<DelegateAccount> { delegateAccount } : new List<DelegateAccount>()
388380
);
389381

@@ -398,7 +390,7 @@ bool isDelegateApproved
398390
).Returns(("candidate", true, true));
399391

400392
A.CallTo(
401-
() => userDataService.SetCentreEmail(
393+
() => userService.SetCentreEmail(
402394
DefaultUserId,
403395
DefaultCentreId,
404396
centreSpecificEmail,

‎DigitalLearningSolutions.Web.Tests/ServiceFilter/VerifyAdminUserCanAccessAdminUserTests.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace DigitalLearningSolutions.Web.Tests.ServiceFilter
22
{
3-
using System.Collections.Generic;
4-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
3+
using System.Collections.Generic;
54
using DigitalLearningSolutions.Web.Controllers;
65
using DigitalLearningSolutions.Web.ServiceFilter;
76
using DigitalLearningSolutions.Web.Services;
@@ -19,7 +18,7 @@
1918

2019
internal class VerifyAdminUserCanAccessAdminUserTests
2120
{
22-
private readonly IUserDataService userDataService = A.Fake<IUserDataService>();
21+
private readonly IUserService userService = A.Fake<IUserService>();
2322
private ActionExecutingContext context = null!;
2423
private const int AdminId = 2;
2524

@@ -45,11 +44,11 @@ public void Returns_NotFound_if_service_returns_null()
4544
{
4645
// Given
4746
context.RouteData.Values["adminId"] = AdminId;
48-
A.CallTo(() => userDataService.GetAdminUserById(AdminId))
47+
A.CallTo(() => userService.GetAdminUserById(AdminId))
4948
.Returns(null);
5049

5150
// When
52-
new VerifyAdminUserCanAccessAdminUser(userDataService).OnActionExecuting(context);
51+
new VerifyAdminUserCanAccessAdminUser(userService).OnActionExecuting(context);
5352

5453
// Then
5554
context.Result.Should().BeStatusCodeResult().WithStatusCode(410);
@@ -60,11 +59,11 @@ public void Returns_AccessDenied_if_service_returns_admin_user_at_different_cent
6059
{
6160
// Given
6261
context.RouteData.Values["adminId"] = AdminId;
63-
A.CallTo(() => userDataService.GetAdminUserById(AdminId))
62+
A.CallTo(() => userService.GetAdminUserById(AdminId))
6463
.Returns(UserTestHelper.GetDefaultAdminUser(centreId: 100));
6564

6665
// When
67-
new VerifyAdminUserCanAccessAdminUser(userDataService).OnActionExecuting(context);
66+
new VerifyAdminUserCanAccessAdminUser(userService).OnActionExecuting(context);
6867

6968
// Then
7069
context.Result.Should().BeRedirectToActionResult().WithControllerName("LearningSolutions")
@@ -76,11 +75,11 @@ public void Does_not_return_any_redirect_page_if_service_returns_admin_user_at_s
7675
{
7776
// Given
7877
context.RouteData.Values["adminId"] = AdminId;
79-
A.CallTo(() => userDataService.GetAdminUserById(AdminId))
78+
A.CallTo(() => userService.GetAdminUserById(AdminId))
8079
.Returns(UserTestHelper.GetDefaultAdminUser(centreId: 101));
8180

8281
// When
83-
new VerifyAdminUserCanAccessAdminUser(userDataService).OnActionExecuting(context);
82+
new VerifyAdminUserCanAccessAdminUser(userService).OnActionExecuting(context);
8483

8584
// Then
8685
context.Result.Should().BeNull();

‎DigitalLearningSolutions.Web.Tests/ServiceFilter/VerifyAdminUserCanAccessDelegateUserTests.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace DigitalLearningSolutions.Web.Tests.ServiceFilter
22
{
3-
using System.Collections.Generic;
4-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
3+
using System.Collections.Generic;
54
using DigitalLearningSolutions.Web.Controllers;
65
using DigitalLearningSolutions.Web.ServiceFilter;
76
using DigitalLearningSolutions.Web.Services;
@@ -19,7 +18,7 @@
1918

2019
internal class VerifyAdminUserCanAccessDelegateUserTests
2120
{
22-
private readonly IUserDataService userDataService = A.Fake<IUserDataService>();
21+
private readonly IUserService userService = A.Fake<IUserService>();
2322
private ActionExecutingContext context = null!;
2423
private const int DelegateId = 2;
2524

@@ -45,11 +44,11 @@ public void Returns_NotFound_if_service_returns_null()
4544
{
4645
// Given
4746
context.RouteData.Values["delegateId"] = DelegateId;
48-
A.CallTo(() => userDataService.GetDelegateUserById(DelegateId))
47+
A.CallTo(() => userService.GetDelegateUserById(DelegateId))
4948
.Returns(null);
5049

5150
// When
52-
new VerifyAdminUserCanAccessDelegateUser(userDataService).OnActionExecuting(context);
51+
new VerifyAdminUserCanAccessDelegateUser(userService).OnActionExecuting(context);
5352

5453
// Then
5554
context.Result.Should().BeNotFoundResult();
@@ -60,11 +59,11 @@ public void Returns_AccessDenied_if_service_returns_delegate_user_at_different_c
6059
{
6160
// Given
6261
context.RouteData.Values["delegateId"] = DelegateId;
63-
A.CallTo(() => userDataService.GetDelegateUserById(DelegateId))
62+
A.CallTo(() => userService.GetDelegateUserById(DelegateId))
6463
.Returns(UserTestHelper.GetDefaultDelegateUser(centreId: 100));
6564

6665
// When
67-
new VerifyAdminUserCanAccessDelegateUser(userDataService).OnActionExecuting(context);
66+
new VerifyAdminUserCanAccessDelegateUser(userService).OnActionExecuting(context);
6867

6968
// Then
7069
context.Result.Should().BeRedirectToActionResult().WithControllerName("LearningSolutions")
@@ -76,11 +75,11 @@ public void Does_not_return_any_redirect_page_if_service_returns_delegate_user_a
7675
{
7776
// Given
7877
context.RouteData.Values["delegateId"] = DelegateId;
79-
A.CallTo(() => userDataService.GetDelegateUserById(DelegateId))
78+
A.CallTo(() => userService.GetDelegateUserById(DelegateId))
8079
.Returns(UserTestHelper.GetDefaultDelegateUser(centreId: 101));
8180

8281
// When
83-
new VerifyAdminUserCanAccessDelegateUser(userDataService).OnActionExecuting(context);
82+
new VerifyAdminUserCanAccessDelegateUser(userService).OnActionExecuting(context);
8483

8584
// Then
8685
context.Result.Should().BeNull();

‎DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceSynchroniseGroupsTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ public void AddNewDelegateToAppropriateGroups_adds_delegate_to_appropriate_group
444444
);
445445
A.CallTo(() => groupsDataService.GetGroupsForCentre(registrationModel.Centre))
446446
.Returns(new List<Group> { synchronisedGroup, unsynchronisedGroup });
447-
A.CallTo(() => jobGroupsDataService.GetJobGroupName(0)).Returns(null);
448-
A.CallTo(() => jobGroupsDataService.GetJobGroupName(1)).Returns(null);
447+
A.CallTo(() => jobGroupsService.GetJobGroupName(0)).Returns(null);
448+
A.CallTo(() => jobGroupsService.GetJobGroupName(1)).Returns(null);
449449

450450
// When
451451
groupsService.AddNewDelegateToAppropriateGroups(
@@ -489,9 +489,9 @@ public void SynchroniseJobGroupsOnOtherCentres_synchronises_correct_job_groups()
489489
A.CallTo(() => groupsDataService.GetGroupsForCentre(delegateAccount.CentreId))
490490
.Returns(groups);
491491

492-
A.CallTo(() => jobGroupsDataService.GetJobGroupName(oldJobGroupId))
492+
A.CallTo(() => jobGroupsService.GetJobGroupName(oldJobGroupId))
493493
.Returns(oldJobGroupGroup.GroupLabel);
494-
A.CallTo(() => jobGroupsDataService.GetJobGroupName(newJobGroupId))
494+
A.CallTo(() => jobGroupsService.GetJobGroupName(newJobGroupId))
495495
.Returns(newJobGroupGroup.GroupLabel);
496496

497497
// When

‎DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public partial class GroupsServiceTests
5252
private IEmailSchedulerService emailSchedulerService = null!;
5353
private IGroupsDataService groupsDataService = null!;
5454
private IGroupsService groupsService = null!;
55-
private IJobGroupsDataService jobGroupsDataService = null!;
55+
private IJobGroupsService jobGroupsService = null!;
5656
private IEnrolService enrolService = null!;
5757
private ILogger<IGroupsService> logger = null!;
5858
private IProgressDataService progressDataService = null!;
@@ -73,11 +73,11 @@ public void Setup()
7373
configuration = A.Fake<IConfiguration>();
7474
centreRegistrationPromptsService = A.Fake<ICentreRegistrationPromptsService>();
7575
logger = A.Fake<ILogger<IGroupsService>>();
76-
jobGroupsDataService = A.Fake<IJobGroupsDataService>(x => x.Strict());
76+
jobGroupsService = A.Fake<IJobGroupsService>(x => x.Strict());
7777
userDataService = A.Fake<IUserDataService>();
7878
notificationPreferencesDataService = A.Fake<INotificationPreferencesDataService>();
7979

80-
A.CallTo(() => jobGroupsDataService.GetJobGroupsAlphabetical()).Returns(
80+
A.CallTo(() => jobGroupsService.GetJobGroupsAlphabetical()).Returns(
8181
JobGroupsTestHelper.GetDefaultJobGroupsAlphabetical()
8282
);
8383
A.CallTo(() => configuration["AppRootPath"]).Returns("baseUrl");
@@ -102,7 +102,7 @@ public void Setup()
102102
clockUtility,
103103
tutorialContentDataService,
104104
emailService,
105-
jobGroupsDataService,
105+
jobGroupsService,
106106
progressDataService,
107107
configuration,
108108
centreRegistrationPromptsService,
@@ -111,7 +111,7 @@ public void Setup()
111111
notificationPreferencesDataService
112112
);
113113

114-
A.CallTo(() => jobGroupsDataService.GetJobGroupsAlphabetical()).Returns(
114+
A.CallTo(() => jobGroupsService.GetJobGroupsAlphabetical()).Returns(
115115
JobGroupsTestHelper.GetDefaultJobGroupsAlphabetical()
116116
);
117117
A.CallTo(() => configuration["AppRootPath"]).Returns("baseUrl");
@@ -554,7 +554,7 @@ public void
554554
true
555555
);
556556

557-
A.CallTo(() => jobGroupsDataService.GetJobGroupsAlphabetical()).Returns(jobGroups);
557+
A.CallTo(() => jobGroupsService.GetJobGroupsAlphabetical()).Returns(jobGroups);
558558

559559
SetUpGenerateGroupFakes(timeNow);
560560

0 commit comments

Comments
 (0)