Skip to content

TD-7606-Replaced ActiveAdminAccounts CTE with active AdminAccounts derived table #3759

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

Open
Auldrin-Possa wants to merge 1 commit into
base: DLS-Release-v1.3.3
Choose a base branch
from
Open

TD-7606-Replaced ActiveAdminAccounts CTE with active AdminAccounts derived table #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public class FrameworkDataService : IFrameworkDataService
FrameworkName,
OwnerAdminID,
(SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 FROM AdminUsers WHERE (AdminID = FW.OwnerAdminID)) AS Owner,
BrandID,
FW.BrandID,
FW.CategoryID,
TopicID,
CreatedDate,
Expand Down
39 changes: 10 additions & 29 deletions DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,8 @@ public partial class UserDataService
0 AS HasBeenPromptedForPrn,
'' AS ProfessionalRegistrationNumber,
NULL AS AdminID";
private const string DelegateUserCardSelectQuery =
@"WITH ActiveAdminAccounts AS (
SELECT UserID, CentreID, ID
FROM AdminAccounts
WHERE Active = 1
)
SELECT
private const string DelegateUserCardSelectQuery =
@"SELECT
da.ID,
da.CandidateNumber,
c.CentreName,
Expand Down Expand Up @@ -78,15 +73,10 @@ FROM DelegateAccounts AS da
INNER JOIN Users AS u ON u.ID = da.UserID
LEFT JOIN UserCentreDetails AS ucd ON ucd.UserID = da.UserID AND ucd.CentreID = da.CentreID
INNER JOIN JobGroups AS jg ON jg.JobGroupID = u.JobGroupID
LEFT JOIN ActiveAdminAccounts AS aaa ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID";
LEFT JOIN (SELECT UserID, CentreID, ID FROM AdminAccounts WHERE Active = 1) AS aaa ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID";

private const string DelegateUserSelectQuery =
@"WITH ActiveAdminAccounts AS (
SELECT UserID, CentreID, ID
FROM AdminAccounts
WHERE Active = 1
)
SELECT
private const string DelegateUserSelectQuery =
@"SELECT
da.ID,
da.Active AS DelegateActive,
da.CandidateNumber,
Expand Down Expand Up @@ -118,14 +108,9 @@ FROM AdminAccounts
u.ProfessionalRegistrationNumber,
u.PrimaryEmail,
ucd.Email,
aaa.ID AS AdminID ";
private const string DelegateUserExportSelectQuery =
@"WITH ActiveAdminAccounts AS (
SELECT UserID, CentreID, ID
FROM AdminAccounts
WHERE Active = 1
)
SELECT
aaa.ID AS AdminID ";
private const string DelegateUserExportSelectQuery =
@"SELECT
da.ID,
da.CandidateNumber,
c.CentreName,
Expand Down Expand Up @@ -162,13 +147,13 @@ FROM DelegateAccounts AS da
INNER JOIN Users AS u ON u.ID = da.UserID
LEFT JOIN UserCentreDetails AS ucd ON ucd.UserID = da.UserID AND ucd.CentreID = da.CentreID
INNER JOIN JobGroups AS jg ON jg.JobGroupID = u.JobGroupID
LEFT JOIN ActiveAdminAccounts AS aaa ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID";
LEFT JOIN (SELECT UserID, CentreID, ID FROM AdminAccounts WHERE Active = 1) AS aaa ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID";
private const string DelegateUserFromTable = @" FROM DelegateAccounts AS da WITH (NOLOCK)
INNER JOIN Centres AS c WITH (NOLOCK) ON c.CentreID = da.CentreID
INNER JOIN Users AS u WITH (NOLOCK) ON u.ID = da.UserID
LEFT JOIN UserCentreDetails AS ucd WITH (NOLOCK) ON ucd.UserID = da.UserID AND ucd.CentreID = da.CentreID
INNER JOIN JobGroups AS jg WITH (NOLOCK) ON jg.JobGroupID = u.JobGroupID
LEFT JOIN ActiveAdminAccounts AS aaa WITH (NOLOCK) ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID ";
LEFT JOIN (SELECT UserID, CentreID, ID FROM AdminAccounts WITH (NOLOCK) WHERE Active = 1) AS aaa ON aaa.UserID = da.UserID AND aaa.CentreID = da.CentreID ";
private const string DelegateWhereConditionTemplate = @" WHERE ((CentreID = @centreId) OR (@centreId= 0))
AND ( FirstName + ' ' + LastName + ' ' + PrimaryEmail + ' ' + COALESCE(Email, '') + ' ' + COALESCE(CandidateNumber, '') LIKE N'%' + @searchString + N'%')
AND ((@isActive = 'Any') OR (@isActive = 'true' AND DelegateActive = 1) OR (@isActive = 'false' AND DelegateActive = 0))
Expand Down Expand Up @@ -416,10 +401,6 @@ public List<DelegateUserCard> GetDelegateUserCardsForExportByCentreId(String sea
commandTimeout: 3000
);

if (delegateUserCards.Any())
{
resultCount = delegateUserCards.Count();
}
return (delegateUserCards, resultCount);
}

Expand Down
Loading