Skip to content

Develop/fixes/td 4285 my learning dashboard tray showing wrong counts #444

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
merged 2 commits into from
Jun 27, 2024
Merged

Develop/fixes/td 4285 my learning dashboard tray showing wrong counts #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164e4e2
TD-4285: My Learning Dashboard Tray showing Wrong Counts
Swapnamol Jun 27, 2024
6e62d21
Removed unused temp tables
Swapnamol Jun 27, 2024
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
1 change: 1 addition & 0 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ AS
BEGIN

SELECT
CAST([Sequence] AS int) AS [Key],
RoleUserGroupId,
UserGroupId,
UserGroupName,
Expand Down
1 change: 1 addition & 0 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ AS
BEGIN

SELECT
CAST([Sequence] AS int) AS [Key],
RoleUserGroupId,
rug.UserGroupId,
UserGroupName,
Expand Down
25 changes: 21 additions & 4 deletions ...earningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
-- Modification History
--
-- 24 Jun 2024 OA Initial Revision
-- 27 Jun 2024 SA My Learning Dashboard Tray showing Wrong Counts
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]
Expand All @@ -25,9 +26,7 @@ BEGIN
DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);

INSERT INTO @MyActivity
SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
Expand Down Expand Up @@ -100,6 +99,24 @@ BEGIN
OFFSET @OffsetRows ROWS
FETCH NEXT @FetchRows ROWS ONLY

SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId) > 12 THEN @MaxRows ELSE COUNT(*) END
FROM @MyActivity ma
JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0
JOIN Resources.Resource r ON r.Id = rv.ResourceId
JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = 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
LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
FROM [resources].[ResourceReference] rr
JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
LEFT JOIN ( SELECT DISTINCT CatalogueNodeId
FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId

END
22 changes: 20 additions & 2 deletions ...ngHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
-- Modification History
--
-- 24 Jun 2024 OA Initial Revision
-- 27 Jun 2024 SA Removed unused temp tables
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetMyRecentCompletedDashboardResources]
Expand All @@ -26,7 +27,6 @@ BEGIN
DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);

INSERT INTO @MyActivity
SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
Expand Down Expand Up @@ -96,6 +96,24 @@ ORDER BY ma.ResourceActivityId DESC, rv.Title
OFFSET @OffsetRows ROWS
FETCH NEXT @FetchRows ROWS ONLY

SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId) > 12 THEN @MaxRows ELSE COUNT(*) END
FROM @MyActivity ma
JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0
JOIN Resources.Resource r ON r.Id = rv.ResourceId
JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = 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
LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
FROM [resources].[ResourceReference] rr
JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
LEFT JOIN ( SELECT DISTINCT CatalogueNodeId
FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId

END
2 changes: 1 addition & 1 deletion 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 @@ -6,6 +6,7 @@
-- Modification History
--
-- 24 Jun 2024 OA Initial Revision
-- 27 Jun 2024 SA Removed unused temp tables
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetPopularDashboardResources]
Expand All @@ -25,7 +26,6 @@ BEGIN
DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);


Expand Down
5 changes: 1 addition & 4 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 @@ -6,6 +6,7 @@
-- Modification History
--
-- 24 Jun 2024 OA Initial Revision
-- 27 Jun 2024 SA Removed unused temp tables
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetRatedDashboardResources]
Expand All @@ -25,10 +26,6 @@ BEGIN
DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);


SELECT TOP(@MaxRows) r.Id AS ResourceId
,( SELECT TOP 1 rr.OriginalResourceReferenceId
FROM [resources].[ResourceReference] rr
Expand Down
4 changes: 1 addition & 3 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
-- Modification History
--
-- 24 Jun 2024 OA Initial Revision
-- 27 Jun 2024 SA Removed unused temp tables
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetRecentDashboardResources]
Expand All @@ -25,9 +26,6 @@ BEGIN
DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows

DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);

SELECT TOP(@MaxRows) r.Id AS ResourceId
,( SELECT TOP 1 rr.OriginalResourceReferenceId
FROM [resources].[ResourceReference] rr
Expand Down
1 change: 1 addition & 0 deletions WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CREATE VIEW [hub].[RoleUserGroupView]
AS

SELECT
ROW_NUMBER() OVER(ORDER BY rug.Id) AS [Sequence],
rug.Id AS RoleUserGroupId,
ug.Id AS UserGroupId,
ug.[Name] AS UserGroupName,
Expand Down
2 changes: 0 additions & 2 deletions WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
{
mapping.Map(modelBuilder);
}

modelBuilder.Entity<RoleUserGroupViewModel>().HasNoKey();
}
}
}