diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs index 9a95d80b0..9c662942b 100644 --- a/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs +++ b/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs @@ -45,11 +45,11 @@ public ContentServerController( /// The . [HttpPost] [Route("GetContentDetailsByExternalUrl")] - public async Task GetContentDetailsByExternalUrl([FromBody] string externalUrl) + public IActionResult GetContentDetailsByExternalUrl([FromBody] string externalUrl) { string decodedUrl = HttpUtility.UrlDecode(externalUrl); - var details = await this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl); + var details = this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl); return this.Ok(details); } @@ -61,9 +61,9 @@ public async Task GetContentDetailsByExternalUrl([FromBody] strin /// The . [HttpGet] [Route("GetContentDetailsByExternalReference/{externalReference}")] - public async Task GetContentDetailsByExternalReference(string externalReference) + public IActionResult GetContentDetailsByExternalReference(string externalReference) { - var details = await this.scormContentServerService.GetContentDetailsByExternalReference(externalReference); + var details = this.scormContentServerService.GetContentDetailsByExternalReference(externalReference); return this.Ok(details); } diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs index 803a80896..0dfa086cf 100644 --- a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs @@ -30,7 +30,7 @@ public interface IScormResourceVersionRepository : IGenericRepository /// The external reference (guid). /// A ContentServerViewModel. - Task GetContentServerDetailsByLHExternalReference(string externalReference); + ContentServerViewModel GetContentServerDetailsByLHExternalReference(string externalReference); /// /// Gets the SCORM content details for a particular historic external URL. These historic URLs have to be supported to @@ -38,7 +38,7 @@ public interface IScormResourceVersionRepository : IGenericRepository /// The external Url. /// A ContentServerViewModel. - Task GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl); + ContentServerViewModel GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl); /// /// GetExternalReferenceByResourceId. diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs index 5272bd7f8..adb80296a 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs @@ -55,13 +55,12 @@ public async Task GetByResourceVersionIdAsync(int resource /// /// The external reference (guid). /// A ContentServerViewModel. - public async Task GetContentServerDetailsByLHExternalReference(string externalReference) + public ContentServerViewModel GetContentServerDetailsByLHExternalReference(string externalReference) { var param0 = new SqlParameter("@externalReference", SqlDbType.NVarChar) { Value = externalReference }; - var scormContentData = await this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetContentServerDetailsForLHExternalReference] @externalReference", param0).AsNoTracking().ToListAsync(); + var scormContentServerViewModel = this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetContentServerDetailsForLHExternalReference] @externalReference", param0).AsEnumerable().FirstOrDefault(); - ContentServerViewModel scormContentServerViewModel = scormContentData.AsEnumerable().FirstOrDefault(); return scormContentServerViewModel; } @@ -71,12 +70,12 @@ public async Task GetContentServerDetailsByLHExternalRef /// /// The external Url. /// A ContentServerViewModel. - public async Task GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl) + public ContentServerViewModel GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl) { var param0 = new SqlParameter("@externalUrl", SqlDbType.NVarChar) { Value = externalUrl }; - var scormContentData = await this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetScormContentServerDetailsForHistoricExternalUrl] @externalUrl", param0).AsNoTracking().ToListAsync(); - ContentServerViewModel scormContentServerViewModel = scormContentData.FirstOrDefault(); + var scormContentServerViewModel = this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetScormContentServerDetailsForHistoricExternalUrl] @externalUrl", param0).ToList().FirstOrDefault(); + return scormContentServerViewModel; } diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs index 8bd397e45..9bc5ffe50 100644 --- a/WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs +++ b/WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs @@ -14,14 +14,14 @@ public interface IScormContentServerService /// /// The externalUrl. /// The . - Task GetContentDetailsByExternalUrl(string externalUrl); + ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl); /// /// The GetContentDetailsByExternalReference. /// /// The externalReference. /// The . - Task GetContentDetailsByExternalReference(string externalReference); + ContentServerViewModel GetContentDetailsByExternalReference(string externalReference); /// /// The LogResourceReferenceEventAsync. diff --git a/WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs b/WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs index 75fa13b5c..5fef76ecf 100644 --- a/WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs +++ b/WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs @@ -63,9 +63,9 @@ public ScormContentServerService( /// /// The externalUrl. /// The . - public async Task GetContentDetailsByExternalUrl(string externalUrl) + public ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl) { - var response = await this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl); + var response = this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl); return response; } @@ -75,9 +75,9 @@ public async Task GetContentDetailsByExternalUrl(string /// /// The externalReference. /// The . - public async Task GetContentDetailsByExternalReference(string externalReference) + public ContentServerViewModel GetContentDetailsByExternalReference(string externalReference) { - var response = await this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference); + var response = this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference); return response; }