CU-8688f3ftq fixing bug with department links.

Resgrid · May 12, 2024 · a4953b0 · a4953b0
1 parent 99f4d0a
commit a4953b0
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/Core/Resgrid.Services/DepartmentLinksService.cs b/Core/Resgrid.Services/DepartmentLinksService.cs
@@ -29,12 +29,33 @@ public async Task<List<DepartmentLink>> GetAllLinksForDepartmentAsync(int depart
 		{
 			var links = await _departmentLinksRepository.GetAllLinksForDepartmentAsync(departmentId);
 
-			return links.ToList();
+			if (links != null && links.Any())
+			{
+				foreach (var link in links)
+				{
+					link.Department = await _departmentsRepository.GetByIdAsync(link.DepartmentId);
+					link.LinkedDepartment = await _departmentsRepository.GetByIdAsync(link.DepartmentLinkId);
+				}
+
+				return links.ToList();
+			}
+
+			return new List<DepartmentLink>();
 		}
 
 		public async Task<DepartmentLink> GetLinkByIdAsync(int linkId)
 		{
-			return await _departmentLinksRepository.GetByIdAsync(linkId);
+			var link = await _departmentLinksRepository.GetByIdAsync(linkId);
+
+			if (link != null)
+			{
+				link.Department = await _departmentsRepository.GetByIdAsync(link.DepartmentId);
+				link.LinkedDepartment = await _departmentsRepository.GetByIdAsync(link.DepartmentLinkId);
+
+				return link;
+			}
+
+			return null;
 		}
 
 		public async Task<DepartmentLink> SaveAsync(DepartmentLink link, CancellationToken cancellationToken = default(CancellationToken))