Skip to content

Commit 26abd61

Browse files
committed
TD-3023 check for obsolete files before saving new block collection.
1 parent ef7ebe9 commit 26abd61

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,12 @@ public async Task<ActionResult> SaveWeblinkDetailAsync([FromBody] WebLinkViewMod
493493
public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel request)
494494
{
495495
var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
496-
int resourceVersionId = await this.contributeService.SaveCaseDetailAsync(request);
497496
if (existingResourceState.CaseDetails?.BlockCollection != null)
498497
{
499-
await this.RemoveBlockCollectionFiles(request.ResourceVersionId, existingResourceState.CaseDetails.BlockCollection, request.BlockCollection);
498+
await this.RemoveBlockCollectionFiles(request.ResourceVersionId, existingResourceState.CaseDetails.BlockCollection, request.BlockCollection);
500499
}
501500

501+
int resourceVersionId = await this.contributeService.SaveCaseDetailAsync(request);
502502
return this.Ok(resourceVersionId);
503503
}
504504

@@ -512,12 +512,12 @@ public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel req
512512
public async Task<ActionResult> SaveAssessmentDetailAsync([FromBody] AssessmentViewModel request)
513513
{
514514
var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
515-
int resourceVersionId = await this.contributeService.SaveAssessmentDetailAsync(request);
516515
if (existingResourceState != null && existingResourceState.AssessmentDetails != null)
517516
{
518-
await this.RemoveBlockCollectionFiles(request.ResourceVersionId, existingResourceState.AssessmentDetails, request);
517+
await this.RemoveBlockCollectionFiles(request.ResourceVersionId, existingResourceState.AssessmentDetails, request);
519518
}
520519

520+
int resourceVersionId = await this.contributeService.SaveAssessmentDetailAsync(request);
521521
return this.Ok(resourceVersionId);
522522
}
523523

0 commit comments

Comments
 (0)