Merge pull request #1019 from TechnologyEnhancedLearning/RC

Merge LH Dahlia changes   to master

Author: AnjuJose011

AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs

@@ -99,7 +99,7 @@ public async Task<IActionResult> AddUpdate(UpdateViewModel update)
                 RoadmapTypeId = update.RoadmapTypeId,
             };
             var roadmapId = await this.roadmapService.AddRoadmap(roadmap);
-            return this.RedirectToAction("EditUpdate", new { id = roadmapId });
+            return this.RedirectToAction("Details", new { id = roadmapId });
         }
 
         /// <summary>
@@ -160,7 +160,7 @@ public async Task<IActionResult> EditUpdate(UpdateViewModel update)
                 Id = update.Id,
             };
             await this.roadmapService.UpdateRoadmap(roadmap);
-            return this.RedirectToAction("EditUpdate", new { roadmap.Id });
+            return this.RedirectToAction("Details", new { roadmap.Id });
         }
 
         /// <summary>
@@ -202,6 +202,18 @@ public async Task<IActionResult> Updates(string searchTerm = null)
             return this.View(model);
         }
 
+        /// <summary>
+        /// The Details.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpGet]
+        public async Task<IActionResult> Details(int id)
+        {
+            var roadmap = await this.roadmapService.GetIdAsync(id);
+            return this.View(roadmap);
+        }
+
         /// <summary>
         /// The UploadFile.
         /// </summary>

AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoadmapService.cs

@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities;
+    using LearningHub.Nhs.Models.RoadMap;
 
     /// <summary>
     /// Defines the <see cref="IRoadmapService" />.
@@ -36,6 +37,13 @@ public interface IRoadmapService
         /// <returns>The <see cref="List{Roadmap}"/>.</returns>
         Task<List<Roadmap>> GetUpdates();
 
+        /// <summary>
+        /// The GetIdAsync.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{Roadmap}"/>.</returns>
+        Task<RoadMapViewModel> GetIdAsync(int id);
+
         /// <summary>
         /// The UpdateRoadmap.
         /// </summary>

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.47" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

AdminUI/LearningHub.Nhs.AdminUI/Services/RoadmapService.cs

@@ -7,6 +7,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Models.Entities;
+    using LearningHub.Nhs.Models.RoadMap;
     using Newtonsoft.Json;
 
     /// <summary>
@@ -134,6 +135,34 @@ public async Task<List<Roadmap>> GetUpdates()
             return viewmodel;
         }
 
+        /// <summary>
+        /// The GetIdAsync.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{Roadmap}"/>.</returns>
+        public async Task<RoadMapViewModel> GetIdAsync(int id)
+        {
+            RoadMapViewModel viewmodel = null;
+
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+            var request = $"Roadmap/GetRoadMapsById/{id}";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                viewmodel = JsonConvert.DeserializeObject<RoadMapViewModel>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return viewmodel;
+        }
+
         /// <summary>
         /// The UpdateRoadmap.
         /// </summary>