Skip to content

TD-3023 stored proc changes #389

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
Jun 3, 2024
Merged

TD-3023 stored proc changes #389

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
35 changes: 18 additions & 17 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 @@ -754,16 +754,17 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
{
if (!newQuestionFiles.Any())
{
filePaths.AddRange(existingQuestionFiles);
filePaths.AddRange(existingQuestionFiles.Values.ToList());
}
else
{
foreach (var file in existingQuestionFiles)
{
var entry = newQuestionFiles.FirstOrDefault(x => x.Equals(file));
if (entry == null)
bool found = false;
var entry = newQuestionFiles.FirstOrDefault(x => (x.Key == file.Key || x.Value == file.Value) && (found = true));
if (!found)
{
filePaths.Add(file);
filePaths.Add(file.Value);
}
}
}
Expand Down Expand Up @@ -791,9 +792,9 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
}
}

private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
private Dictionary<int, string> CheckQuestionBlock(BlockCollectionViewModel model)
{
var filePath = new List<string>();
var filePath = new Dictionary<int, string>();
if (model != null && model.Blocks.Any())
{
foreach (var block in model.Blocks)
Expand All @@ -810,7 +811,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (imageBlock.BlockType == BlockType.Media && imageBlock.MediaBlock != null)
{
filePath.Add(imageBlock.MediaBlock.Image.File.FilePath);
filePath.Add(imageBlock.MediaBlock.Image.File.FileId, imageBlock.MediaBlock.Image.File.FilePath);
}
}
}
Expand All @@ -826,7 +827,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (questionBlock.MediaBlock.Image != null)
{
filePath.Add(questionBlock.MediaBlock.Image.File.FilePath);
filePath.Add(questionBlock.MediaBlock.Image.File.FileId, questionBlock.MediaBlock.Image.File.FilePath);
}

if (questionBlock.MediaBlock.Video != null)
Expand All @@ -835,17 +836,17 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (questionBlock.MediaBlock.Video.File != null)
{
filePath.Add(questionBlock.MediaBlock.Video.File.FilePath);
filePath.Add(questionBlock.MediaBlock.Video.File.FileId, questionBlock.MediaBlock.Video.File.FilePath);
}

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

if (questionBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
{
filePath.Add(questionBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
filePath.Add(questionBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FileId, questionBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
}
}
}
Expand All @@ -859,7 +860,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (wsi.WholeSlideImage != null && wsi.WholeSlideImage.File != null && wsi.WholeSlideImage.File.WholeSlideImageFile != null && (wsi.WholeSlideImage.File.WholeSlideImageFile.Status == WholeSlideImageFileStatus.ProcessingComplete || wsi.WholeSlideImage.File.WholeSlideImageFile.Status == WholeSlideImageFileStatus.ProcessingFailed))
{
filePath.Add(wsi.WholeSlideImage.File.FilePath);
filePath.Add(wsi.WholeSlideImage.File.FileId, wsi.WholeSlideImage.File.FilePath);
}
}
}
Expand All @@ -876,7 +877,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (feedbackBlock.MediaBlock.Image != null)
{
filePath.Add(feedbackBlock.MediaBlock.Image.File.FilePath);
filePath.Add(feedbackBlock.MediaBlock.Image.File.FileId, feedbackBlock.MediaBlock.Image.File.FilePath);
}

if (feedbackBlock.MediaBlock.Video != null)
Expand All @@ -885,17 +886,17 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
{
if (feedbackBlock.MediaBlock.Video.File != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.File.FilePath);
filePath.Add(feedbackBlock.MediaBlock.Video.File.FileId, feedbackBlock.MediaBlock.Video.File.FilePath);
}

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

if (feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
{
filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FileId, feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
}
}
}
Expand All @@ -906,7 +907,7 @@ private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
}
}

return filePath.Where(x => x != null).ToList();
return filePath;
}
}
}
4 changes: 1 addition & 3 deletions WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,7 @@
<Build Include="Stored Procedures\Activity\GetUserLearningActivities.sql" />
<Build Include="Stored Procedures\Activity\GetUserLearningActivitiesCount.sql" />
<None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
<Build Include="Stored Procedures\Resources\AssessmentContentBlockCollectionGetAll.sql" />
<Build Include="Stored Procedures\Resources\AssessmentGuidanceBlockCollectionGetAll.sql" />
<Build Include="Stored Procedures\Resources\CaseBlockCollectionGetAll.sql" />
<Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
Expand Down
Loading