Adding better sorting and handling of worker email already in use

Author: renemadsen

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationAssignmentWorkerServiceHelper.cs

@@ -228,7 +228,7 @@ await core.EntityItemUpdate(entity.Id, entity.Name, entity.Description,
                     await bus.SendLocal(new DocumentUpdated(documentId)).ConfigureAwait(false);
                 }
 
-                if (!(bool)updateModel.TaskManagementEnabled!)
+                if (updateModel.TaskManagementEnabled!)
                 {
                     foreach (var propertyWorker in assignments)
                     {
@@ -286,6 +286,12 @@ public static async Task<OperationResult> UpdateDeviceUser(DeviceUserModel devic
                     var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.MicrotingUid == siteDto.WorkerUid).ConfigureAwait(false);
                     if (worker != null)
                     {
+
+                        if (sdkDbContext.Workers.Any(x => x.Email == deviceUserModel.WorkerEmail && x.MicrotingUid != siteDto.WorkerUid))
+                        {
+                            // this email is already in use
+                            return new OperationDataResult<int>(false, "EmailIsAlreadyInUse");
+                        }
                         var fullName = deviceUserModel.UserFirstName + " " + deviceUserModel.UserLastName;
                         var isUpdated = await core.SiteUpdate(deviceUserModel.SiteMicrotingUid, fullName, deviceUserModel.UserFirstName,
                             deviceUserModel.UserLastName, worker.Email, deviceUserModel.LanguageCode).ConfigureAwait(false);
@@ -517,7 +523,13 @@ public static async Task<OperationDataResult<int>> CreateDeviceUser(DeviceUserMo
 
             site = await sdkDbContext.Sites.Where(x => x.MicrotingUid == siteDto.SiteId).FirstAsync().ConfigureAwait(false);
 
-            Worker worker = await sdkDbContext.Workers.SingleAsync(x => x.MicrotingUid == siteDto.WorkerUid).ConfigureAwait(false);
+            var worker = await sdkDbContext.Workers.SingleAsync(x => x.MicrotingUid == siteDto.WorkerUid).ConfigureAwait(false);
+
+            if (sdkDbContext.Workers.Any(x => x.Email == deviceUserModel.WorkerEmail && x.MicrotingUid != siteDto.WorkerUid))
+            {
+                // this email is already in use
+                return new OperationDataResult<int>(false, "EmailIsAlreadyInUse");
+            }
 
             worker.EmployeeNo = deviceUserModel.EmployeeNo;
             worker.PinCode = deviceUserModel.PinCode;

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/AssignmentWorker/PropertyAssignWorkersModel.cs

@@ -33,7 +33,7 @@ public class PropertyAssignWorkersModel
     public List<PropertyAssignmentWorkerModel> Assignments { get; set; }
         = [];
 
-    public bool? TimeRegistrationEnabled { get; set; }
+    public bool TimeRegistrationEnabled { get; set; }
 
-    public bool? TaskManagementEnabled { get; set; }
+    public bool TaskManagementEnabled { get; set; }
 }

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/DeviceUserModel.cs

@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 using System.Collections.Generic;
 
 namespace BackendConfiguration.Pn.Infrastructure.Models;
@@ -104,8 +105,8 @@ public class DeviceUserModel
 
     public string EmployeeNo { get; set; }
 
-    public string WorkerEmail { get; set; }
-    public string PhoneNumber { get; set; }
+    public string? WorkerEmail { get; set; }
+    public string? PhoneNumber { get; set; }
 
     public static implicit operator DeviceUserModel(Microting.EformAngularFrontendBase.Infrastructure.Data.Models.DeviceUserModel model)
     {

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationAssignmentWorkerService/BackendConfigurationAssignmentWorkerService.cs

@@ -139,7 +139,7 @@ public async Task<OperationDataResult<List<PropertyAssignWorkersModel>>> GetProp
                     }
 
                     assignWorkersModels.Add(new PropertyAssignWorkersModel
-                        { SiteId = workerId.WorkerId, Assignments = assignments, TaskManagementEnabled = workerId.TaskManagementEnabled });
+                        { SiteId = workerId.WorkerId, Assignments = assignments, TaskManagementEnabled = workerId.TaskManagementEnabled ?? false });
                 }
 
                 var properties = await backendConfigurationPnDbContext.Properties
@@ -201,7 +201,7 @@ public async Task<OperationDataResult<List<PropertyAssignWorkersModel>>> GetSimp
                         .ToListAsync().ConfigureAwait(false);
 
                     assignWorkersModels.Add(new PropertyAssignWorkersModel
-                        { SiteId = workerId.WorkerId, Assignments = assignments, TaskManagementEnabled = workerId.TaskManagementEnabled });
+                        { SiteId = workerId.WorkerId, Assignments = assignments, TaskManagementEnabled = workerId.TaskManagementEnabled ?? false });
                 }
 
                 var properties = await backendConfigurationPnDbContext.Properties
@@ -363,7 +363,7 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
                     UserLastName = worker.LastName,
                     site.WorkflowState,
                     WorkerEmail = worker.Email,
-                    PhoneNumber = worker.PhoneNumber,
+                    worker.PhoneNumber,
 
                 };
             sitesQuery = sitesQuery.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed);
@@ -490,9 +490,16 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
             // Convert deviceUsers to IQueryable
             var deviceUsersQuery = deviceUsers.AsQueryable();
 
+            var tempList = deviceUsersQuery.ToList();
+
+            foreach (var deviceUserModel in tempList)
+            {
+                Console.WriteLine("Device user: " + deviceUserModel.SiteName + " with workerEmail: " + deviceUserModel.WorkerEmail + " and phone number: " + deviceUserModel.PhoneNumber);
+            }
+
             try
             {
-                deviceUsersQuery = QueryHelper.AddFilterAndSortToQuery(deviceUsersQuery, requestModel, new List<string> { "SiteName" });
+                deviceUsersQuery = QueryHelper.AddFilterAndSortToQuery(deviceUsersQuery, requestModel, new List<string> { "SiteName", "WorkerEmail", "PhoneNumber", "EmployeeNo" });
             }
             catch (Exception e)
             {

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-table/property-worker-table.component.ts

@@ -99,14 +99,14 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
     },
     {
       header: this.translateService.stream('Email'),
-      sortProp: {id: 'workerEmail'},
+      sortProp: {id: 'WorkerEmail'},
       field: 'workerEmail',
       sortable: true,
       formatter: (rowData: DeviceUserModel) => rowData.workerEmail ? `${rowData.workerEmail}` : `N/A`,
     },
     {
       header: this.translateService.stream('Phone number'),
-      sortProp: {id: 'phoneNumber'},
+      sortProp: {id: 'PhoneNumber'},
       field: 'phoneNumber',
       sortable: true,
       formatter: (rowData: DeviceUserModel) => rowData.phoneNumber ? `${rowData.phoneNumber}` : `N/A`,