Merge pull request #249 from Resgrid/develop

CU-868frm4jk Removing v3 api, minor fixes.

Author: ucswift

Core/Resgrid.Services/AuthorizationService.cs

@@ -335,6 +335,9 @@ public async Task<bool> CanUserViewUserAsync(string viewerUserId, string targetU
 			var department = await _departmentsService.GetDepartmentByUserIdAsync(viewerUserId);
 			var department1 = await _departmentsService.GetDepartmentByUserIdAsync(targetUserId);
 
+			if (department == null || department1 == null)
+				return false;
+
 			if (department.DepartmentId != department1.DepartmentId)
 				return false;
 

Core/Resgrid.Services/CallEmailTemplates/ResgridEmailTemplate.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -57,8 +58,25 @@ public async Task<Call> GenerateCall(CallEmail email, string managingUser, List<
 					c.MapPage = data[4];
 
 				c.NatureOfCall = data[5];
-				c.Address = data[3];
 
+				if (!string.IsNullOrEmpty(data[3]))
+				{
+					c.Address = data[3];
+
+					try
+					{
+						var address = await geolocationProvider.GetLatLonFromAddress(c.Address);
+
+
+						if (address != null)
+							c.GeoLocationData = address;
+					}
+					catch (Exception ex)
+					{
+						Resgrid.Framework.Logging.LogException( ex,
+						$"Failed to geocode address '{c.Address}' for email {email.MessageId}");
+					}
+				}
 				StringBuilder title = new StringBuilder();
 
 				title.Append("Email Call ");

Core/Resgrid.Services/ShiftsService.cs

@@ -488,7 +488,10 @@ public async Task<Dictionary<int, Dictionary<int, int>>> GetShiftDayNeedsObjAsyn
 						}
 					}
 
-					shiftGroups.Add(group.DepartmentGroupId, roleRequirements);
+					if (shiftGroups.ContainsKey(group.DepartmentGroupId))
+						shiftGroups[group.DepartmentGroupId] = roleRequirements;
+					else
+						shiftGroups.Add(group.DepartmentGroupId, roleRequirements);
 				}
 			}