Skip to content

Fix for video and video files within a case and assessment resource #391

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
Parent: Merge RC changes into CI
merged 3 commits into from
Jun 3, 2024
Merged

Fix for video and video files within a case and assessment resource #391

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
9525243
Fix for video and video files with a case and assessment resource qu…
OluwatobiAwe Jun 3, 2024
d94919c
catch any error while processing resource files
OluwatobiAwe Jun 3, 2024
a08cf41
changed endpoint used in getting resourcet ype resource publish
OluwatobiAwe Jun 3, 2024
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
36 changes: 18 additions & 18 deletions LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,17 +343,17 @@ public ActionResult GetSettings()
[Route("PublishResourceVersion")]
public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishViewModel publishViewModel)
{
var associatedResource = await this.resourceService.GetResourceVersionExtendedAsync(publishViewModel.ResourceVersionId);
var associatedResource = await this.resourceService.GetResourceVersionAsync(publishViewModel.ResourceVersionId);
var validationResult = await this.contributeService.SubmitResourceVersionForPublishAsync(publishViewModel);
if (validationResult.IsValid)
{
if (associatedResource.ResourceTypeEnum != ResourceTypeEnum.Scorm && associatedResource.ResourceTypeEnum != ResourceTypeEnum.Html)
if (associatedResource.ResourceType != ResourceTypeEnum.Scorm && associatedResource.ResourceType != ResourceTypeEnum.Html)
{
var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
if (obsoleteFiles != null && obsoleteFiles.Any())
{
await this.fileService.PurgeResourceFile(null, obsoleteFiles);
}
var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
if (obsoleteFiles != null && obsoleteFiles.Any())
{
await this.fileService.PurgeResourceFile(null, obsoleteFiles);
}
}
}

Expand Down Expand Up @@ -787,7 +787,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
_ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, deleteList); });
}
}
catch (Exception ex)
catch
{
}
}
Expand Down Expand Up @@ -832,13 +832,13 @@ private Dictionary<int, string> CheckQuestionBlock(BlockCollectionViewModel mode

if (questionBlock.MediaBlock.Video != null)
{
if (questionBlock.MediaBlock.Video.VideoFile != null)
if (questionBlock.MediaBlock.Video.File != null)
{
if (questionBlock.MediaBlock.Video.File != null)
{
filePath.Add(questionBlock.MediaBlock.Video.File.FileId, questionBlock.MediaBlock.Video.File.FilePath);
}
filePath.Add(questionBlock.MediaBlock.Video.File.FileId, questionBlock.MediaBlock.Video.File.FilePath);
}

if (questionBlock.MediaBlock.Video.VideoFile != null)
{
if (questionBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
{
filePath.Add(questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FileId, questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
Expand Down Expand Up @@ -882,13 +882,13 @@ private Dictionary<int, string> CheckQuestionBlock(BlockCollectionViewModel mode

if (feedbackBlock.MediaBlock.Video != null)
{
if (feedbackBlock.MediaBlock.Video.VideoFile != null)
if (feedbackBlock.MediaBlock.Video.File != null)
{
if (feedbackBlock.MediaBlock.Video.File != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.File.FileId, feedbackBlock.MediaBlock.Video.File.FilePath);
}
filePath.Add(feedbackBlock.MediaBlock.Video.File.FileId, feedbackBlock.MediaBlock.Video.File.FilePath);
}

if (feedbackBlock.MediaBlock.Video.VideoFile != null)
{
if (feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FileId, feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
Expand Down
40 changes: 27 additions & 13 deletions WebAPI/LearningHub.Nhs.Services/ResourceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,12 +1347,16 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
rvs = rvs.Where(x => x.Id != resourceVersionId && x.PublicationId > 0).OrderByDescending(x => x.PublicationId).ToList();
var rv = rvs.FirstOrDefault();
var currentAssessmentVersion = await this.GetAssessmentViewModel(rv.Id);
List<string> deletableFiles = null;
if (assessmentDetails is { EndGuidance: { } } && assessmentDetails.EndGuidance.Blocks != null)
{
var endGuidanceFiles = this.CheckBlockFile(assessmentDetails.EndGuidance, currentAssessmentVersion.EndGuidance);
if (endGuidanceFiles.Any())
{
retVal.AddRange(endGuidanceFiles);
deletableFiles = await this.GetResourceBlockCollectionsFilePathAsync(rv.Id, ResourceTypeEnum.Assessment);
retVal.AddRange(from entry in endGuidanceFiles
where deletableFiles.Contains(entry)
select entry);
}
}

Expand All @@ -1361,7 +1365,10 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
var assessmentContentFiles = this.CheckBlockFile(assessmentDetails.AssessmentContent, currentAssessmentVersion.AssessmentContent);
if (assessmentContentFiles.Any())
{
retVal.AddRange(assessmentContentFiles);
deletableFiles ??= await this.GetResourceBlockCollectionsFilePathAsync(rv.Id, ResourceTypeEnum.Assessment);
retVal.AddRange(from entry in assessmentContentFiles
where deletableFiles.Contains(entry)
select entry);
}
}
}
Expand All @@ -1382,7 +1389,14 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
if (rv != null)
{
var currentCaseVersion = await this.GetCaseDetailsByIdAsync(rv.Id);
caseFiles = this.CheckBlockFile(caseDetails.BlockCollection, currentCaseVersion.BlockCollection);
var nonpublishedFiles = this.CheckBlockFile(caseDetails.BlockCollection, currentCaseVersion.BlockCollection);
if (nonpublishedFiles.Any())
{
var deletableCaseFiles = await this.GetResourceBlockCollectionsFilePathAsync(rv.Id, ResourceTypeEnum.Case);
caseFiles.AddRange(from entry in nonpublishedFiles
where deletableCaseFiles.Contains(entry)
select entry);
}
}
}

Expand Down Expand Up @@ -5092,13 +5106,13 @@ private Dictionary<int, string> CheckQuestionBlock(BlockCollectionViewModel mode

if (questionBlock.MediaBlock.Video != null)
{
if (questionBlock.MediaBlock.Video.VideoFile != null)
if (questionBlock.MediaBlock.Video.File != null)
{
if (questionBlock.MediaBlock.Video.File != null)
{
filePath.Add(questionBlock.MediaBlock.Video.File.FileId, questionBlock.MediaBlock.Video.File.FilePath);
}
filePath.Add(questionBlock.MediaBlock.Video.File.FileId, questionBlock.MediaBlock.Video.File.FilePath);
}

if (questionBlock.MediaBlock.Video.VideoFile != null)
{
if (questionBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
{
filePath.Add(questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FileId, questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
Expand Down Expand Up @@ -5142,13 +5156,13 @@ private Dictionary<int, string> CheckQuestionBlock(BlockCollectionViewModel mode

if (feedbackBlock.MediaBlock.Video != null)
{
if (feedbackBlock.MediaBlock.Video.VideoFile != null)
if (feedbackBlock.MediaBlock.Video.File != null)
{
if (feedbackBlock.MediaBlock.Video.File != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.File.FileId, feedbackBlock.MediaBlock.Video.File.FilePath);
}
filePath.Add(feedbackBlock.MediaBlock.Video.File.FileId, feedbackBlock.MediaBlock.Video.File.FilePath);
}

if (feedbackBlock.MediaBlock.Video.VideoFile != null)
{
if (feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FileId, feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
Expand Down