Skip to content

Commit 310d905

Browse files
authored
Merge pull request #3303 from TechnologyEnhancedLearning/Develop/Fix/TD-5659-Duplicate-records-of-the-reviewer
TD-5659-Modify the SQL query to retrieve distinct records and avoid records for which a request has already been sent.
2 parents 003f4b5 + e0823ed commit 310d905

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,7 +2066,7 @@ FROM FrameworkComments
20662066
public IEnumerable<CollaboratorDetail> GetReviewersForFrameworkId(int frameworkId)
20672067
{
20682068
return connection.Query<CollaboratorDetail>(
2069-
@"SELECT
2069+
@"SELECT DISTINCT
20702070
fc.ID,
20712071
fc.FrameworkID,
20722072
fc.AdminID,
@@ -2077,8 +2077,11 @@ public IEnumerable<CollaboratorDetail> GetReviewersForFrameworkId(int frameworkI
20772077
FROM FrameworkCollaborators fc
20782078
INNER JOIN AdminUsers AS au ON fc.AdminID = au.AdminID
20792079
LEFT OUTER JOIN FrameworkReviews ON fc.ID = FrameworkReviews.FrameworkCollaboratorID
2080-
WHERE (fc.FrameworkID = @FrameworkID) AND (FrameworkReviews.ID IS NULL) AND (fc.IsDeleted=0) OR
2081-
(fc.FrameworkID = @FrameworkID) AND (FrameworkReviews.Archived IS NOT NULL) AND (fc.IsDeleted=0)",
2080+
WHERE ((fc.FrameworkID = @FrameworkID) AND (FrameworkReviews.ID IS NULL) AND (fc.IsDeleted=0)) OR
2081+
((fc.FrameworkID = @FrameworkID) AND (FrameworkReviews.Archived IS NOT NULL) AND (fc.IsDeleted=0))
2082+
AND
2083+
(fc.ID Not in ( Select FrameworkCollaboratorID from FrameworkReviews where FrameworkID = @FrameworkID AND
2084+
FrameworkReviews.Archived IS NULL AND FrameworkCollaboratorID = fc.ID))",
20822085
new { frameworkId }
20832086
);
20842087
}

0 commit comments

Comments
 (0)