Skip to content

TD-4052 bugfix #299

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
Apr 18, 2024
Merged

TD-4052 bugfix #299

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 @@ -228,7 +228,7 @@ public async Task<ActionResult> DeleteResourceVersion(int resourceVersionId)
var validationResult = await this.contributeService.DeleteResourceVersionAsync(resourceVersionId);
if (validationResult.IsValid)
{
if (associatedFile.Any())
if (associatedFile != null && associatedFile.Any())
{
_ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, associatedFile); });
}
Expand Down Expand Up @@ -348,7 +348,7 @@ public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishVi
if (associatedResource.ResourceTypeEnum != ResourceTypeEnum.Scorm && associatedResource.ResourceTypeEnum != ResourceTypeEnum.Html)
{
var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
if (obsoleteFiles.Any())
if (obsoleteFiles != null && obsoleteFiles.Any())
{
await this.fileService.PurgeResourceFile(null, obsoleteFiles);
}
Expand Down
4 changes: 4 additions & 0 deletions LearningHub.Nhs.WebUI/Services/FileService.cs
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tobi, just want to check whether this needs to be done in AdminUI area as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's limited to the azure function and webui for now.
this would be moved over to adminui unpublish action method once test is concluded in with present implementation.

Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@ private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)
{
var directory = this.ShareClient.GetDirectoryClient(directoryRef);
var archiveDirectory = this.InputArchiveShareClient.GetDirectoryClient(directoryRef);
if (!directory.Exists())
{
continue;
}

await foreach (var fileItem in directory.GetFilesAndDirectoriesAsync())
{
Expand Down
10 changes: 5 additions & 5 deletions WebAPI/LearningHub.Nhs.Services/ResourceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
}
else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Audio)
{
if (resource.AudioDetails.File.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
if (resource.AudioDetails?.File?.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
{
if (!deletedResource)
{
Expand All @@ -1402,7 +1402,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
}
}

if (resource.AudioDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
{
if (!deletedResource)
{
Expand All @@ -1416,7 +1416,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
}
else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Video)
{
if (resource.VideoDetails.File.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
if (resource.VideoDetails?.File?.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
{
if (!deletedResource)
{
Expand All @@ -1428,7 +1428,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
}
}

if (resource.VideoDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
{
if (!deletedResource)
{
Expand All @@ -1443,7 +1443,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Article)
{
var inputResourceFiles = resource.ArticleDetails.Files.ToList();
var previousPublishedfiles = extendedResourceVersion.ArticleDetails.Files.ToList();
var previousPublishedfiles = extendedResourceVersion.ArticleDetails?.Files?.ToList();
if (!deletedResource)
{
if (previousPublishedfiles.Any())
Expand Down