Merge pull request #419 from TechnologyEnhancedLearning/RC

Merge RC changes to scoripus

Author: AnjuJose011

LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs

@@ -309,7 +309,7 @@ private async Task MoveOutPutDirectoryToArchive(List<string> allDirectoryRef)
                                 }
                             }
 
-                            await directory.DeleteAsync();
+                            await directory.DeleteIfExistsAsync();
                         }
                     }
                 }
@@ -365,6 +365,8 @@ private async Task DeleteSubdirectory(string pathDirectory)
                     await sourceFileClient.DeleteIfExistsAsync();
                 }
             }
+
+            await sourceDirectory.DeleteIfExistsAsync();
         }
 
         private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)

LearningHub.Nhs.WebUI/Services/FileService.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);
         }

WebAPI/LearningHub.Nhs.API/Controllers/ContentServerController.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>

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

@@ -513,6 +513,7 @@
     <Build Include="Stored Procedures\Activity\GetUserLearningActivities.sql" />
     <Build Include="Stored Procedures\Activity\GetUserLearningActivitiesCount.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
+    <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />