Skip to content

Reposition join before variable use #1760

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 1 commit into from
Apr 2, 2026
Merged

Reposition join before variable use #1760

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
22 changes: 12 additions & 10 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,17 @@ BEGIN
AND rv.Id = r.CurrentResourceVersionId
AND rv.Deleted = 0

JOIN hierarchy.NodeResource nr
ON r.Id = nr.ResourceId AND nr.Deleted = 0
JOIN hierarchy.Node n
ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
JOIN hierarchy.NodePath np
ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
JOIN hierarchy.NodeVersion nv
ON nv.NodeId = np.CatalogueNodeId AND nv.VersionStatusId = 2 AND nv.Deleted = 0
JOIN hierarchy.CatalogueNodeVersion cnv
ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0

-- Deterministic ResourceReference lookup
OUTER APPLY (
SELECT TOP 1 rr.OriginalResourceReferenceId
Expand Down Expand Up @@ -135,16 +146,7 @@ BEGIN
ON r.CurrentResourceVersionId = rvrs.ResourceVersionId
AND rvrs.Deleted = 0

JOIN hierarchy.NodeResource nr
ON r.Id = nr.ResourceId AND nr.Deleted = 0
JOIN hierarchy.Node n
ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
JOIN hierarchy.NodePath np
ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
JOIN hierarchy.NodeVersion nv
ON nv.NodeId = np.CatalogueNodeId AND nv.VersionStatusId = 2 AND nv.Deleted = 0
JOIN hierarchy.CatalogueNodeVersion cnv
ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0


-- Bookmark lookup using same ResourceReference
LEFT JOIN hub.UserBookmark ub
Expand Down
14 changes: 8 additions & 6 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ BEGIN
ON rvrs.ResourceVersionId = r.CurrentResourceVersionId
AND rvrs.RatingCount > 0

-- Hierarchy joins
JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId AND nv.VersionStatusId = 2 AND nv.Deleted = 0
JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0

-- Deterministic ResourceReference lookup
OUTER APPLY (
SELECT TOP 1 rr.OriginalResourceReferenceId
Expand Down Expand Up @@ -129,12 +136,7 @@ BEGIN
GROUP BY rp.ResourceVersionId
) rpAgg ON rpAgg.ResourceVersionId = r.CurrentResourceVersionId

-- Hierarchy joins
JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId AND nv.VersionStatusId = 2 AND nv.Deleted = 0
JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0


-- Bookmark lookup
LEFT JOIN hub.UserBookmark ub
Expand Down
Loading