Skip to content

DLSV2-368 DLSV2-369 Fixes relating to broken tests from previous merge #670

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 3 commits into from
Oct 12, 2021
Merged

DLSV2-368 DLSV2-369 Fixes relating to broken tests from previous merge #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d327fe
DLSV2-368 Removes unused service requests to return individual strings
kevwhitt-hee Oct 12, 2021
bfb682e
DLSV2-368 Updates tests to include new fields in expected result
kevwhitt-hee Oct 12, 2021
a8f6b29
DLSV2-369 Migration to update SelfAssessmentStructure ordering where …
kevwhitt-hee Oct 12, 2021
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
22 changes: 22 additions & 0 deletions ...alLearningSolutions.Data.Migrations/202110121601_UpdateSelfAssessmentStructureOrdering.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202110121601)]
public class UpdateSelfAssessmentStructureOrdering : Migration
{
public override void Up()
{
Execute.Sql(@"WITH T AS (SELECT ID, SelfAssessmentID, CompetencyID, Ordering, ROW_NUMBER() OVER(Partition By SelfAssessmentID Order By ID) As NewOrdering
FROM SelfAssessmentStructure
WHERE Ordering = 1)
UPDATE SelfAssessmentStructure
SET Ordering = T.NewOrdering
FROM SelfAssessmentStructure AS sas INNER JOIN T ON T.ID = sas.ID
WHERE T.NewOrdering > 1");
}
public override void Down()
{

}
}
}
8 changes: 6 additions & 2 deletions DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment(
bool unprocessedUpdates = false,
bool linearNavigation = true,
bool useDescriptionExpanders = true,
string vocabulary = "Capability"
string vocabulary = "Capability",
string verificationRoleName = "Supervisor",
string signOffRoleName = "Supervisor"
)
{
return new CurrentSelfAssessment()
Expand All @@ -35,7 +37,9 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment(
UnprocessedUpdates = unprocessedUpdates,
LinearNavigation = linearNavigation,
UseDescriptionExpanders = useDescriptionExpanders,
Vocabulary = vocabulary
Vocabulary = vocabulary,
VerificationRoleName = verificationRoleName,
SignOffRoleName = signOffRoleName
};
}

Expand Down
20 changes: 0 additions & 20 deletions DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ public interface ISelfAssessmentService
IEnumerable<Administrator> GetValidSupervisorsForActivity(int centreId, int selfAssessmentId);
Administrator GetSupervisorByAdminId(int supervisorAdminId);
IEnumerable<SupervisorSignOff>? GetSupervisorSignOffsForCandidateAssessment(int selfAssessmentId, int candidateId);
string GetSignOffSupervisorRoleForSelfAssessment(int selfAssessmentId);
string GetVerificationSupervisorRoleForSelfAssessment(int selfAssessmentId);
//UPDATE
void UpdateLastAccessed(int selfAssessmentId, int candidateId);
void SetSubmittedDateNow(int selfAssessmentId, int candidateId);
Expand Down Expand Up @@ -853,23 +851,5 @@ public void UpdateCandidateAssessmentSupervisorVerificationEmailSent(int candida
new { candidateAssessmentSupervisorVerificationId }
);
}

public string GetSignOffSupervisorRoleForSelfAssessment(int selfAssessmentId)
{
return connection.Query<string>(
@"SELECT COALESCE
((SELECT TOP (1) RoleName
FROM SelfAssessmentSupervisorRoles
WHERE (SelfAssessmentReview = 1) AND (SelfAssessmentID = @selfAssessmentId)), 'Supervisor') AS SignOffRoleName", new { selfAssessmentId }).FirstOrDefault();
}

public string GetVerificationSupervisorRoleForSelfAssessment(int selfAssessmentId)
{
return connection.Query<string>(
@"SELECT COALESCE
((SELECT TOP (1) RoleName
FROM SelfAssessmentSupervisorRoles
WHERE (ResultsReview = 1) AND (SelfAssessmentID = @selfAssessmentId) AND (SELECT COUNT(*) FROM SelfAssessmentSupervisorRoles WHERE (ResultsReview = 1) AND (SelfAssessmentID = @selfAssessmentId)) = 1), 'Supervisor') AS SignOffRoleName", new { selfAssessmentId }).FirstOrDefault();
}
}
}