Skip to content

Commit 09ac5a7

Browse files
committed
Removes join on result self assessment ID from GetSupervisorComments method query
1 parent 6b93697 commit 09ac5a7

File tree

1 file changed

+10
-26
lines changed

1 file changed

+10
-26
lines changed

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -187,33 +187,17 @@ int candidateAssessmentSupervisorVerificationId
187187
public SupervisorComment? GetSupervisorComments(int delegateUserId, int resultId)
188188
{
189189
return connection.Query<SupervisorComment>(
190-
@"SELECT
191-
sar.AssessmentQuestionID,
192-
sea.Name,
193-
au.Forename + ' ' + au.Surname As SupervisorName,
194-
sasr.RoleName,
195-
sasv.Comments,
196-
sar.DelegateUserID,
197-
sar.CompetencyID,
198-
com.Name AS CompetencyName,
199-
sar.SelfAssessmentID,
200-
sasv.CandidateAssessmentSupervisorID,
201-
sasv.SelfAssessmentResultId,
202-
sasv.Verified,
203-
sar.ID,
204-
sstrc.CompetencyGroupID,
205-
sea.Vocabulary,
206-
sasv.SignedOff,
207-
sea.ReviewerCommentsLabel
190+
@"SELECT TOP (1) sar.AssessmentQuestionID, sea.Name, au.Forename + ' ' + au.Surname AS SupervisorName, sasr.RoleName, sasv.Comments, sar.DelegateUserID, sar.CompetencyID, com.Name AS CompetencyName, sar.SelfAssessmentID, sasv.CandidateAssessmentSupervisorID,
191+
sasv.SelfAssessmentResultId, sasv.Verified, sar.ID, sstrc.CompetencyGroupID, sea.Vocabulary, sasv.SignedOff, sea.ReviewerCommentsLabel
208192
FROM SelfAssessmentResultSupervisorVerifications AS sasv INNER JOIN
209-
SelfAssessmentResults AS sar ON sasv.SelfAssessmentResultId = sar.ID AND sasv.Superceded = 0 INNER JOIN
210-
SelfAssessments AS sea ON sar.SelfAssessmentID = sea.ID INNER JOIN
211-
SelfAssessmentStructure AS sstrc ON sar.CompetencyID = sstrc.CompetencyID INNER JOIN
212-
Competencies AS com ON sar.CompetencyID = com.ID INNER JOIN
213-
CandidateAssessmentSupervisors AS cas ON sasv.CandidateAssessmentSupervisorID = cas.ID INNER JOIN
214-
SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
215-
AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID INNER JOIN
216-
SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
193+
SelfAssessmentResults AS sar ON sasv.SelfAssessmentResultId = sar.ID AND sasv.Superceded = 0 INNER JOIN
194+
SelfAssessmentStructure AS sstrc ON sar.CompetencyID = sstrc.CompetencyID INNER JOIN
195+
Competencies AS com ON sar.CompetencyID = com.ID INNER JOIN
196+
CandidateAssessmentSupervisors AS cas ON sasv.CandidateAssessmentSupervisorID = cas.ID INNER JOIN
197+
SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
198+
AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID INNER JOIN
199+
SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID INNER JOIN
200+
SelfAssessments AS sea ON sstrc.SelfAssessmentID = sea.ID
217201
WHERE (sar.DelegateUserID = @delegateUserId) AND (sasv.SelfAssessmentResultId = @resultId)",
218202
new { delegateUserId, resultId }
219203
).FirstOrDefault();

0 commit comments

Comments
 (0)