Skip to content

Commit 70ff0cb

Browse files
TD-3903 Resolving branch conflict
1 parent c427e6d commit 70ff0cb

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

DigitalLearningSolutions.Web/Services/CentresService.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ void UpdateCentreManagerDetails(
4343
string? GetCentreName(int centreId);
4444

4545
IEnumerable<(int, string)> GetCentresForDelegateSelfRegistrationAlphabetical();
46+
(bool autoRegistered, string? autoRegisterManagerEmail) GetCentreAutoRegisterValues(int centreId);
4647

4748
}
4849

@@ -147,5 +148,10 @@ public void UpdateCentreManagerDetails(int centreId, string firstName, string la
147148
{
148149
return centresDataService.GetCentresForDelegateSelfRegistrationAlphabetical();
149150
}
151+
152+
public (bool autoRegistered, string? autoRegisterManagerEmail) GetCentreAutoRegisterValues(int centreId)
153+
{
154+
return centresDataService.GetCentreAutoRegisterValues(centreId);
155+
}
150156
}
151157
}

DigitalLearningSolutions.Web/Services/UserService.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ string registrationConfirmationHash
134134
void ActivateDelegateUser(int delegateId);
135135
int GetUserIdFromDelegateId(int delegateId);
136136
void DeleteUserAndAccounts(int userId);
137+
public bool PrimaryEmailInUseAtCentres(string email);
138+
bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId);
139+
int? GetUserIdByAdminId(int adminId);
140+
AdminUser? GetAdminUserByEmailAddress(string emailAddress);
141+
137142
}
138143

139144
public class UserService : IUserService
@@ -746,5 +751,25 @@ public void DeleteUserAndAccounts(int userId)
746751
userDataService.DeleteUserAndAccounts(userId);
747752

748753
}
754+
755+
public bool PrimaryEmailInUseAtCentres(string email)
756+
{
757+
return userDataService.PrimaryEmailInUseAtCentres(email);
758+
}
759+
760+
public bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId)
761+
{
762+
return userDataService.CentreSpecificEmailIsInUseAtCentre(email, centreId);
763+
}
764+
765+
public int? GetUserIdByAdminId(int adminId)
766+
{
767+
return userDataService.GetUserIdByAdminId(adminId);
768+
}
769+
770+
public AdminUser? GetAdminUserByEmailAddress(string emailAddress)
771+
{
772+
return userDataService.GetAdminUserByEmailAddress(emailAddress);
773+
}
749774
}
750775
}

0 commit comments

Comments
 (0)