Skip to content

HEEDLS-659 - implemented action plan resource on current page sans fe… #780

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
Dec 6, 2021
Merged

HEEDLS-659 - implemented action plan resource on current page sans fe… #780

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
8fadd66
HEEDLS-659 - implemented action plan resource on current page sans fe…
DanBloxham-sw Nov 30, 2021
1e81f89
HEEDLS-659 - fix mobile button spacing, add todo comment
DanBloxham-sw Nov 30, 2021
a8d2546
Merge branch 'master' into HEEDLS-659-ShowActionPlanInCurrent
DanBloxham-sw Dec 1, 2021
e8f8a7c
HEEDLS-659 - implement signposting feature management to action plan …
DanBloxham-sw Dec 1, 2021
be741ae
Merge branch master into HEEDLS-659
DanBloxham-sw Dec 2, 2021
9ce6eae
HEEDLS-659 - review markups and new tags
DanBloxham-sw Dec 2, 2021
b2c5fa1
HEEDLS-659 - switch tags, update LastAccess, review markups
DanBloxham-sw Dec 3, 2021
0a253b8
HEEDLS-659 - rename AccessLearningResource to be more descriptive
DanBloxham-sw Dec 3, 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
165 changes: 144 additions & 21 deletions DigitalLearningSolutions.Data.Tests/DataServices/LearningLogItemsDataServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
namespace DigitalLearningSolutions.Data.Tests.DataServices
{
using System;
using System.Linq;
using System.Transactions;
using DigitalLearningSolutions.Data.DataServices;
using DigitalLearningSolutions.Data.Models.LearningResources;
using DigitalLearningSolutions.Data.Tests.TestHelpers;
using FluentAssertions;
using FluentAssertions.Execution;
Expand Down Expand Up @@ -57,27 +59,14 @@ public void InsertLearningLogItem_inserts_expected_record()
using (new AssertionScope())
{
result.Should().NotBeNull();
result!.LoggedById.Should().Be(delegateId);
result.LoggedDate.Should().Be(addedDate);
result.LinkedCompetencyLearningResourceId.Should().Be(competencyLearningResourceId);
result.ExternalUri.Should().Be(resourceLink);
result.Activity.Should().Be(resourceName);
result.ActivityType.Should().Be("Learning Hub Resource");
result.LearningLogItemId.Should().NotBe(0);
result.IcsGuid.Should().NotBeNull();

result.DueDate.Should().BeNull();
result.CompletedDate.Should().BeNull();
result.DurationMins.Should().Be(0);
result.Outcomes.Should().BeNull();
result.LinkedCustomisationId.Should().BeNull();
result.VerifiedById.Should().BeNull();
result.VerifierComments.Should().BeNull();
result.ArchivedDate.Should().BeNull();
result.ArchivedById.Should().BeNull();
result.LoggedByAdminId.Should().BeNull();
result.SeqInt.Should().BeNull();
result.LastAccessedDate.Should().BeNull();
AssertLearningLogItemHasCorrectValuesForLearningHubResource(
result!,
delegateId,
addedDate,
competencyLearningResourceId,
resourceName,
resourceLink
);
}
}
finally
Expand Down Expand Up @@ -143,5 +132,139 @@ public void InsertLearningLogItemCompetencies_inserts_expected_record()
transaction.Dispose();
}
}

[Test]
public void GetLearningLogItems_returns_all_learning_hub_resource_log_items_for_delegate()
{
// Given
const int competencyLearningResourceId = 1;
const int delegateId = 2;
const int differentDelegateId = 3;
const string firstActivityName = "activity 1";
const string secondActivityName = "activity 2";
const string firstResourceLink = "link 1";
const string secondResourceLink = "link 2";
var addedDate = new DateTime(2021, 11, 1);

using var transaction = new TransactionScope();
try
{
competencyLearningResourcesTestHelper.InsertCompetencyLearningResource(
1,
competencyLearningResourceId,
1,
7
);
service.InsertLearningLogItem(
delegateId,
addedDate,
firstActivityName,
firstResourceLink,
competencyLearningResourceId
);
service.InsertLearningLogItem(
delegateId,
addedDate,
secondActivityName,
secondResourceLink,
competencyLearningResourceId
);
service.InsertLearningLogItem(
differentDelegateId,
addedDate,
"activity 3",
"resource link 3",
competencyLearningResourceId
);

// When
var result = service.GetLearningLogItems(delegateId).ToList();

// Then
using (new AssertionScope())
{
result.Count.Should().Be(2);
AssertLearningLogItemHasCorrectValuesForLearningHubResource(
result[0],
delegateId,
addedDate,
competencyLearningResourceId,
firstActivityName,
firstResourceLink
);
AssertLearningLogItemHasCorrectValuesForLearningHubResource(
result[1],
delegateId,
addedDate,
competencyLearningResourceId,
secondActivityName,
secondResourceLink
);
}
}
finally
{
transaction.Dispose();
}
}

[Test]
public void UpdateLearningLogItemLastAccessedDate_should_set_date_correctly()
{
// Given
const int learningLogItemId = 2;
var testDate = new DateTime(2021, 11, 1);

using var transaction = new TransactionScope();
try
{
// When
service.UpdateLearningLogItemLastAccessedDate(learningLogItemId, testDate);
var result = learningLogItemsTestHelper.SelectLearningLogItemById(learningLogItemId);

// Then
using (new AssertionScope())
{
result.Should().NotBeNull();
result!.LastAccessedDate.Should().Be(testDate);
}
}
finally
{
transaction.Dispose();
}
}

private void AssertLearningLogItemHasCorrectValuesForLearningHubResource(
LearningLogItem item,
int delegateId,
DateTime addedDate,
int competencyLearningResourceId,
string resourceName,
string resourceLink
)
{
item.LoggedById.Should().Be(delegateId);
item.LoggedDate.Should().Be(addedDate);
item.LinkedCompetencyLearningResourceId.Should().Be(competencyLearningResourceId);
item.ExternalUri.Should().Be(resourceLink);
item.Activity.Should().Be(resourceName);
item.ActivityType.Should().Be("Learning Hub Resource");
item.LearningLogItemId.Should().NotBe(0);
item.IcsGuid.Should().NotBeNull();

item.DueDate.Should().BeNull();
item.CompletedDate.Should().BeNull();
item.DurationMins.Should().Be(0);
item.Outcomes.Should().BeNull();
item.LinkedCustomisationId.Should().BeNull();
item.VerifiedById.Should().BeNull();
item.VerifierComments.Should().BeNull();
item.ArchivedDate.Should().BeNull();
item.ArchivedById.Should().BeNull();
item.LoggedByAdminId.Should().BeNull();
item.SeqInt.Should().BeNull();
item.LastAccessedDate.Should().BeNull();
}
}
}
Loading