Skip to content

TD-3736: Performance improvement implemented in Admin UI. Used stored procedures to bind the data from DB. #348

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 Releases/lh scorpius to RC
merged 1 commit into from
May 10, 2024
Merged

TD-3736: Performance improvement implemented in Admin UI. Used stored procedures to bind the data from DB. #348

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
2 changes: 1 addition & 1 deletion WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
};

var latestActivityCheck = await this.resourceActivityRepository.GetAllTheActivitiesFromSP(resourceActivity.CreateUserId, resourceActivity.ResourceVersionId);
var allAttempts = latestActivityCheck;
latestActivityCheck.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
if (latestActivityCheck.Any() && latestActivityCheck.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
{
Expand Down Expand Up @@ -351,7 +352,6 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
viewModel.CompletionPercentage = totalQuestions == 0 ? 0 : Convert.ToInt32(100 * completedQuestions / Convert.ToDecimal(totalQuestions));
viewModel.ScorePercentage = activity.Score.HasValue ? (int)Math.Round(activity.Score.Value, MidpointRounding.AwayFromZero) : 0;

var allAttempts = await this.resourceActivityRepository.GetAllTheActivitiesFor(userId, resourceActivity.ResourceVersionId);
var currentAttempt = allAttempts.FindIndex(a => a.Id == resourceActivity.Id) + 1;

if (viewModel.CompletionPercentage == 100)
Expand Down
11 changes: 7 additions & 4 deletions WebAPI/LearningHub.Nhs.Services/UserLearningRecordService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,22 @@ public async Task<PagedResultSet<MyLearningDetailedItemViewModel>> GetUserLearni
var presetFilterCriteria = JsonConvert.DeserializeObject<List<PagingColumnFilter>>(presetFilter);
var userIdFilter = presetFilterCriteria.Where(f => f.Column == "userid").FirstOrDefault();

var activityQuery = this.resourceActivityRepository.GetByUserId(int.Parse(userIdFilter.Value));
MyLearningRequestModel requestModel = new MyLearningRequestModel();
requestModel.Skip = (page - 1) * pageSize;
requestModel.Take = pageSize;
var activityQuery = this.resourceActivityRepository.GetByUserIdFromSP(int.Parse(userIdFilter.Value), requestModel, this.settings.Value.DetailedMediaActivityRecordingStartDate).Result.OrderByDescending(r => r.ActivityStart).DistinctBy(l => l.Id);
MyLearningDetailedViewModel viewModel = new MyLearningDetailedViewModel()
{
TotalCount = activityQuery.Count(),
TotalCount = this.resourceActivityRepository.GetTotalCount(int.Parse(userIdFilter.Value), requestModel, this.settings.Value.DetailedMediaActivityRecordingStartDate),
};

var activityEntities = await activityQuery.Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
var activityEntities = activityQuery.ToList();

viewModel.Activities = await this.myLearningService.PopulateMyLearningDetailedItemViewModels(activityEntities, int.Parse(userIdFilter.Value));
if (userIdFilter != null)
{
result.Items = viewModel.Activities; /*this.mapper.Map<List<UserLearningRecordViewModel>>(viewModel.Activities);*/
result.TotalItemCount = activityQuery.Count();
result.TotalItemCount = viewModel.TotalCount;
}

return result;
Expand Down