Skip to content

TD-4151 - Converted API call in to async #411

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
merged 2 commits into from
Jun 11, 2024
Merged

TD-4151 - Converted API call in to async #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6385461
TD-4151 - Converted API call in to async
Swapnamol Jun 11, 2024
85076ee
Added asnotracking()
Swapnamol Jun 11, 2024
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
8 changes: 4 additions & 4 deletions WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ public ContentServerController(
/// <returns>The <see cref="IActionResult"/>.</returns>
[HttpPost]
[Route("GetContentDetailsByExternalUrl")]
public IActionResult GetContentDetailsByExternalUrl([FromBody] string externalUrl)
public async Task<IActionResult> GetContentDetailsByExternalUrl([FromBody] string externalUrl)
{
string decodedUrl = HttpUtility.UrlDecode(externalUrl);

var details = this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl);
var details = await this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl);

return this.Ok(details);
}
Expand All @@ -61,9 +61,9 @@ public IActionResult GetContentDetailsByExternalUrl([FromBody] string externalUr
/// <returns>The <see cref="IActionResult"/>.</returns>
[HttpGet]
[Route("GetContentDetailsByExternalReference/{externalReference}")]
public IActionResult GetContentDetailsByExternalReference(string externalReference)
public async Task<IActionResult> GetContentDetailsByExternalReference(string externalReference)
{
var details = this.scormContentServerService.GetContentDetailsByExternalReference(externalReference);
var details = await this.scormContentServerService.GetContentDetailsByExternalReference(externalReference);

return this.Ok(details);
}
Expand Down
4 changes: 2 additions & 2 deletions WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ public interface IScormResourceVersionRepository : IGenericRepository<ScormResou
/// </summary>
/// <param name="externalReference">The external reference (guid).</param>
/// <returns>A ContentServerViewModel.</returns>
ContentServerViewModel GetContentServerDetailsByLHExternalReference(string externalReference);
Task<ContentServerViewModel> GetContentServerDetailsByLHExternalReference(string externalReference);

/// <summary>
/// Gets the SCORM content details for a particular historic external URL. These historic URLs have to be supported to
/// allow historic ESR links on migrated resources to continue to work.
/// </summary>
/// <param name="externalUrl">The external Url.</param>
/// <returns>A ContentServerViewModel.</returns>
ContentServerViewModel GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl);
Task<ContentServerViewModel> GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl);

/// <summary>
/// GetExternalReferenceByResourceId.
Expand Down
11 changes: 6 additions & 5 deletions WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ public async Task<ScormResourceVersion> GetByResourceVersionIdAsync(int resource
/// </summary>
/// <param name="externalReference">The external reference (guid).</param>
/// <returns>A ContentServerViewModel.</returns>
public ContentServerViewModel GetContentServerDetailsByLHExternalReference(string externalReference)
public async Task<ContentServerViewModel> GetContentServerDetailsByLHExternalReference(string externalReference)
{
var param0 = new SqlParameter("@externalReference", SqlDbType.NVarChar) { Value = externalReference };

var scormContentServerViewModel = this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetContentServerDetailsForLHExternalReference] @externalReference", param0).AsEnumerable().FirstOrDefault();
var scormContentData = await this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetContentServerDetailsForLHExternalReference] @externalReference", param0).AsNoTracking().ToListAsync();

ContentServerViewModel scormContentServerViewModel = scormContentData.AsEnumerable().FirstOrDefault();
return scormContentServerViewModel;
}

Expand All @@ -70,12 +71,12 @@ public ContentServerViewModel GetContentServerDetailsByLHExternalReference(strin
/// </summary>
/// <param name="externalUrl">The external Url.</param>
/// <returns>A ContentServerViewModel.</returns>
public ContentServerViewModel GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl)
public async Task<ContentServerViewModel> GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl)
{
var param0 = new SqlParameter("@externalUrl", SqlDbType.NVarChar) { Value = externalUrl };

var scormContentServerViewModel = this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetScormContentServerDetailsForHistoricExternalUrl] @externalUrl", param0).ToList().FirstOrDefault<ContentServerViewModel>();

var scormContentData = await this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetScormContentServerDetailsForHistoricExternalUrl] @externalUrl", param0).AsNoTracking().ToListAsync();
ContentServerViewModel scormContentServerViewModel = scormContentData.FirstOrDefault<ContentServerViewModel>();
return scormContentServerViewModel;
}

Expand Down
4 changes: 2 additions & 2 deletions WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ public interface IScormContentServerService
/// </summary>
/// <param name="externalUrl">The externalUrl<see cref="string"/>.</param>
/// <returns>The <see cref="ContentServerViewModel"/>.</returns>
ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl);
Task<ContentServerViewModel> GetContentDetailsByExternalUrl(string externalUrl);

/// <summary>
/// The GetContentDetailsByExternalReference.
/// </summary>
/// <param name="externalReference">The externalReference<see cref="Guid"/>.</param>
/// <returns>The <see cref="ContentServerViewModel"/>.</returns>
ContentServerViewModel GetContentDetailsByExternalReference(string externalReference);
Task<ContentServerViewModel> GetContentDetailsByExternalReference(string externalReference);

/// <summary>
/// The LogResourceReferenceEventAsync.
Expand Down
8 changes: 4 additions & 4 deletions WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public ScormContentServerService(
/// </summary>
/// <param name="externalUrl">The externalUrl<see cref="string"/>.</param>
/// <returns>The <see cref="ContentServerViewModel"/>.</returns>
public ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl)
public async Task<ContentServerViewModel> GetContentDetailsByExternalUrl(string externalUrl)
{
var response = this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl);
var response = await this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl);

return response;
}
Expand All @@ -75,9 +75,9 @@ public ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl)
/// </summary>
/// <param name="externalReference">The externalReference<see cref="string"/>.</param>
/// <returns>The <see cref="Task{ContentServerViewModel}"/>.</returns>
public ContentServerViewModel GetContentDetailsByExternalReference(string externalReference)
public async Task<ContentServerViewModel> GetContentDetailsByExternalReference(string externalReference)
{
var response = this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);
var response = await this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);

return response;
}
Expand Down