Skip to content

Heedls 1038 reinstate archived courses #1356

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 8 commits into from
Aug 19, 2022
Merged

Heedls 1038 reinstate archived courses #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01c1335
HEEDLS-1038 AdminFieldsDataService methods
Aug 18, 2022
d0a5aa5
HEEDLS-1038 resolve simple cases in CourseDataService
Aug 18, 2022
331c234
HEEDLS-1038 split GetCourseStatisticsAtCentreFilteredByCategory into two
Aug 18, 2022
b335dbf
HEEDLS-1038 split GetCoursesAvailableToCentreByCategory
Aug 18, 2022
0c73840
HEEDLS-1038 update tests
Aug 19, 2022
03d38ea
HEEDLS-1038 fix test
Aug 19, 2022
4d7137e
HEEDLS-1038 reorganise code
Aug 19, 2022
5322540
HEEDLS-1038 markups
Aug 19, 2022
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
69 changes: 67 additions & 2 deletions DigitalLearningSolutions.Data.Tests/DataServices/CourseDataServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@ public void GetNumberOfActiveCoursesAtCentreFilteredByCategory_with_filtered_cat
}

[Test]
public void GetNumberOfActiveCoursesAtCentreFilteredByCategory_excludes_courses_from_archived_applications()
public void GetNumberOfActiveCoursesAtCentreFilteredByCategory_includes_courses_from_archived_applications()
{
// When
var count = courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(101, null);

// Then
count.Should().Be(141);
count.Should().Be(144);
}

[Test]
Expand Down Expand Up @@ -345,6 +345,40 @@ public void GetCourseStatisticsAtCentreFilteredByCategory_should_return_course_s
LearningMinutes = "N/A",
};

result.Should().HaveCount(259);
result.First().Should().BeEquivalentTo(expectedFirstCourse);
}

[Test]
public void GetNonArchivedCourseStatisticsAtCentreFilteredByCategory_should_return_course_statistics_correctly()
{
// Given
const int centreId = 101;
int? categoryId = null;

// When
var result = courseDataService.GetNonArchivedCourseStatisticsAtCentreFilteredByCategory(centreId, categoryId).ToList();

// Then
var expectedFirstCourse = new CourseStatistics
{
CustomisationId = 100,
CentreId = 101,
Active = false,
AllCentres = false,
ApplicationId = 1,
ApplicationName = "Entry Level - Win XP, Office 2003/07 OLD",
CustomisationName = "Standard",
DelegateCount = 25,
AllAttempts = 49,
AttemptsPassed = 34,
CompletedCount = 5,
HideInLearnerPortal = false,
CategoryName = "Office 2007",
CourseTopic = "Microsoft Office",
LearningMinutes = "N/A",
};

result.Should().HaveCount(256);
result.First().Should().BeEquivalentTo(expectedFirstCourse);
}
Expand Down Expand Up @@ -463,6 +497,37 @@ public void GetCoursesAvailableToCentreByCategory_returns_expected_values()
IsAssessed = false,
};

result.Should().HaveCount(259);
result.First().Should().BeEquivalentTo(expectedFirstCourse);
}

[Test]
public void GetNonArchivedCoursesAvailableToCentreByCategory_returns_expected_values()
{
// Given
const int centreId = 101;
int? categoryId = null;

// When
var result = courseDataService.GetNonArchivedCoursesAvailableToCentreByCategory(centreId, categoryId)
.ToList();

// Then
var expectedFirstCourse = new CourseAssessmentDetails
{
CustomisationId = 100,
CentreId = 101,
ApplicationId = 1,
ApplicationName = "Entry Level - Win XP, Office 2003/07 OLD",
CustomisationName = "Standard",
Active = false,
CategoryName = "Undefined",
CourseTopic = "Undefined",
HasDiagnostic = false,
HasLearning = true,
IsAssessed = false,
};

result.Should().HaveCount(256);
result.First().Should().BeEquivalentTo(expectedFirstCourse);
}
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,14 @@ public void GetCourseOptionAlphabeticalListForCentre_calls_data_service()
const int categoryId = 1;
const int centreId = 1;
var courseOptions = new List<CourseAssessmentDetails>();
A.CallTo(() => courseDataService.GetCoursesAvailableToCentreByCategory(centreId, categoryId))
A.CallTo(() => courseDataService.GetNonArchivedCoursesAvailableToCentreByCategory(centreId, categoryId))
.Returns(courseOptions);

// When
var result = courseService.GetCourseOptionsAlphabeticalListForCentre(centreId, categoryId);

// Then
A.CallTo(() => courseDataService.GetCoursesAvailableToCentreByCategory(centreId, categoryId))
A.CallTo(() => courseDataService.GetNonArchivedCoursesAvailableToCentreByCategory(centreId, categoryId))
.MustHaveHappened();
result.Should().BeEquivalentTo(courseOptions);
}
Expand Down
4 changes: 1 addition & 3 deletions DigitalLearningSolutions.Data/DataServices/CourseAdminFieldsDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ LEFT JOIN CoursePrompts AS cp2
LEFT JOIN CoursePrompts AS cp3
ON cu.CourseField3PromptID = cp3.CoursePromptID
INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = cu.ApplicationID
WHERE ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4
WHERE ap.DefaultContentTypeID <> 4
AND cu.CustomisationID = @customisationId",
new { customisationId }
).Single();
Expand Down Expand Up @@ -183,7 +182,6 @@ int customisationId
FROM Customisations AS cu
INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = cu.ApplicationID
WHERE CustomisationID = @customisationId
AND ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
new { customisationId }
).Single();
Expand Down
153 changes: 87 additions & 66 deletions DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public interface ICourseDataService

IEnumerable<CourseStatistics> GetCourseStatisticsAtCentreFilteredByCategory(int centreId, int? categoryId);

IEnumerable<CourseStatistics> GetNonArchivedCourseStatisticsAtCentreFilteredByCategory(int centreId, int? categoryId);

IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId);

DelegateCourseInfo? GetDelegateCourseInfoByProgressId(int progressId);
Expand All @@ -38,6 +40,8 @@ public interface ICourseDataService

IEnumerable<CourseAssessmentDetails> GetCoursesAvailableToCentreByCategory(int centreId, int? categoryId);

IEnumerable<CourseAssessmentDetails> GetNonArchivedCoursesAvailableToCentreByCategory(int centreId, int? categoryId);

IEnumerable<ApplicationDetails> GetApplicationsAvailableToCentreByCategory(int centreId, int? categoryId);

IEnumerable<ApplicationDetails> GetApplicationsByBrandId(int brandId);
Expand Down Expand Up @@ -141,9 +145,51 @@ FROM dbo.AssessAttempts AS aa
WHERE aa.CustomisationID = cu.CustomisationID AND aa.[Status] = 1
AND can.CandidateId = ca.CandidateId) AS AttemptsPassed";

private const string TutorialWithLearningCountQuery =
@"SELECT COUNT(ct.TutorialID)
FROM CustomisationTutorials AS ct
INNER JOIN Tutorials AS t ON ct.TutorialID = t.TutorialID
WHERE ct.Status = 1 AND ct.CustomisationID = c.CustomisationID";

private const string TutorialWithDiagnosticCountQuery =
@"SELECT COUNT(ct.TutorialID)
FROM CustomisationTutorials AS ct
INNER JOIN Tutorials AS t ON ct.TutorialID = t.TutorialID
INNER JOIN Customisations AS c ON c.CustomisationID = ct.CustomisationID
INNER JOIN Applications AS a ON a.ApplicationID = c.ApplicationID
WHERE ct.DiagStatus = 1 AND a.DiagAssess = 1 AND ct.CustomisationID = c.CustomisationID
AND a.ArchivedDate IS NULL AND a.DefaultContentTypeID <> 4";

private readonly IDbConnection connection;
private readonly ILogger<CourseDataService> logger;

private readonly string CourseStatisticsQuery = @$"SELECT
cu.CustomisationID,
cu.CentreID,
cu.Active,
cu.AllCentres,
ap.ApplicationId,
ap.ApplicationName,
cu.CustomisationName,
{DelegateCountQuery},
{CompletedCountQuery},
{AllAttemptsQuery},
{AttemptsPassedQuery},
cu.HideInLearnerPortal,
cc.CategoryName,
ct.CourseTopic,
cu.LearningTimeMins AS LearningMinutes,
cu.IsAssessed
FROM dbo.Customisations AS cu
INNER JOIN dbo.CentreApplications AS ca ON ca.ApplicationID = cu.ApplicationID
INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = ca.ApplicationID
INNER JOIN dbo.CourseCategories AS cc ON cc.CourseCategoryID = ap.CourseCategoryID
INNER JOIN dbo.CourseTopics AS ct ON ct.CourseTopicID = ap.CourseTopicId
WHERE (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
AND (cu.CentreID = @centreId OR (cu.AllCentres = 1 AND ca.Active = 1))
AND ca.CentreID = @centreId
AND ap.DefaultContentTypeID <> 4";

private readonly string selectDelegateCourseInfoQuery =
@$"SELECT
cu.CustomisationID AS CustomisationId,
Expand Down Expand Up @@ -194,6 +240,27 @@ FROM Customisations cu
LEFT OUTER JOIN AdminUsers auEnrolledBy ON auEnrolledBy.AdminID = pr.EnrolledByAdminID
INNER JOIN Candidates AS ca ON ca.CandidateID = pr.CandidateID";

private readonly string courseAssessmentDetailsQuery = $@"SELECT
c.CustomisationID,
c.CentreID,
c.ApplicationID,
ap.ApplicationName,
c.CustomisationName,
c.Active,
c.IsAssessed,
cc.CategoryName,
ct.CourseTopic,
CASE WHEN ({TutorialWithLearningCountQuery}) > 0 THEN 1 ELSE 0 END AS HasLearning,
CASE WHEN ({TutorialWithDiagnosticCountQuery}) > 0 THEN 1 ELSE 0 END AS HasDiagnostic
FROM Customisations AS c
INNER JOIN Applications AS ap ON ap.ApplicationID = c.ApplicationID
INNER JOIN CourseCategories AS cc ON ap.CourseCategoryId = cc.CourseCategoryId
INNER JOIN CourseTopics AS ct ON ap.CourseTopicId = ct.CourseTopicId
WHERE (c.CentreID = @centreId OR c.AllCentres = 1)
AND (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
AND EXISTS (SELECT CentreApplicationID FROM CentreApplications WHERE (ApplicationID = c.ApplicationID) AND (CentreID = @centreID) AND (Active = 1))
AND ap.DefaultContentTypeID <> 4";

public CourseDataService(IDbConnection connection, ILogger<CourseDataService> logger)
{
this.connection = connection;
Expand Down Expand Up @@ -309,7 +376,6 @@ FROM dbo.Customisations AS cu
AND cu.Active = 1
AND cu.CentreID = @centreId
AND ca.CentreID = @centreId
AND ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
new { centreId, adminCategoryId }
);
Expand All @@ -321,33 +387,18 @@ public IEnumerable<CourseStatistics> GetCourseStatisticsAtCentreFilteredByCatego
)
{
return connection.Query<CourseStatistics>(
@$"SELECT
cu.CustomisationID,
cu.CentreID,
cu.Active,
cu.AllCentres,
ap.ApplicationId,
ap.ApplicationName,
cu.CustomisationName,
{DelegateCountQuery},
{CompletedCountQuery},
{AllAttemptsQuery},
{AttemptsPassedQuery},
cu.HideInLearnerPortal,
cc.CategoryName,
ct.CourseTopic,
cu.LearningTimeMins AS LearningMinutes,
cu.IsAssessed
FROM dbo.Customisations AS cu
INNER JOIN dbo.CentreApplications AS ca ON ca.ApplicationID = cu.ApplicationID
INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = ca.ApplicationID
INNER JOIN dbo.CourseCategories AS cc ON cc.CourseCategoryID = ap.CourseCategoryID
INNER JOIN dbo.CourseTopics AS ct ON ct.CourseTopicID = ap.CourseTopicId
WHERE (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
AND (cu.CentreID = @centreId OR (cu.AllCentres = 1 AND ca.Active = 1))
AND ca.CentreID = @centreId
AND ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
CourseStatisticsQuery,
new { centreId, categoryId }
);
}

public IEnumerable<CourseStatistics> GetNonArchivedCourseStatisticsAtCentreFilteredByCategory(
int centreId,
int? categoryId
)
{
return connection.Query<CourseStatistics>(
@$"{CourseStatisticsQuery} AND ap.ArchivedDate IS NULL",
new { centreId, categoryId }
);
}
Expand All @@ -357,7 +408,6 @@ public IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId)
return connection.Query<DelegateCourseInfo>(
$@"{selectDelegateCourseInfoQuery}
WHERE pr.CandidateID = @delegateId
AND ap.ArchivedDate IS NULL
AND pr.RemovedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
new { delegateId }
Expand All @@ -369,7 +419,6 @@ AND pr.RemovedDate IS NULL
return connection.QuerySingleOrDefault<DelegateCourseInfo>(
$@"{selectDelegateCourseInfoQuery}
WHERE pr.ProgressID = @progressId
AND ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
new { progressId }
);
Expand Down Expand Up @@ -464,43 +513,16 @@ FROM Customisations cu

public IEnumerable<CourseAssessmentDetails> GetCoursesAvailableToCentreByCategory(int centreId, int? categoryId)
{
const string tutorialWithLearningCountQuery =
@"SELECT COUNT(ct.TutorialID)
FROM CustomisationTutorials AS ct
INNER JOIN Tutorials AS t ON ct.TutorialID = t.TutorialID
WHERE ct.Status = 1 AND ct.CustomisationID = c.CustomisationID";

const string tutorialWithDiagnosticCountQuery =
@"SELECT COUNT(ct.TutorialID)
FROM CustomisationTutorials AS ct
INNER JOIN Tutorials AS t ON ct.TutorialID = t.TutorialID
INNER JOIN Customisations AS c ON c.CustomisationID = ct.CustomisationID
INNER JOIN Applications AS a ON a.ApplicationID = c.ApplicationID
WHERE ct.DiagStatus = 1 AND a.DiagAssess = 1 AND ct.CustomisationID = c.CustomisationID
AND a.ArchivedDate IS NULL AND a.DefaultContentTypeID <> 4";
return connection.Query<CourseAssessmentDetails>(
courseAssessmentDetailsQuery,
new { centreId, categoryId }
);
}

public IEnumerable<CourseAssessmentDetails> GetNonArchivedCoursesAvailableToCentreByCategory(int centreId, int? categoryId)
{
return connection.Query<CourseAssessmentDetails>(
$@"SELECT
c.CustomisationID,
c.CentreID,
c.ApplicationID,
ap.ApplicationName,
c.CustomisationName,
c.Active,
c.IsAssessed,
cc.CategoryName,
ct.CourseTopic,
CASE WHEN ({tutorialWithLearningCountQuery}) > 0 THEN 1 ELSE 0 END AS HasLearning,
CASE WHEN ({tutorialWithDiagnosticCountQuery}) > 0 THEN 1 ELSE 0 END AS HasDiagnostic
FROM Customisations AS c
INNER JOIN Applications AS ap ON ap.ApplicationID = c.ApplicationID
INNER JOIN CourseCategories AS cc ON ap.CourseCategoryId = cc.CourseCategoryId
INNER JOIN CourseTopics AS ct ON ap.CourseTopicId = ct.CourseTopicId
WHERE ap.ArchivedDate IS NULL
AND (c.CentreID = @centreId OR c.AllCentres = 1)
AND (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
AND EXISTS (SELECT CentreApplicationID FROM CentreApplications WHERE (ApplicationID = c.ApplicationID) AND (CentreID = @centreID) AND (Active = 1))
AND ap.DefaultContentTypeID <> 4",
@$"{courseAssessmentDetailsQuery} AND ap.ArchivedDate IS NULL",
new { centreId, categoryId }
);
}
Expand Down Expand Up @@ -567,7 +589,6 @@ FROM Candidates AS cn
INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = c.ApplicationID
WHERE cn.CentreID = @centreID
AND (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
AND ap.ArchivedDate IS NULL
AND ap.DefaultContentTypeID <> 4",
new { centreId, categoryId }
);
Expand Down
Loading