CU-3w8z67w Working on the Contacts system.

Author: ucswift

Core/Resgrid.Config/TelemetryConfig.cs

@@ -3,5 +3,8 @@
 	public static class TelemetryConfig
 	{
 		public static string Exporter = "";
+
+		public static string PostHogUrl = "";
+		public static string PostHogApiKey = "";
 	}
 }

Core/Resgrid.Localization/Areas/User/Contacts/Contacts.en.resx

@@ -471,4 +471,16 @@
   <data name="SaveNote" xml:space="preserve">
     <value>Add Note</value>
   </data>
+  <data name="FilterBy" xml:space="preserve">
+    <value>Filter By</value>
+  </data>
+  <data name="LoadingNotes" xml:space="preserve">
+    <value>Loading Notes</value>
+  </data>
+  <data name="SearchNotes" xml:space="preserve">
+    <value>Search Notes</value>
+  </data>
+  <data name="EditContact" xml:space="preserve">
+    <value>Edit Contact</value>
+  </data>
 </root>

Core/Resgrid.Model/Repositories/ICallsRepository.cs

@@ -71,5 +71,13 @@ public interface ICallsRepository: IRepository<Call>
 		/// <param name="departmentId">The department identifier.</param>
 		/// <returns>Task&lt;IEnumerable&lt;Call&gt;&gt;.</returns>
 		Task<IEnumerable<Call>> GetAllNonDispatchedScheduledCallsByDepartmentIdAsync(int departmentId);
+
+		/// <summary>
+		/// Gets all calls by department and contact asynchronous.
+		/// </summary>
+		/// <param name="contactId">The contact identifier.</param>
+		/// <param name="departmentId">The department identifier.</param>
+		/// <returns>Task&lt;IEnumerable&lt;Call&gt;&gt;.</returns>
+		Task<IEnumerable<Call>> GetAllCallsByContactIdAsync(string contactId, int departmentId);
 	}
 }

Core/Resgrid.Model/Services/IAuthorizationService.cs

@@ -322,5 +322,9 @@ public interface IAuthorizationService
 		Task<bool> CanUserDeleteContactNoteTypeAsync(string userId, string contactNoteTypeId);
 
 		Task<bool> CanUserEditContactNoteTypeAsync(string userId, string contactNoteTypeId);
+
+		Task<bool> CanUserDeleteContactAsync(string userId, int departmentId);
+
+		Task<bool> CanUserAddOrEditContactAsync(string userId, int departmentId);
 	}
 }

Core/Resgrid.Model/Services/ICallsService.cs

@@ -408,5 +408,7 @@ Task<bool> ClearGroupForDispatchesAsync(int departmentGroupId,
 		Task<List<CallReference>> GetChildCallsForCallAsync(int callId);
 
 		Task<bool> DeleteCallReferenceAsync(CallReference callReference, CancellationToken cancellationToken = default(CancellationToken));
+
+		Task<List<Call>> GetCallsByContactIdAsync(string contactId, int departmentId);
 	}
 }

Core/Resgrid.Model/Services/IContactsService.cs

@@ -25,5 +25,6 @@ public interface IContactsService
 		Task<bool> DoesContactNoteTypeAlreadyExistAsync(int departmentId, string noteTypeText);
 		Task<bool> DeleteContactNoteTypeAsync(ContactNoteType type, CancellationToken cancellationToken = default(CancellationToken));
 		Task<ContactNote> SaveContactNoteAsync(ContactNote note, CancellationToken cancellationToken = default(CancellationToken));
+		Task<bool> DeleteContactAsync(string contactId, string userId, int departmentId, string ipAddress, string userAgent, CancellationToken cancellationToken = default(CancellationToken));
 	}
 }

Core/Resgrid.Services/AuthorizationService.cs

@@ -1401,5 +1401,36 @@ public async Task<bool> CanUserEditContactNoteTypeAsync(string userId, string co
 
 			return false;
 		}
+
+		public async Task<bool> CanUserDeleteContactAsync(string userId, int departmentId)
+		{
+			var permission = await _permissionsService.GetPermissionByDepartmentTypeAsync(departmentId, PermissionTypes.ContactDelete);
+
+			bool isGroupAdmin = false;
+			var group = await _departmentGroupsService.GetGroupForUserAsync(userId, departmentId);
+			var roles = await _personnelRolesService.GetRolesForUserAsync(userId, departmentId);
+			var department = await _departmentsService.GetDepartmentByIdAsync(departmentId);
+
+			if (group != null)
+				isGroupAdmin = group.IsUserGroupAdmin(userId);
+
+			return _permissionsService.IsUserAllowed(permission, department.IsUserAnAdmin(userId), isGroupAdmin, roles);
+		}
+
+		public async Task<bool> CanUserAddOrEditContactAsync(string userId, int departmentId)
+		{
+			var permission = await _permissionsService.GetPermissionByDepartmentTypeAsync(departmentId, PermissionTypes.ContactEdit);
+
+			bool isGroupAdmin = false;
+			var group = await _departmentGroupsService.GetGroupForUserAsync(userId, departmentId);
+			var roles = await _personnelRolesService.GetRolesForUserAsync(userId, departmentId);
+			var department = await _departmentsService.GetDepartmentByIdAsync(departmentId);
+
+			if (group != null)
+				isGroupAdmin = group.IsUserGroupAdmin(userId);
+
+			return _permissionsService.IsUserAllowed(permission, department.IsUserAnAdmin(userId), isGroupAdmin, roles);
+		}
+
 	}
 }

Core/Resgrid.Services/CallsService.cs

@@ -40,6 +40,7 @@ public class CallsService : ICallsService
 		private readonly IGeoLocationProvider _geoLocationProvider;
 		private readonly IDepartmentsService _departmentsService;
 		private readonly ICallReferencesRepository _callReferencesRepository;
+		private readonly ICallContactsRepository _callContactsRepository;
 
 		public CallsService(ICallsRepository callsRepository, ICommunicationService communicationService,
 			ICallDispatchesRepository callDispatchesRepository, ICallTypesRepository callTypesRepository, ICallEmailFactory callEmailFactory,
@@ -48,7 +49,7 @@ public CallsService(ICallsRepository callsRepository, ICommunicationService comm
 			ICallDispatchUnitRepository callDispatchUnitRepository, ICallDispatchRoleRepository callDispatchRoleRepository,
 			IDepartmentCallPriorityRepository departmentCallPriorityRepository, IShortenUrlProvider shortenUrlProvider,
 			ICallProtocolsRepository callProtocolsRepository, IGeoLocationProvider geoLocationProvider, IDepartmentsService departmentsService,
-			ICallReferencesRepository callReferencesRepository)
+			ICallReferencesRepository callReferencesRepository,  ICallContactsRepository callContactsRepository)
 		{
 			_callsRepository = callsRepository;
 			_communicationService = communicationService;
@@ -67,6 +68,7 @@ public CallsService(ICallsRepository callsRepository, ICommunicationService comm
 			_geoLocationProvider = geoLocationProvider;
 			_departmentsService = departmentsService;
 			_callReferencesRepository = callReferencesRepository;
+			_callContactsRepository = callContactsRepository;
 		}
 
 		public async Task<Call> SaveCallAsync(Call call, CancellationToken cancellationToken = default(CancellationToken))
@@ -893,5 +895,15 @@ public async Task<string> CallPriorityToColorAsync(int priority, int departmentI
 						return "#008000";
 			}
 		}
+
+		public async Task<List<Call>> GetCallsByContactIdAsync(string contactId, int departmentId)
+		{
+			var calls = await _callsRepository.GetAllCallsByContactIdAsync(contactId, departmentId);
+
+			if (calls != null && calls.Any())
+				return calls.ToList();
+
+			return new List<Call>();
+		}
 	}
 }

Core/Resgrid.Services/ContactsService.cs

@@ -1,10 +1,14 @@
-using Resgrid.Model;
+using System;
+using Resgrid.Model;
 using Resgrid.Model.Repositories;
 using Resgrid.Model.Services;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Resgrid.Framework;
+using Resgrid.Model.Events;
+using Resgrid.Model.Providers;
 
 namespace Resgrid.Services
 {
@@ -15,20 +19,23 @@ public class ContactsService : IContactsService
 		private readonly IContactNotesRepository _contactNotesRepository;
 		private readonly IContactNoteTypesRepository _contactNoteTypesRepository;
 		private readonly IContactAssociationsRepository _contactAssociationsRepository;
+		private readonly IEventAggregator _eventAggregator;
 
 		public ContactsService(IContactsRepository contactsRepository, IContactNotesRepository contactNotesRepository,
-			IContactCategoryRepository contactCategoryRepository,
-			IContactNoteTypesRepository contactNoteTypesRepository, IContactAssociationsRepository contactAssociationsRepository)
+			IContactCategoryRepository contactCategoryRepository,  IContactNoteTypesRepository contactNoteTypesRepository,
+			IContactAssociationsRepository contactAssociationsRepository, IEventAggregator eventAggregator)
 		{
 			_contactsRepository = contactsRepository;
 			_contactCategoryRepository = contactCategoryRepository;
 			_contactNotesRepository = contactNotesRepository;
 			_contactNoteTypesRepository = contactNoteTypesRepository;
 			_contactAssociationsRepository = contactAssociationsRepository;
+			_eventAggregator = eventAggregator;
 		}
 
 		public async Task<List<Contact>> GetAllContactsForDepartmentAsync(int departmentId)
 		{
+			var contactsResult = new List<Contact>();
 			var contacts = await _contactsRepository.GetAllByDepartmentIdAsync(departmentId);
 			var categories = await _contactCategoryRepository.GetAllByDepartmentIdAsync(departmentId);
 
@@ -37,11 +44,16 @@ public async Task<List<Contact>> GetAllContactsForDepartmentAsync(int department
 
 			foreach (var contact in contacts)
 			{
+				if (contact.IsDeleted)
+					continue;
+
 				if (categories != null && categories.Any())
 					contact.Category = categories.FirstOrDefault(x => x.ContactCategoryId == contact.ContactCategoryId);
+
+				contactsResult.Add(contact);
 			}
 
-			return contacts.ToList();
+			return contactsResult;
 		}
 
 		public async Task<List<ContactCategory>> GetContactCategoriesForDepartmentAsync(int departmentId)
@@ -156,5 +168,30 @@ public async Task<bool> DoesContactNoteTypeAlreadyExistAsync(int departmentId, s
 			return await _contactNotesRepository.SaveOrUpdateAsync(note, cancellationToken);
 		}
 
+		public async Task<bool> DeleteContactAsync(string contactId, string userId, int departmentId, string ipAddress, string userAgent, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var auditEvent = new AuditEvent();
+			auditEvent.DepartmentId = departmentId;
+			auditEvent.UserId = userId;
+			auditEvent.Type = AuditLogTypes.ContactRemoved;
+			auditEvent.Successful = true;
+			auditEvent.IpAddress = ipAddress;
+			auditEvent.ServerName = Environment.MachineName;
+			auditEvent.UserAgent = userAgent;
+
+			var contact = await _contactsRepository.GetByIdAsync(contactId);
+			auditEvent.Before = contact.CloneJsonToString();
+
+			contact.IsDeleted = true;
+			contact.EditedByUserId = userId;
+			contact.EditedOn = DateTime.UtcNow;
+
+			await SaveContactAsync(contact, cancellationToken);
+
+			auditEvent.After = contact.CloneJsonToString();
+			_eventAggregator.SendMessage<AuditEvent>(auditEvent);
+
+			return true;
+		}
 	}
 }

Repositories/Resgrid.Repositories.DataRepository/CallsRepository.cs

@@ -362,6 +362,48 @@ public async Task<IEnumerable<Call>> GetAllNonDispatchedScheduledCallsByDepartme
 			}
 		}
 
+		public async Task<IEnumerable<Call>> GetAllCallsByContactIdAsync(string contactId, int departmentId)
+		{
+			try
+			{
+				var selectFunction = new Func<DbConnection, Task<IEnumerable<Call>>>(async x =>
+				{
+					var dynamicParameters = new DynamicParametersExtension();
+					dynamicParameters.Add("ContactId", contactId);
+					dynamicParameters.Add("DepartmentId", departmentId);
+
+					var query = _queryFactory.GetQuery<SelectCallsByContactQuery>();
+
+					return await x.QueryAsync<Call>(sql: query,
+						param: dynamicParameters,
+						transaction: _unitOfWork.Transaction);
+				});
+
+				DbConnection conn = null;
+				if (_unitOfWork?.Connection == null)
+				{
+					using (conn = _connectionProvider.Create())
+					{
+						await conn.OpenAsync();
+
+						return await selectFunction(conn);
+					}
+				}
+				else
+				{
+					conn = _unitOfWork.CreateOrGetConnection();
+
+					return await selectFunction(conn);
+				}
+			}
+			catch (Exception ex)
+			{
+				Logging.LogException(ex);
+
+				throw;
+			}
+		}
+
 		public void CleanUpCallDispatchAudio()
 		{
 			//var lastestDate = DateTime.UtcNow.AddDays(-14);