Skip to content

Merge Gov Notify cahnges to Test #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnjuJose011 merged 7 commits into from
May 21, 2026
Merged

Merge Gov Notify cahnges to Test #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be465f4
TD-5675: Replacement of SMTP notifications by GovNotify service.
ArunimaGeorge Jun 30, 2025
c4d5b7f
Merge pull request #203 from TechnologyEnhancedLearning/Develop/Featu…
swapnamol-abraham Jul 2, 2025
b7db68d
Adding OpenApi config details.
ArunimaGeorge Jul 7, 2025
4ad2775
TD-5790: Save Successful email transactions for One-off emails
ArunimaGeorge Jul 11, 2025
edc6312
Merge pull request #212 from TechnologyEnhancedLearning/Develop/Featu…
ArunimaGeorge Jul 11, 2025
fd66d02
Merge latest RC changes to Messaging Service.
ArunimaGeorge Apr 8, 2026
f39edd3
Merge pull request #313 from TechnologyEnhancedLearning/Merge-RC-to-M…
ArunimaGeorge Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions LearningHub.Nhs.UserApi.Services.Interface/IOpenApiHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace LearningHub.Nhs.UserApi.Services.Interface
{
using System.Net.Http;

/// <summary>
/// The IOpenApiHttpClient.
/// </summary>
public interface IOpenApiHttpClient
{
/// <summary>
/// The get client.
/// </summary>
/// <returns>
/// The <see cref="HttpClient"/>.
/// </returns>
HttpClient GetClient();
}
}
24 changes: 12 additions & 12 deletions LearningHub.Nhs.UserApi.Services.UnitTests/RegistrationServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public async Task GetRegistrationStatus_ExistingEmail_BlueUser()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var status = await registrationService.GetRegistrationStatus("test@here.com", this.ipAddress);

Assert.IsType<EmailRegistrationStatus>(status);
Expand Down Expand Up @@ -79,7 +79,7 @@ public async Task GetRegistrationStatus_ExistingEmail_NonBlueUser()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, userGroupRepositoryMock.Object, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, userGroupRepositoryMock.Object, null, null, null, this.countryLookupRepoMock.Object, null);
var status = await registrationService.GetRegistrationStatus("test@here.com", this.ipAddress);

Assert.IsType<EmailRegistrationStatus>(status);
Expand All @@ -103,7 +103,7 @@ public async Task GetRegistrationStatus_NonExistingEmail_BlueUser()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var status = await registrationService.GetRegistrationStatus("test@here.com", this.ipAddress);

Assert.IsType<EmailRegistrationStatus>(status);
Expand All @@ -127,7 +127,7 @@ public async Task GetRegistrationStatus_NonExistingEmail_NonBlueUser()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var status = await registrationService.GetRegistrationStatus("test@here.com", this.ipAddress);

Assert.IsType<EmailRegistrationStatus>(status);
Expand All @@ -145,7 +145,7 @@ public async Task RegisterUser_Invalid_NoEmailOrNames()
{
var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -177,7 +177,7 @@ public async Task RegisterUser_MissingRegionForEngland()
{
var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -207,7 +207,7 @@ public async Task RegisterUser_MissingCountryJobRoleSpecialtyAndLocation()
{
var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, null, null, null, null, null, null, null, null, null, null, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -252,7 +252,7 @@ public async Task RegisterUser_GMCFailure()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -294,7 +294,7 @@ public async Task RegisterUser_GDCFailure()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -336,7 +336,7 @@ public async Task RegisterUser_NMCFailure()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, medicalcouncilServiceMock.Object, null, null, optionsMock.Object, null, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -381,7 +381,7 @@ public async Task RegisterUser_UserAlreadyExists()

var optionsMock = new Mock<IOptions<Settings>>();

var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, null, userServiceMock.Object, null, optionsMock.Object, null, medicalCouncilRepositoryMock.Object, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(null, null, jobRoleRepositoryMock.Object, null, null, null, null, null, null, null, null, null, userServiceMock.Object, null, optionsMock.Object, null, medicalCouncilRepositoryMock.Object, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down Expand Up @@ -456,7 +456,7 @@ public async Task RegisterUser_Success()
var emailLogRepositoryMock = new Mock<IEmailLogRepository>();
emailLogRepositoryMock.Setup(r => r.CreateAsync(It.IsAny<int>(), It.IsAny<EmailLog>()));

var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, jobRoleRepositoryMock.Object, userUserGroupRepositoryMock.Object, userEmploymentRepositoryMock.Object, emailTemplateRepositoryMock.Object, emailLogRepositoryMock.Object, systemSettingsRepositoryMock.Object, userPasswordValidationTokenRepositoryMock.Object, tenantRepositoryMock.Object, tenantSmtpRepositoryMock.Object, null, userServiceMock.Object, userHistoryServiceMock.Object, this.GetSettings(), loginWizardServiceMock.Object, null, null, null, null, null, this.countryLookupRepoMock.Object);
var registrationService = new RegistrationService(userRepositoryMock.Object, userGroupTypeInputValidationRepositoryMock.Object, jobRoleRepositoryMock.Object, userUserGroupRepositoryMock.Object, userEmploymentRepositoryMock.Object, emailTemplateRepositoryMock.Object, emailLogRepositoryMock.Object, systemSettingsRepositoryMock.Object, userPasswordValidationTokenRepositoryMock.Object, tenantRepositoryMock.Object, tenantSmtpRepositoryMock.Object, null, userServiceMock.Object, userHistoryServiceMock.Object, this.GetSettings(), loginWizardServiceMock.Object, null, null, null, null, null, this.countryLookupRepoMock.Object, null);
var validationResult = await registrationService.RegisterUser(
new RegistrationRequestViewModel()
{
Expand Down
6 changes: 6 additions & 0 deletions LearningHub.Nhs.UserApi.Services.UnitTests/UserServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ public async Task GetUserRole_Administrator()
null,
null,
null,
null,
null);

var role = await userService.GetUserRoleAsync(1);
Expand Down Expand Up @@ -591,6 +592,7 @@ public async Task GetUserRole_BlueUser()
null,
null,
null,
null,
null);

var role = await userService.GetUserRoleAsync(1);
Expand Down Expand Up @@ -836,6 +838,7 @@ public async Task GetUserRole_none()
null,
null,
null,
null,
null);

var role = await userService.GetUserRoleAsync(1);
Expand Down Expand Up @@ -885,6 +888,7 @@ public async Task UpdateUserSecurityQuestions_Create()
null,
null,
this.NewMapper(),
null,
null);

await userService.UpdateUserSecurityQuestions(userSecurityQuestions, userId);
Expand Down Expand Up @@ -936,6 +940,7 @@ public async Task UpdateUserSecurityQuestions_CreateAndUpdate()
null,
null,
this.NewMapper(),
null,
null);

await userService.UpdateUserSecurityQuestions(userSecurityQuestions, userId);
Expand Down Expand Up @@ -977,6 +982,7 @@ public async Task InvalidateElfhUserCache_InvalidateSuccess()
this.elfhCacheSettingOptions,
elfhCacheMock.Object,
this.NewMapper(),
null,
null);

await userService.InvalidateElfhUserCacheAsync(123456, "test.user", CancellationToken.None);
Expand Down
Loading
Loading