Merge pull request #417 from TechnologyEnhancedLearning/RC

AnjuJose011 · web-flow · commit cba06ab7063e · 2024-06-12T12:10:54.000+01:00
Merge telescopium changes to master
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.cs
@@ -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);
         }
@@ -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);
         }
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -496,9 +496,9 @@ public async Task<ActionResult> GetScormDetailsAsync(int resourceVersionId)
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
         [HttpGet("GetExternalContentDetailsById/{resourceVersionId}")]
-        public ActionResult GetScormContentDetailsById(int resourceVersionId)
+        public async Task<ActionResult> GetScormContentDetailsById(int resourceVersionId)
         {
-            return this.Ok(this.resourceService.GetExternalContentDetails(resourceVersionId, this.CurrentUserId));
+            return this.Ok(await this.resourceService.GetExternalContentDetails(resourceVersionId, this.CurrentUserId));
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
@@ -262,6 +262,6 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// <param name="resourceVersionId">resourceVersionId.</param>
         /// <param name="userId">userId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId);
+        Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IScormResourceVersionRepository.cs b/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>
-        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.
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
@@ -679,15 +679,15 @@ await this.DbContext.Database.ExecuteSqlRawAsync(
         /// <param name="resourceVersionId">resourceVersionId.</param>
         /// <param name="userId">userId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId)
+        public async Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId)
         {
             try
             {
                 var param0 = new SqlParameter("@resourceVersionId", SqlDbType.Int) { Value = resourceVersionId };
                 var param1 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
 
-                var externalContentDetailsViewModel = this.DbContext.ExternalContentDetailsViewModel.FromSqlRaw("[resources].[GetExternalContentDetails] @resourceVersionId, @userId", param0, param1).AsEnumerable().FirstOrDefault();
-
+                var retVal = await this.DbContext.ExternalContentDetailsViewModel.FromSqlRaw("[resources].[GetExternalContentDetails] @resourceVersionId, @userId", param0, param1).AsNoTracking().ToListAsync();
+                ExternalContentDetailsViewModel externalContentDetailsViewModel = retVal.AsEnumerable().FirstOrDefault();
                 return externalContentDetailsViewModel;
             }
             catch (Exception ex)
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ScormResourceVersionRepository.cs
@@ -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;
         }
 
@@ -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;
         }
 
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
@@ -104,7 +104,7 @@ public interface IResourceService
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <param name="userId">userId.</param>
         /// <returns>The <see cref="Task{ScormContentDetailsViewModel}"/>.</returns>
-        ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId);
+        Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId);
 
         /// <summary>
         /// The get image details by id async.
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IScormContentServerService.cs b/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>
-        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.
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -2793,7 +2793,7 @@ public async Task<GenericFileViewModel> GetGenericFileDetailsByIdAsync(int resou
             var vm = this.mapper.Map<GenericFileViewModel>(genericFile);
 
             // User id is used to populate a field we aren't going to use, so we can just pass in the system user id.
-            var externalContentDetails = this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
+            var externalContentDetails = await this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
             if (!string.IsNullOrEmpty(externalContentDetails?.ExternalReference))
             {
                 vm.HostedContentUrl = $"{this.settings.LearningHubContentServerUrl}/{externalContentDetails.ExternalReference}/".ToLower();
@@ -2814,7 +2814,7 @@ public async Task<HtmlResourceViewModel> GetHtmlDetailsByIdAsync(int resourceVer
             var vm = this.mapper.Map<HtmlResourceViewModel>(htmlFile);
 
             // User id is used to populate a field we aren't going to use, so we can just pass in the system user id.
-            var externalContentDetails = this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
+            var externalContentDetails = await this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
             if (!string.IsNullOrEmpty(externalContentDetails?.ExternalReference))
             {
                 vm.HostedContentUrl = $"{this.settings.LearningHubContentServerUrl}/{externalContentDetails.ExternalReference}/".ToLower();
@@ -2835,7 +2835,7 @@ public async Task<ScormViewModel> GetScormDetailsByIdAsync(int resourceVersionId
             var vm = this.mapper.Map<ScormViewModel>(scorm);
 
             // User id is used to populate a field we aren't going to use, so we can just pass in the system user id.
-            var externalContentDetails = this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
+            var externalContentDetails = await this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, 4);
             if (!string.IsNullOrEmpty(externalContentDetails?.ExternalReference))
             {
                 vm.HostedContentUrl = $"{this.settings.LearningHubContentServerUrl}/{externalContentDetails.ExternalReference}/".ToLower();
@@ -2851,9 +2851,9 @@ public async Task<ScormViewModel> GetScormDetailsByIdAsync(int resourceVersionId
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <param name="userId">userId.</param>
         /// <returns>The <see cref="Task{ExternalContentDetailsViewModel}"/>.</returns>
-        public ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId)
+        public async Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId)
         {
-            var viewModel = this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, userId);
+            var viewModel = await this.resourceVersionRepository.GetExternalContentDetails(resourceVersionId, userId);
             if (viewModel != null)
             {
                 viewModel.HostedContentUrl = $"{this.settings.LearningHubContentServerUrl}/{viewModel.ExternalReference}/".ToLower();
diff --git a/WebAPI/LearningHub.Nhs.Services/ScormContentServerService.cs b/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 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;
         }
@@ -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;
         }

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public ContentServerController(`
`45`	`45`	`/// <returns>The <see cref="IActionResult"/>.</returns>`
`46`	`46`	`[HttpPost]`
`47`	`47`	`[Route("GetContentDetailsByExternalUrl")]`
`48`		`- public IActionResult GetContentDetailsByExternalUrl([FromBody] string externalUrl)`
	`48`	`+ public async Task<IActionResult> GetContentDetailsByExternalUrl([FromBody] string externalUrl)`
`49`	`49`	`{`
`50`	`50`	`string decodedUrl = HttpUtility.UrlDecode(externalUrl);`
`51`	`51`
`52`		`- var details = this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl);`
	`52`	`+ var details = await this.scormContentServerService.GetContentDetailsByExternalUrl(decodedUrl);`
`53`	`53`
`54`	`54`	`return this.Ok(details);`
`55`	`55`	`}`
`@@ -61,9 +61,9 @@ public IActionResult GetContentDetailsByExternalUrl([FromBody] string externalUr`
`61`	`61`	`/// <returns>The <see cref="IActionResult"/>.</returns>`
`62`	`62`	`[HttpGet]`
`63`	`63`	`[Route("GetContentDetailsByExternalReference/{externalReference}")]`
`64`		`- public IActionResult GetContentDetailsByExternalReference(string externalReference)`
	`64`	`+ public async Task<IActionResult> GetContentDetailsByExternalReference(string externalReference)`
`65`	`65`	`{`
`66`		`- var details = this.scormContentServerService.GetContentDetailsByExternalReference(externalReference);`
	`66`	`+ var details = await this.scormContentServerService.GetContentDetailsByExternalReference(externalReference);`
`67`	`67`
`68`	`68`	`return this.Ok(details);`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -496,9 +496,9 @@ public async Task<ActionResult> GetScormDetailsAsync(int resourceVersionId)`
`496`	`496`	`/// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>`
`497`	`497`	`/// <returns>The <see cref="Task{ActionResult}"/>.</returns>`
`498`	`498`	`[HttpGet("GetExternalContentDetailsById/{resourceVersionId}")]`
`499`		`- public ActionResult GetScormContentDetailsById(int resourceVersionId)`
	`499`	`+ public async Task<ActionResult> GetScormContentDetailsById(int resourceVersionId)`
`500`	`500`	`{`
`501`		`- return this.Ok(this.resourceService.GetExternalContentDetails(resourceVersionId, this.CurrentUserId));`
	`501`	`+ return this.Ok(await this.resourceService.GetExternalContentDetails(resourceVersionId, this.CurrentUserId));`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,6 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion`
`262`	`262`	`/// <param name="resourceVersionId">resourceVersionId.</param>`
`263`	`263`	`/// <param name="userId">userId.</param>`
`264`	`264`	`/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>`
`265`		`- ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId);`
	`265`	`+ Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId);`
`266`	`266`	`}`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -679,15 +679,15 @@ await this.DbContext.Database.ExecuteSqlRawAsync(`
`679`	`679`	`/// <param name="resourceVersionId">resourceVersionId.</param>`
`680`	`680`	`/// <param name="userId">userId.</param>`
`681`	`681`	`/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>`
`682`		`- public ExternalContentDetailsViewModel GetExternalContentDetails(int resourceVersionId, int userId)`
	`682`	`+ public async Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId)`
`683`	`683`	`{`
`684`	`684`	`try`
`685`	`685`	`{`
`686`	`686`	`var param0 = new SqlParameter("@resourceVersionId", SqlDbType.Int) { Value = resourceVersionId };`
`687`	`687`	`var param1 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };`
`688`	`688`
`689`		`- var externalContentDetailsViewModel = this.DbContext.ExternalContentDetailsViewModel.FromSqlRaw("[resources].[GetExternalContentDetails] @resourceVersionId, @userId", param0, param1).AsEnumerable().FirstOrDefault();`
`690`		`-`
	`689`	`+ var retVal = await this.DbContext.ExternalContentDetailsViewModel.FromSqlRaw("[resources].[GetExternalContentDetails] @resourceVersionId, @userId", param0, param1).AsNoTracking().ToListAsync();`
	`690`	`+ ExternalContentDetailsViewModel externalContentDetailsViewModel = retVal.AsEnumerable().FirstOrDefault();`
`691`	`691`	`return externalContentDetailsViewModel;`
`692`	`692`	`}`
`693`	`693`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ public ScormContentServerService(`
`63`	`63`	`/// </summary>`
`64`	`64`	`/// <param name="externalUrl">The externalUrl<see cref="string"/>.</param>`
`65`	`65`	`/// <returns>The <see cref="ContentServerViewModel"/>.</returns>`
`66`		`- public ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl)`
	`66`	`+ public async Task<ContentServerViewModel> GetContentDetailsByExternalUrl(string externalUrl)`
`67`	`67`	`{`
`68`		`- var response = this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl);`
	`68`	`+ var response = await this.scormResourceVersionRepository.GetScormContentServerDetailsByHistoricExternalUrl(externalUrl);`
`69`	`69`
`70`	`70`	`return response;`
`71`	`71`	`}`
`@@ -75,9 +75,9 @@ public ContentServerViewModel GetContentDetailsByExternalUrl(string externalUrl)`
`75`	`75`	`/// </summary>`
`76`	`76`	`/// <param name="externalReference">The externalReference<see cref="string"/>.</param>`
`77`	`77`	`/// <returns>The <see cref="Task{ContentServerViewModel}"/>.</returns>`
`78`		`- public ContentServerViewModel GetContentDetailsByExternalReference(string externalReference)`
	`78`	`+ public async Task<ContentServerViewModel> GetContentDetailsByExternalReference(string externalReference)`
`79`	`79`	`{`
`80`		`- var response = this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);`
	`80`	`+ var response = await this.scormResourceVersionRepository.GetContentServerDetailsByLHExternalReference(externalReference);`
`81`	`81`
`82`	`82`	`return response;`
`83`	`83`	`}`