Skip to content

Commit db05572

Browse files
Auldrin-PossaAuldrin-Possa
committed
TD-3899-DataService reference removed from controller. Removed commented code from LearningPortlalControllerTests class.
1 parent 6e077ec commit db05572

File tree

3 files changed

+22
-32
lines changed

3 files changed

+22
-32
lines changed

‎DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/LearningPortalControllerTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
namespace DigitalLearningSolutions.Web.Tests.Controllers.LearningPortal
22
{
33
using System.Security.Claims;
4-
//using DigitalLearningSolutions.Data.DataServices;
54
using DigitalLearningSolutions.Data.Services;
6-
using DigitalLearningSolutions.Data.DataServices.UserDataService;
75
using DigitalLearningSolutions.Data.Utilities;
86
using DigitalLearningSolutions.Web.Controllers.LearningPortalController;
97
using DigitalLearningSolutions.Web.Services;

‎DigitalLearningSolutions.Web.Tests/Controllers/LearningSolutions/LearningSolutionsControllerTests.cs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace DigitalLearningSolutions.Web.Tests.Controllers.LearningSolutions
22
{
33
using System.Security.Claims;
4-
using DigitalLearningSolutions.Data.DataServices;
54
using DigitalLearningSolutions.Web.Controllers.LearningSolutions;
65
using DigitalLearningSolutions.Web.Services;
76
using DigitalLearningSolutions.Web.Tests.ControllerHelpers;
@@ -18,17 +17,15 @@ internal class LearningSolutionsControllerTests
1817
{
1918
private const int CandidateId = 11;
2019
private const int CentreId = 2;
21-
private ICentresDataService centresDataService = null!;
2220
private ICentresService centresService = null!;
23-
private IConfigDataService configDataService = null!;
21+
private IConfigService configService = null!;
2422
private LearningSolutionsController controller = null!;
2523

2624
[SetUp]
2725
public void SetUp()
2826
{
29-
centresDataService = A.Fake<ICentresDataService>();
30-
configDataService = A.Fake<IConfigDataService>();
31-
centresService= A.Fake<ICentresService>();
27+
configService = A.Fake<IConfigService>();
28+
centresService = A.Fake<ICentresService>();
3229
var logger = A.Fake<ILogger<LearningSolutionsController>>();
3330

3431
var user = new ClaimsPrincipal(
@@ -42,9 +39,8 @@ public void SetUp()
4239
)
4340
);
4441
controller = new LearningSolutionsController(
45-
configDataService,
42+
configService,
4643
logger,
47-
centresDataService,
4844
centresService
4945
)
5046
{
@@ -69,7 +65,7 @@ public void Error_should_pass_the_banner_text()
6965
{
7066
// Given
7167
const string bannerText = "Banner text";
72-
A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
68+
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
7369

7470
// When
7571
var result = controller.Error();
@@ -129,7 +125,7 @@ public void StatusCode_should_set_banner_text_when_code_is_404()
129125
{
130126
// Given
131127
const string bannerText = "Banner text";
132-
A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
128+
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
133129

134130
// When
135131
var result = controller.StatusCode(404);
@@ -145,7 +141,7 @@ public void StatusCode_should_set_banner_text_when_code_is_410()
145141
{
146142
// Given
147143
const string bannerText = "Banner text";
148-
A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
144+
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
149145

150146
// When
151147
var result = controller.StatusCode(410);
@@ -161,7 +157,7 @@ public void StatusCode_should_set_banner_text_when_code_is_403()
161157
{
162158
// Given
163159
const string bannerText = "Banner text";
164-
A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
160+
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
165161

166162
// When
167163
var result = controller.StatusCode(403);
@@ -177,7 +173,7 @@ public void StatusCode_should_set_banner_text_when_code_is_500()
177173
{
178174
// Given
179175
const string bannerText = "Banner text";
180-
A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
176+
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
181177

182178
// When
183179
var result = controller.StatusCode(500);

‎DigitalLearningSolutions.Web/Controllers/LearningSolutions/LearningSolutionsController.cs‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace DigitalLearningSolutions.Web.Controllers.LearningSolutions
22
{
33
using DigitalLearningSolutions.Data.Constants;
4-
using DigitalLearningSolutions.Data.DataServices;
54
using DigitalLearningSolutions.Data.Models.Supervisor;
65
using DigitalLearningSolutions.Data.Utilities;
76
using DigitalLearningSolutions.Web.Attributes;
@@ -20,27 +19,24 @@ namespace DigitalLearningSolutions.Web.Controllers.LearningSolutions
2019

2120
public class LearningSolutionsController : Controller
2221
{
23-
private readonly ICentresDataService centresDataService;
2422
private readonly ICentresService centresService;
25-
private readonly IConfigDataService configDataService;
23+
private readonly IConfigService configService;
2624
private readonly ILogger<LearningSolutionsController> logger;
2725

2826
public LearningSolutionsController(
29-
IConfigDataService configDataService,
27+
IConfigService configService,
3028
ILogger<LearningSolutionsController> logger,
31-
ICentresDataService centresDataService,
3229
ICentresService centresService
3330
)
3431
{
35-
this.configDataService = configDataService;
32+
this.configService = configService;
3633
this.logger = logger;
37-
this.centresDataService = centresDataService;
3834
this.centresService = centresService;
3935
}
4036

4137
public IActionResult AccessibilityHelp()
4238
{
43-
var accessibilityText = configDataService.GetConfigValue(ConfigConstants.AccessibilityHelpText);
39+
var accessibilityText = configService.GetConfigValue(ConfigConstants.AccessibilityHelpText);
4440
if (accessibilityText == null)
4541
{
4642
logger.LogError("Accessibility text from Config table is null");
@@ -50,7 +46,7 @@ public IActionResult AccessibilityHelp()
5046
DateTime lastUpdatedDate = DateTime.Now;
5147
DateTime nextReviewDate = DateTime.Now;
5248

53-
lastUpdatedDate = configDataService.GetConfigLastUpdated(ConfigConstants.AccessibilityHelpText);
49+
lastUpdatedDate = configService.GetConfigLastUpdated(ConfigConstants.AccessibilityHelpText);
5450
nextReviewDate = lastUpdatedDate.AddYears(3);
5551

5652
var model = new AccessibilityHelpViewModel(accessibilityText, lastUpdatedDate, nextReviewDate);
@@ -59,7 +55,7 @@ public IActionResult AccessibilityHelp()
5955

6056
public IActionResult Terms()
6157
{
62-
var termsText = configDataService.GetConfigValue(ConfigConstants.TermsText);
58+
var termsText = configService.GetConfigValue(ConfigConstants.TermsText);
6359
if (termsText == null)
6460
{
6561
logger.LogError("Terms text from Config table is null");
@@ -68,15 +64,15 @@ public IActionResult Terms()
6864
DateTime lastUpdatedDate = DateTime.Now;
6965
DateTime nextReviewDate = DateTime.Now;
7066

71-
lastUpdatedDate = configDataService.GetConfigLastUpdated(ConfigConstants.TermsText);
67+
lastUpdatedDate = configService.GetConfigLastUpdated(ConfigConstants.TermsText);
7268
nextReviewDate = lastUpdatedDate.AddYears(3);
7369
var model = new TermsViewModel(termsText, lastUpdatedDate, nextReviewDate);
7470
return View(model);
7571
}
7672

7773
public IActionResult Contact()
7874
{
79-
var contactText = configDataService.GetConfigValue(ConfigConstants.ContactText);
75+
var contactText = configService.GetConfigValue(ConfigConstants.ContactText);
8076
if (contactText == null)
8177
{
8278
logger.LogError("Contact text from Config table is null");
@@ -155,14 +151,14 @@ private ErrorViewModel GetErrorModel()
155151
var centreId = User.GetCentreId();
156152
if (centreId != null)
157153
{
158-
bannerText = centresDataService.GetBannerText((int)centreId);
154+
bannerText = centresService.GetBannerText((int)centreId);
159155
}
160156
return bannerText;
161157
}
162158

163159
public IActionResult AcceptableUsePolicy()
164160
{
165-
var acceptableUsePolicyText = configDataService.GetConfigValue(ConfigConstants.AcceptableUsePolicyText);
161+
var acceptableUsePolicyText = configService.GetConfigValue(ConfigConstants.AcceptableUsePolicyText);
166162

167163
if (acceptableUsePolicyText == null)
168164
{
@@ -172,14 +168,14 @@ public IActionResult AcceptableUsePolicy()
172168
DateTime lastUpdatedDate = DateTime.Now;
173169
DateTime nextReviewDate = DateTime.Now;
174170

175-
lastUpdatedDate = configDataService.GetConfigLastUpdated(ConfigConstants.AcceptableUsePolicyText);
171+
lastUpdatedDate = configService.GetConfigLastUpdated(ConfigConstants.AcceptableUsePolicyText);
176172
nextReviewDate = lastUpdatedDate.AddYears(3);
177173
var model = new AcceptableUsePolicyViewModel(acceptableUsePolicyText, lastUpdatedDate, nextReviewDate);
178174
return View(model);
179175
}
180176
public IActionResult PrivacyNotice()
181177
{
182-
var PrivacyPolicyText = configDataService.GetConfigValue(ConfigConstants.PrivacyPolicyText);
178+
var PrivacyPolicyText = configService.GetConfigValue(ConfigConstants.PrivacyPolicyText);
183179
if (PrivacyPolicyText == null)
184180
{
185181
logger.LogError("PrivacyPolicy text from Config table is null");
@@ -189,7 +185,7 @@ public IActionResult PrivacyNotice()
189185
DateTime lastUpdatedDate = DateTime.Now;
190186
DateTime nextReviewDate = DateTime.Now;
191187

192-
lastUpdatedDate = configDataService.GetConfigLastUpdated(ConfigConstants.PrivacyPolicyText);
188+
lastUpdatedDate = configService.GetConfigLastUpdated(ConfigConstants.PrivacyPolicyText);
193189
nextReviewDate = lastUpdatedDate.AddYears(3);
194190

195191
var model = new PrivacyNoticeViewModel(PrivacyPolicyText, lastUpdatedDate, nextReviewDate);

0 commit comments

Comments
 (0)