Merge pull request #983 from TechnologyEnhancedLearning/Develop/Fixes/Fixed-the-issue-with-ESR-link-for-the-resources-not-loading-for-first-launch

Develop/fixes/fixed the issue with esr link for the resources not loading for first launch

Author: swapnamol-abraham

WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs

@@ -45,11 +45,11 @@ public ContentServerController(
         /// <returns>The <see cref="IActionResult"/>.</returns>
         [HttpPost]
         [Route("GetContentDetailsByExternalUrl")]
-        public async Task<IActionResult> 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<IActionResult> GetContentDetailsByExternalUrl([FromBody] strin
         /// <returns>The <see cref="IActionResult"/>.</returns>
         [HttpGet]
         [Route("GetContentDetailsByExternalReference/{externalReference}")]
-        public async Task<IActionResult> 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);
         }

WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs

@@ -30,15 +30,15 @@ public interface IScormResourceVersionRepository : IGenericRepository<ScormResou
         /// </summary>
         /// <param name="externalReference">The external reference (guid).</param>
         /// <returns>A ContentServerViewModel.</returns>
-        Task<ContentServerViewModel> GetContentServerDetailsByLHExternalReference(string externalReference);
+        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>
-        Task<ContentServerViewModel> GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl);
+        ContentServerViewModel GetScormContentServerDetailsByHistoricExternalUrl(string externalUrl);
 
         /// <summary>
         /// GetExternalReferenceByResourceId.

WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs

@@ -55,13 +55,12 @@ public async Task<ScormResourceVersion> GetByResourceVersionIdAsync(int resource
         /// </summary>
         /// <param name="externalReference">The external reference (guid).</param>
         /// <returns>A ContentServerViewModel.</returns>
-        public async Task<ContentServerViewModel> 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<ContentServerViewModel> GetContentServerDetailsByLHExternalRef
         /// </summary>
         /// <param name="externalUrl">The external Url.</param>
         /// <returns>A ContentServerViewModel.</returns>
-        public async Task<ContentServerViewModel> 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<ContentServerViewModel>();
+            var scormContentServerViewModel = this.DbContext.ContentServerViewModel.FromSqlRaw("[resources].[GetScormContentServerDetailsForHistoricExternalUrl] @externalUrl", param0).ToList().FirstOrDefault<ContentServerViewModel>();
+
             return scormContentServerViewModel;
         }
 

WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs

@@ -14,14 +14,14 @@ public interface IScormContentServerService
         /// </summary>
         /// <param name="externalUrl">The externalUrl<see cref="string"/>.</param>
         /// <returns>The <see cref="ContentServerViewModel"/>.</returns>
-        Task<ContentServerViewModel> GetContentDetailsByExternalUrl(string externalUrl);
+        ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl);
 
         /// <summary>
         /// The GetContentDetailsByExternalReference.
         /// </summary>
         /// <param name="externalReference">The externalReference<see cref="Guid"/>.</param>
         /// <returns>The <see cref="ContentServerViewModel"/>.</returns>
-        Task<ContentServerViewModel> GetContentDetailsByExternalReference(string externalReference);
+        ContentServerViewModel GetContentDetailsByExternalReference(string externalReference);
 
         /// <summary>
         /// The LogResourceReferenceEventAsync.

WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs

@@ -63,9 +63,9 @@ public ScormContentServerService(
         /// </summary>
         /// <param name="externalUrl">The externalUrl<see cref="string"/>.</param>
         /// <returns>The <see cref="ContentServerViewModel"/>.</returns>
-        public async Task<ContentServerViewModel> 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<ContentServerViewModel> GetContentDetailsByExternalUrl(string
         /// </summary>
         /// <param name="externalReference">The externalReference<see cref="string"/>.</param>
         /// <returns>The <see cref="Task{ContentServerViewModel}"/>.</returns>
-        public async Task<ContentServerViewModel> GetContentDetailsByExternalReference(string externalReference)
+        public ContentServerViewModel GetContentDetailsByExternalReference(string externalReference)
         {
-            var response = await this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);
+            var response = this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);
 
             return response;
         }