Reverting broken merge.

Author: renemadsen

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

@@ -281,30 +281,25 @@ 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);
 
-        if (dbAssignedSite == null)
-        {
-            return new OperationDataResult<TimePlanningPlanningModel>(
-                false,
-                localizationService.GetString("AssignedSiteNotFound"));
-        }
-
         var datesInPeriod = new List<DateTime>();
         var midnightOfDateFrom = new DateTime(model.DateFrom!.Value.Year, model.DateFrom.Value.Month, model.DateFrom.Value.Day, 0, 0, 0);
         var midnightOfDateTo = new DateTime(model.DateTo!.Value.Year, model.DateTo.Value.Month, model.DateTo.Value.Day, 23, 59, 59);
@@ -325,8 +320,8 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
 
         try
         {
-            siteModel.SoftwareVersionIsValid = currentUser.TimeRegistrationSoftwareVersion != null && 
-                int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
+            siteModel.SoftwareVersionIsValid = currentUser.TimeRegistrationSoftwareVersion != null &&
+                                               int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
         }
         catch (Exception)
         {
@@ -904,8 +899,6 @@ await dbContext.PlanRegistrations.AsNoTracking()
                         .OrderByDescending(x => x.Date)
                         .FirstOrDefaultAsync();
 
-                if (preTimePlanningAfterThisPlanning == null) continue;
-
                 planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
                 if (planningAfterThisPlanning.NettoHoursOverrideActive)
                 {
@@ -952,21 +945,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)
             {
@@ -1377,8 +1373,6 @@ await dbContext.PlanRegistrations.AsNoTracking()
                         .OrderByDescending(x => x.Date)
                         .FirstOrDefaultAsync();
 
-                if (preTimePlanningAfterThisPlanning == null) continue;
-
                 planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
                 planningAfterThisPlanning.SumFlexEnd = preTimePlanningAfterThisPlanning.SumFlexEnd +
                                                        planningAfterThisPlanning.NettoHours -

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

@@ -56,7 +56,7 @@ public class TimeSettingService(
     IEFormCoreService core)
     : ISettingService
 {
-    public Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
+    public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
     {
         try
         {
@@ -93,16 +93,16 @@ public Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
             };
 
             //timePlanningSettingsModel.AssignedSites = assignedSites;
-            return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel));
+            return new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel);
         }
         catch (Exception e)
         {
             SentrySdk.CaptureException(e);
             Console.WriteLine(e);
             logger.LogError(e.Message);
-            return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(
+            return new OperationDataResult<TimePlanningSettingsModel>(
                 false,
-                localizationService.GetString("ErrorWhileObtainingSettings")));
+                localizationService.GetString("ErrorWhileObtainingSettings"));
         }
     }
 
@@ -362,11 +362,13 @@ planRegistrationForToday is
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
             .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()