Improving the lookup, so we use the email instead of full name.

Author: renemadsen

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs

@@ -280,19 +280,21 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
             await baseDbContext.SaveChangesAsync();
         }
 
-        var fullName = currentUser.FirstName.Trim() + " " + currentUser.LastName.Trim();
-
-        var site = await sdkDbContext.Sites
+        var worker = await sdkDbContext.Workers
+            .Include(x => x.SiteWorkers)
+            .ThenInclude(x => x.Site)
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
-            .FirstOrDefaultAsync(x => x.Name.Replace(" ", "") == fullName.Replace(" ", ""));
+            .FirstOrDefaultAsync(x => x.Email == currentUser.Email);
 
-        if (site == null)
+        if (worker == null)
         {
             return new OperationDataResult<TimePlanningPlanningModel>(
                 false,
                 localizationService.GetString("SiteNotFound"));
         }
 
+        var site = worker.SiteWorkers.First().Site;
+
         var dbAssignedSite = await dbContext.AssignedSites
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
             .FirstOrDefaultAsync(x => x.SiteId == site.MicrotingUid);
@@ -941,21 +943,24 @@ public async Task<OperationResult> UpdateByCurrentUserNam(
             var currentUserAsync = await userService.GetCurrentUserAsync();
             var currentUser = baseDbContext.Users
                 .Single(x => x.Id == currentUserAsync.Id);
-            var fullName = currentUser.FirstName.Trim() + " " + currentUser.LastName.Trim();
-            var sdkSite = await sdkDbContext.Sites
+            var worker = await sdkDbContext.Workers
+                .Include(x => x.SiteWorkers)
+                .ThenInclude(x => x.Site)
                 .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
-                .FirstOrDefaultAsync(x => x.Name.Replace(" ", "") == fullName.Replace(" ", ""));
+                .FirstOrDefaultAsync(x => x.Email == currentUser.Email);
 
-            if (sdkSite == null)
+            if (worker == null)
             {
                 return new OperationDataResult<TimePlanningPlanningModel>(
                     false,
                     localizationService.GetString("SiteNotFound"));
             }
 
+            var mcrotingUid = worker.SiteWorkers.First().Site.MicrotingUid;
+
             var assignedSite = await dbContext.AssignedSites
                 .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
-                .FirstOrDefaultAsync(x => x.SiteId == sdkSite.MicrotingUid);
+                .FirstOrDefaultAsync(x => x.SiteId == mcrotingUid);
 
             if (assignedSite == null)
             {

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs

@@ -356,16 +356,20 @@ planRegistrationForToday is
         var currentUserAsync = await userService.GetCurrentUserAsync();
         var currentUser = baseDbContext.Users
             .Single(x => x.Id == currentUserAsync.Id);
-        var fullName = currentUser.FirstName.Trim() + " " + currentUser.LastName.Trim();
-        var sdkSite = await sdkContext.Sites
+
+        var worker = await sdkContext.Workers
+            .Include(x => x.SiteWorkers)
+            .ThenInclude(x => x.Site)
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
-            .FirstOrDefaultAsync(x => x.Name.Replace(" ", "") == fullName.Replace(" ", ""));
+            .FirstOrDefaultAsync(x => x.Email == currentUser.Email);
 
-        if (sdkSite == null)
+        if (worker == null)
         {
             return new OperationDataResult<Infrastructure.Models.Settings.AssignedSite>(false, "Site not found");
         }
 
+        var sdkSite = worker.SiteWorkers.First().Site;
+
         Infrastructure.Models.Settings.AssignedSite dbAssignedSite = await dbContext.AssignedSites
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
             .AsNoTracking()