Skip to content

TD-3023 QuestionBlock wsi and draft published case file bugfix #352

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 1 commit into from
May 10, 2024
Merged

TD-3023 QuestionBlock wsi and draft published case file bugfix #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -493,7 +493,7 @@ public async Task<ActionResult> SaveWeblinkDetailAsync([FromBody] WebLinkViewMod
public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel request)
{
var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
if (existingResourceState.CaseDetails?.BlockCollection != null)
if (existingResourceState?.CaseDetails?.BlockCollection != null)
{
await this.RemoveBlockCollectionFiles(request.ResourceVersionId, existingResourceState.CaseDetails.BlockCollection, request.BlockCollection);
}
Expand Down Expand Up @@ -903,7 +903,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
}
}

return filePath;
return filePath.Where(x => x != null).ToList();
}
}
}
62 changes: 42 additions & 20 deletions WebAPI/LearningHub.Nhs.Services/ResourceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,38 +1471,60 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
}
}
}
else if (resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Assessment)
{
if (deletedResource)
{
if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
var endGuidanceFiles = new List<string>();
var assessmentContentFiles = new List<string>();

if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
{
var assessmentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.EndGuidance, resource.AssessmentDetails.EndGuidance);
if (assessmentFiles.Any())
if (deletedResource)
{
retVal.AddRange(assessmentFiles);
endGuidanceFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.EndGuidance, resource.AssessmentDetails.EndGuidance);
}
else
{
endGuidanceFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance, extendedResourceVersion.AssessmentDetails.EndGuidance);
}

if (endGuidanceFiles.Any())
{
retVal.AddRange(endGuidanceFiles);
}
}

if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
{
var assessmentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.AssessmentContent, resource.AssessmentDetails.AssessmentContent);
if (assessmentFiles.Any())
if (deletedResource)
{
retVal.AddRange(assessmentFiles);
assessmentContentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.AssessmentContent, resource.AssessmentDetails.AssessmentContent);
}
else
{
assessmentContentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent, extendedResourceVersion.AssessmentDetails.AssessmentContent);
}

if (assessmentContentFiles.Any())
{
retVal.AddRange(assessmentContentFiles);
}
}
}
}
else if (resource.ResourceTypeEnum == ResourceTypeEnum.Case)
else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Case)
{
var caseFiles = new List<string>();
if (deletedResource)
{
var caseFiles = this.CheckBlockFile(extendedResourceVersion.CaseDetails.BlockCollection, resource.CaseDetails.BlockCollection);
if (caseFiles.Any())
{
retVal.AddRange(caseFiles);
}
caseFiles = this.CheckBlockFile(extendedResourceVersion.CaseDetails.BlockCollection, resource.CaseDetails.BlockCollection);
}
else
{
caseFiles = this.CheckBlockFile(resource.CaseDetails.BlockCollection, extendedResourceVersion.CaseDetails.BlockCollection);
}

if (caseFiles.Any())
{
retVal.AddRange(caseFiles);
}
}
}
Expand Down Expand Up @@ -4997,7 +5019,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
}
}

return retVal;
return retVal.Where(x => x != null).ToList();
}

private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
Expand Down Expand Up @@ -5112,7 +5134,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
}
}

return filePath;
return filePath.Where(x => x != null).ToList();
}
}
}