TD-4016: Issue with informal assessment duplicate record while searching

Swapnamol · Swapnamol · commit b00b63df42ab · 2024-05-02T17:22:51.000+01:00
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
@@ -175,7 +175,7 @@ FROM (
 			@searchText IS NULL
             OR 
 				(
-						Charindex(@searchText, [ResVer].[Title]) > 0
+						(Charindex(@searchText, [ResVer].[Title]) > 0
 					OR                          
 						Charindex(@searchText, [ResVer].[Description]) > 0
 					OR  
@@ -189,8 +189,8 @@ FROM (
 									[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]
 								AND   
 									Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0
-								)
-					)
+								) 
+					)) AND [ResourceActivity].ActivityStart is not null 
 				)
 		)
 		AND
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
@@ -90,7 +90,7 @@ FROM (
 			@searchText IS NULL
             OR 
 				(
-						Charindex(@searchText, [ResVer].[Title]) > 0
+						(Charindex(@searchText, [ResVer].[Title]) > 0
 					OR                          
 						Charindex(@searchText, [ResVer].[Description]) > 0
 					OR  
@@ -104,8 +104,8 @@ FROM (
 									[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]
 								AND   
 									Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0
-								)
-					)
+								) 
+					)) AND [ResourceActivity].ActivityStart is not null 
 				)
 		)
 		AND

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ FROM (`
`175`	`175`	`@searchText IS NULL`
`176`	`176`	`OR`
`177`	`177`	`(`
`178`		`- Charindex(@searchText, [ResVer].[Title]) > 0`
	`178`	`+ (Charindex(@searchText, [ResVer].[Title]) > 0`
`179`	`179`	`OR`
`180`	`180`	`Charindex(@searchText, [ResVer].[Description]) > 0`
`181`	`181`	`OR`
`@@ -189,8 +189,8 @@ FROM (`
`189`	`189`	`[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]`
`190`	`190`	`AND`
`191`	`191`	`Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0`
`192`		`- )`
`193`		`- )`
	`192`	`+ )`
	`193`	`+ )) AND [ResourceActivity].ActivityStart is not null`
`194`	`194`	`)`
`195`	`195`	`)`
`196`	`196`	`AND`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ FROM (`
`90`	`90`	`@searchText IS NULL`
`91`	`91`	`OR`
`92`	`92`	`(`
`93`		`- Charindex(@searchText, [ResVer].[Title]) > 0`
	`93`	`+ (Charindex(@searchText, [ResVer].[Title]) > 0`
`94`	`94`	`OR`
`95`	`95`	`Charindex(@searchText, [ResVer].[Description]) > 0`
`96`	`96`	`OR`
`@@ -104,8 +104,8 @@ FROM (`
`104`	`104`	`[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]`
`105`	`105`	`AND`
`106`	`106`	`Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0`
`107`		`- )`
`108`		`- )`
	`107`	`+ )`
	`108`	`+ )) AND [ResourceActivity].ActivityStart is not null`
`109`	`109`	`)`
`110`	`110`	`)`
`111`	`111`	`AND`