Merge pull request #446 from TechnologyEnhancedLearning/RC

Merge Release Taurus to Test

Author: AnjuJose011

LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs

@@ -235,6 +235,11 @@ public ActionResult Login(string returnUrl, bool invalidScope = false)
                 return this.View();
             }
 
+            if (string.IsNullOrWhiteSpace(this.authConfig.ClientId) || string.IsNullOrWhiteSpace(this.Settings.LearningHubWebUiUrl))
+            {
+                throw new Exception("ClientId or origin are empty.");
+            }
+
             var authUri = OpenAthensOpenIdConnect.GetAuthServerUri(this.authConfig, this.Settings, returnUrl);
 
             return this.Redirect(authUri.AbsoluteUri);

WebAPI/LearningHub.Nhs.Database/Tables/Resource/ExternalReference.sql

@@ -20,4 +20,6 @@ REFERENCES [resources].[ResourceReference] ([Id])
 GO
 
 ALTER TABLE [resources].[ExternalReference] CHECK CONSTRAINT [FK_ExternalReference_ResourceReference]
+GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ExternalReference_ExternalReference_Deleted] ON [resources].[ExternalReference]([ExternalReference], [Deleted]) 
 GO

WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersion.sql

@@ -39,4 +39,6 @@ GO
 
 ALTER TABLE [resources].[ScormResourceVersion]  ADD CONSTRAINT [FK_ScormResourceVersion_EsrLinkType] FOREIGN KEY([EsrLinkTypeId])
 REFERENCES [resources].[EsrLinkType] ([Id])
+GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ScormResourceVersion_ResourceVersionId] ON [resources].[ScormResourceVersion]([ResourceVersionId])
 GO

WebAPI/LearningHub.Nhs.Database/Tables/Resource/ScormResourceVersionManifest.sql

@@ -40,3 +40,5 @@ GO
 ALTER TABLE [resources].[ScormResourceVersionManifest]  ADD  CONSTRAINT [FK_ScormResourceVersionManifest_ScormResourceVersion] FOREIGN KEY([ScormResourceVersionId])
 REFERENCES [resources].[ScormResourceVersion] ([Id])
 GO
+CREATE NONCLUSTERED INDEX [IX_Resources_ScormResourceVersionManifest_ScormResourceVersionId_ManifestURL]ON [resources].[ScormResourceVersionManifest] ([ScormResourceVersionId])INCLUDE ([ManifestURL])
+GO

WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs

@@ -40,6 +40,14 @@ public LearningHubDbContext(LearningHubDbContextOptions options)
             this.options = options;
         }
 
+        /// <summary>
+        /// Gets the Options.
+        /// </summary>
+        public LearningHubDbContextOptions Options
+        {
+            get { return this.options; }
+        }
+
         /// <summary>
         /// Gets or sets the Address.
         /// </summary>

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

@@ -83,7 +83,10 @@ public async Task DeleteBlockCollection(int userId, int blockCollectionId)
 
             foreach (var id in collectionIds)
             {
-                await this.DbContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id });
+                using (var lhContext = new LearningHubDbContext(this.DbContext.Options))
+                {
+                    _ = lhContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id });
+                }
             }
         }