Merge pull request #275 from TechnologyEnhancedLearning/Develop/Features/TD-2954-My-Learning-Page-Improvements-in-Performance-Filter-issue-Assessment

sarathlal-sarangadharan · web-flow · commit 863ef330efbc · 2024-04-11T13:53:32.000+01:00
TD-2954: Filter issues for assessment resolved
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
@@ -247,6 +247,7 @@ FROM (
 										  )
 										  OR
 												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										  OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
 										--OR         
 										--(
 										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
@@ -347,7 +348,7 @@ FROM (
 								EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5) 
 								AND
 								(
-									[Res].[ResourceTypeId] = 11
+									[Res].[ResourceTypeId] = 11 AND  [AssessResVer].[AssessmentType]=2
 									AND
 										EXISTS
 										(
@@ -380,7 +381,7 @@ FROM (
 				
 								AND
 								(
-									[Res].[ResourceTypeId] = 11
+									[Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2
 									AND 
 										EXISTS
 											(
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
@@ -162,6 +162,7 @@ FROM (
 										  )
 										  OR
 												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
+												 OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
 
 										--OR         
 										--(
@@ -263,7 +264,7 @@ FROM (
 								EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5) 
 								AND
 								(
-									[Res].[ResourceTypeId] = 11
+									[Res].[ResourceTypeId] = 11 AND  [AssessResVer].[AssessmentType]=2
 									AND
 										EXISTS
 										(
@@ -296,7 +297,7 @@ FROM (
 				
 								AND
 								(
-									[Res].[ResourceTypeId] = 11
+									[Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2
 									AND 
 										EXISTS
 											(
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ FROM (`
`247`	`247`	`)`
`248`	`248`	`OR`
`249`	`249`	`([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)`
	`250`	`+ OR ([Res].[ResourceTypeId] IN (11) AND [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)`
`250`	`251`	`--OR`
`251`	`252`	`--(`
`252`	`253`	`-- ([Res].[ResourceTypeId] IN (1,5,10,12) AND [ResourceActivity].[ActivityStatusId] = 3)`
`@@ -347,7 +348,7 @@ FROM (`
`347`	`348`	`EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5)`
`348`	`349`	`AND`
`349`	`350`	`(`
`350`		`- [Res].[ResourceTypeId] = 11`
	`351`	`+ [Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=2`
`351`	`352`	`AND`
`352`	`353`	`EXISTS`
`353`	`354`	`(`
`@@ -380,7 +381,7 @@ FROM (`
`380`	`381`
`381`	`382`	`AND`
`382`	`383`	`(`
`383`		`- [Res].[ResourceTypeId] = 11`
	`384`	`+ [Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2`
`384`	`385`	`AND`
`385`	`386`	`EXISTS`
`386`	`387`	`(`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ FROM (`
`162`	`162`	`)`
`163`	`163`	`OR`
`164`	`164`	`([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)`
	`165`	`+ OR ([Res].[ResourceTypeId] IN (11) AND [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)`
`165`	`166`
`166`	`167`	`--OR`
`167`	`168`	`--(`
`@@ -263,7 +264,7 @@ FROM (`
`263`	`264`	`EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5)`
`264`	`265`	`AND`
`265`	`266`	`(`
`266`		`- [Res].[ResourceTypeId] = 11`
	`267`	`+ [Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=2`
`267`	`268`	`AND`
`268`	`269`	`EXISTS`
`269`	`270`	`(`
`@@ -296,7 +297,7 @@ FROM (`
`296`	`297`
`297`	`298`	`AND`
`298`	`299`	`(`
`299`		`- [Res].[ResourceTypeId] = 11`
	`300`	`+ [Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2`
`300`	`301`	`AND`
`301`	`302`	`EXISTS`
`302`	`303`	`(`