Skip to content

Commit ad90f3b

Browse files
rshrirohitrshrirohit
authored
Merge pull request #2687 from TechnologyEnhancedLearning/Develop/feature/TD-3937-EditDelegateController-refactor
TD-3937-EditDelegateController - refactor
2 parents 6c55611 + 8e88148 commit ad90f3b

File tree

2 files changed

+19
-28
lines changed

2 files changed

+19
-28
lines changed

‎DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EditDelegateControllerTests.cs‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
22
{
33
using System.Linq;
4-
using DigitalLearningSolutions.Data.DataServices;
5-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
6-
using DigitalLearningSolutions.Data.Models.User;
4+
using DigitalLearningSolutions.Data.Models.User;
75
using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates;
86
using DigitalLearningSolutions.Web.Helpers;
97
using DigitalLearningSolutions.Web.Services;
@@ -21,20 +19,18 @@ public class EditDelegateControllerTests
2119
{
2220
private const int DelegateId = 1;
2321
private EditDelegateController controller = null!;
24-
private IJobGroupsDataService jobGroupsDataService = null!;
22+
private IJobGroupsService jobGroupsService = null!;
2523
private PromptsService promptsService = null!;
2624
private IUserService userService = null!;
27-
private IUserDataService userDataService = null!;
2825

2926
[SetUp]
3027
public void SetUp()
3128
{
3229
promptsService = A.Fake<PromptsService>();
33-
jobGroupsDataService = A.Fake<IJobGroupsDataService>();
30+
jobGroupsService = A.Fake<IJobGroupsService>();
3431
userService = A.Fake<IUserService>();
35-
userDataService = A.Fake<IUserDataService>();
3632

37-
controller = new EditDelegateController(userService, userDataService, jobGroupsDataService, promptsService)
33+
controller = new EditDelegateController(userService, jobGroupsService, promptsService)
3834
.WithDefaultContext()
3935
.WithMockUser(true);
4036
}
@@ -120,7 +116,7 @@ public void Index_post_returns_view_with_model_error_with_duplicate_email()
120116

121117
A.CallTo(() => userService.GetDelegateById(DelegateId)).Returns(delegateEntity);
122118
A.CallTo(
123-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
119+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
124120
email,
125121
delegateEntity.DelegateAccount.CentreId,
126122
delegateEntity.UserAccount.Id
@@ -134,7 +130,7 @@ public void Index_post_returns_view_with_model_error_with_duplicate_email()
134130
using (new AssertionScope())
135131
{
136132
A.CallTo(
137-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
133+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
138134
email,
139135
delegateEntity.DelegateAccount.CentreId,
140136
delegateEntity.UserAccount.Id
@@ -168,7 +164,7 @@ public void Index_post_returns_view_with_model_error_with_invalid_prn()
168164
using (new AssertionScope())
169165
{
170166
A.CallTo(
171-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
167+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
172168
A<string>._,
173169
A<int>._,
174170
A<int>._
@@ -204,7 +200,7 @@ public void Index_post_calls_userServices_and_redirects_with_no_validation_error
204200

205201
A.CallTo(() => userService.GetDelegateById(DelegateId)).Returns(delegateEntity);
206202
A.CallTo(
207-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
203+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
208204
centreSpecificEmail,
209205
delegateEntity.DelegateAccount.CentreId,
210206
delegateEntity.UserAccount.Id
@@ -219,7 +215,7 @@ public void Index_post_calls_userServices_and_redirects_with_no_validation_error
219215
{
220216
A.CallTo(() => userService.GetDelegateById(DelegateId)).MustHaveHappenedOnceExactly();
221217
A.CallTo(
222-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
218+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
223219
centreSpecificEmail,
224220
delegateEntity.DelegateAccount.CentreId,
225221
delegateEntity.UserAccount.Id
@@ -267,7 +263,7 @@ public void Index_post_does_not_if_check_email_is_in_use_if_email_is_unchanged()
267263
{
268264
A.CallTo(() => userService.GetDelegateById(DelegateId)).MustHaveHappenedOnceExactly();
269265
A.CallTo(
270-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
266+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
271267
A<string>._,
272268
A<int>._,
273269
A<int>._
@@ -315,7 +311,7 @@ public void Index_post_saves_centre_specific_email_as_null_if_same_as_primary_em
315311
using (new AssertionScope())
316312
{
317313
A.CallTo(
318-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
314+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
319315
A<string>._,
320316
A<int>._,
321317
A<int>._
@@ -365,7 +361,7 @@ public void
365361
using (new AssertionScope())
366362
{
367363
A.CallTo(
368-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
364+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
369365
A<string>._,
370366
A<int>._,
371367
A<int>._
@@ -410,7 +406,7 @@ public void
410406
A.CallTo(() => userService.GetDelegateById(DelegateId)).Returns(delegateEntity);
411407

412408
A.CallTo(
413-
() => userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
409+
() => userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
414410
newCentreSpecificEmail,
415411
delegateEntity.DelegateAccount.CentreId,
416412
delegateEntity.UserAccount.Id

‎DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EditDelegateController.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
22
{
33
using System.Linq;
4-
using DigitalLearningSolutions.Data.DataServices;
5-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
64
using DigitalLearningSolutions.Data.Enums;
75
using DigitalLearningSolutions.Web.Attributes;
86
using DigitalLearningSolutions.Web.Helpers;
@@ -23,21 +21,18 @@
2321
[SetSelectedTab(nameof(NavMenuTab.Delegates))]
2422
public class EditDelegateController : Controller
2523
{
26-
private readonly IJobGroupsDataService jobGroupsDataService;
24+
private readonly IJobGroupsService jobGroupsService;
2725
private readonly PromptsService promptsService;
2826
private readonly IUserService userService;
29-
private readonly IUserDataService userDataService;
3027

3128
public EditDelegateController(
3229
IUserService userService,
33-
IUserDataService userDataService,
34-
IJobGroupsDataService jobGroupsDataService,
30+
IJobGroupsService jobGroupsService,
3531
PromptsService registrationPromptsService
3632
)
3733
{
3834
this.userService = userService;
39-
this.userDataService = userDataService;
40-
this.jobGroupsDataService = jobGroupsDataService;
35+
this.jobGroupsService = jobGroupsService;
4136
promptsService = registrationPromptsService;
4237
}
4338

@@ -52,7 +47,7 @@ public IActionResult Index(int delegateId)
5247
return NotFound();
5348
}
5449

55-
var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical().ToList();
50+
var jobGroups = jobGroupsService.GetJobGroupsAlphabetical().ToList();
5651

5752
var customPrompts =
5853
promptsService.GetEditDelegateRegistrationPromptViewModelsForCentre(delegateEntity, centreId);
@@ -101,7 +96,7 @@ public IActionResult Index(EditDelegateFormData formData, int delegateId)
10196
if (
10297
formData.CentreSpecificEmail != null &&
10398
formData.CentreSpecificEmail != delegateEntity.UserCentreDetails?.Email &&
104-
userDataService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
99+
userService.CentreSpecificEmailIsInUseAtCentreByOtherUser(
105100
formData.CentreSpecificEmail,
106101
delegateEntity.DelegateAccount.CentreId,
107102
delegateEntity.UserAccount.Id
@@ -141,7 +136,7 @@ private IActionResult ReturnToEditDetailsViewWithErrors(
141136
int centreId
142137
)
143138
{
144-
var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical().ToList();
139+
var jobGroups = jobGroupsService.GetJobGroupsAlphabetical().ToList();
145140
var customPrompts =
146141
promptsService.GetEditDelegateRegistrationPromptViewModelsForCentre(formData, centreId);
147142
var model = new EditDelegateViewModel(formData, jobGroups, customPrompts, delegateId);

0 commit comments

Comments
 (0)