Merge pull request #1061 from microting/copilot/fix-5241e716-5df9-4b71-9940-c26933641a61

renemadsen · web-flow · commit 08f8e4d5a4c6 · 2025-10-05T10:32:50.000+02:00
Eliminate all C# warnings by adding nullable annotations context and fixing null reference issues
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn.Test/TestBaseSetup.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn.Test/TestBaseSetup.cs
@@ -9,9 +9,10 @@
 using NUnit.Framework;
 using Testcontainers.MariaDb;
 
+#nullable enable
 namespace BackendConfiguration.Pn.Integration.Test;
 
-public class TestBaseSetup
+public abstract class TestBaseSetup
 {
     private readonly MariaDbContainer _mariadbTestcontainer = new MariaDbBuilder()
         .WithDatabase(
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningPlanningController.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningPlanningController.cs
@@ -18,6 +18,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 namespace TimePlanning.Pn.Controllers;
 
 using System.Collections.Generic;
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningWorkingHoursController.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningWorkingHoursController.cs
@@ -18,6 +18,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 using System;
 using System.Text;
 using Microsoft.AspNetCore.Authorization;
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/GoogleSheetHelper.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/GoogleSheetHelper.cs
@@ -167,7 +167,6 @@ public static async Task PullEverythingFromGoogleSheet(Core core, TimePlanningPn
         }
 
         var applicationName = "Google Sheets API Integration";
-        var sheetName = "PlanTimer";
 
         //var core = await coreHelper.GetCore();
         await using var sdkDbContext = core.DbContextHelper.GetDbContext();
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs
@@ -1886,7 +1886,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
                     await planRegistration.Update(dbContext).ConfigureAwait(false);
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 SentrySdk.CaptureMessage(
                     $"Could not parse PlanText for planning with id: {planRegistration.Id} the PlanText was: {planRegistration.PlanText}");
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/WorkingHours/Index/TimePlanningWorkingHourSimpleModel.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/WorkingHours/Index/TimePlanningWorkingHourSimpleModel.cs
@@ -28,19 +28,19 @@ namespace TimePlanning.Pn.Infrastructure.Models.WorkingHours.Index;
 /// </summary>
 public class TimePlanningWorkingHourSimpleModel
 {
-    public string Date { get; set; }
-    public string YesterDay { get; set; }
-    public string Worker { get; set; }
-    public string PlanText { get; set; }
+    public string Date { get; set; } = null!;
+    public string YesterDay { get; set; } = null!;
+    public string Worker { get; set; } = null!;
+    public string PlanText { get; set; } = null!;
     public double PlanHours { get; set; }
     public double NettoHours { get; set; }
     public double FlexHours { get; set; }
-    public string SumFlexStart { get; set; }
-    public string SumFlexEnd { get; set; }
+    public string SumFlexStart { get; set; } = null!;
+    public string SumFlexEnd { get; set; } = null!;
     public double PaidOutFlex { get; set; }
-    public string Message { get; set; }
-    public string CommentWorker { get; set; }
-    public string CommentOffice { get; set; }
+    public string Message { get; set; } = null!;
+    public string CommentWorker { get; set; } = null!;
+    public string CommentOffice { get; set; } = null!;
     public string? Start1StartedAt { get; set; }
     public string? Stop1StoppedAt { get; set; }
     public string? Pause1StartedAt { get; set; }
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/ITimePlanningPlanningService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/ITimePlanningPlanningService.cs
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 namespace TimePlanning.Pn.Services.TimePlanningPlanningService;
 
 using System.Collections.Generic;
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.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.Text.RegularExpressions;
 using Microting.EformAngularFrontendBase.Infrastructure.Data;
 using Microting.eFormApi.BasePn.Infrastructure.Helpers.PluginDbOptions;
@@ -297,6 +298,13 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
             .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);
@@ -317,7 +325,8 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
 
         try
         {
-            siteModel.SoftwareVersionIsValid = int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
+            siteModel.SoftwareVersionIsValid = currentUser.TimeRegistrationSoftwareVersion != null && 
+                int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
         }
         catch (Exception)
         {
@@ -895,6 +904,8 @@ await dbContext.PlanRegistrations.AsNoTracking()
                         .OrderByDescending(x => x.Date)
                         .FirstOrDefaultAsync();
 
+                if (preTimePlanningAfterThisPlanning == null) continue;
+
                 planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
                 if (planningAfterThisPlanning.NettoHoursOverrideActive)
                 {
@@ -1366,6 +1377,8 @@ await dbContext.PlanRegistrations.AsNoTracking()
                         .OrderByDescending(x => x.Date)
                         .FirstOrDefaultAsync();
 
+                if (preTimePlanningAfterThisPlanning == null) continue;
+
                 planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
                 planningAfterThisPlanning.SumFlexEnd = preTimePlanningAfterThisPlanning.SumFlexEnd +
                                                        planningAfterThisPlanning.NettoHours -
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs
@@ -56,7 +56,7 @@ public class TimeSettingService(
     IEFormCoreService core)
     : ISettingService
 {
-    public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
+    public Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
     {
         try
         {
@@ -93,16 +93,16 @@ public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
             };
 
             //timePlanningSettingsModel.AssignedSites = assignedSites;
-            return new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel);
+            return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel));
         }
         catch (Exception e)
         {
             SentrySdk.CaptureException(e);
             Console.WriteLine(e);
             logger.LogError(e.Message);
-            return new OperationDataResult<TimePlanningSettingsModel>(
+            return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(
                 false,
-                localizationService.GetString("ErrorWhileObtainingSettings"));
+                localizationService.GetString("ErrorWhileObtainingSettings")));
         }
     }
 
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningWorkingHoursService/ITimePlanningWorkingHoursService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningWorkingHoursService/ITimePlanningWorkingHoursService.cs
@@ -18,6 +18,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Http;
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningWorkingHoursService/TimePlanningWorkingHoursService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningWorkingHoursService/TimePlanningWorkingHoursService.cs
@@ -143,7 +143,7 @@ public async Task<OperationDataResult<List<TimePlanningWorkingHoursModel>>> Inde
                     CommentWorker = x.WorkerComment.Replace("\r", "<br />"),
                     CommentOffice = x.CommentOffice.Replace("\r", "<br />"),
                     // CommentOfficeAll = x.CommentOfficeAll,
-                    IsLocked = (x.Date < DateTime.Now.AddDays(-(int)maxDaysEditable) || x.Date == midnight),
+                    IsLocked = (x.Date < DateTime.Now.AddDays(-(int)(maxDaysEditable ?? 0)) || x.Date == midnight),
                     IsWeekend = x.Date.DayOfWeek == DayOfWeek.Saturday || x.Date.DayOfWeek == DayOfWeek.Sunday,
                     NettoHoursOverride = x.NettoHoursOverride,
                     NettoHoursOverrideActive = x.NettoHoursOverrideActive
@@ -228,7 +228,7 @@ public async Task<OperationDataResult<List<TimePlanningWorkingHoursModel>>> Inde
                         {
                             Date = model.DateFrom.AddDays(i),
                             WeekDay = (int)model.DateFrom.AddDays(i).DayOfWeek,
-                            IsLocked = model.DateFrom.AddDays(i) < DateTime.Now.AddDays(-(int)maxDaysEditable) ||
+                            IsLocked = model.DateFrom.AddDays(i) < DateTime.Now.AddDays(-(int)(maxDaysEditable ?? 0)) ||
                                        model.DateFrom.AddDays(i) == midnight,
                             IsWeekend = model.DateFrom.AddDays(i).DayOfWeek == DayOfWeek.Saturday
                                         || model.DateFrom.AddDays(i).DayOfWeek == DayOfWeek.Sunday
@@ -516,7 +516,7 @@ public async Task<OperationDataResult<TimePlanningWorkingHourSimpleModel>> ReadS
 
         if (sdkSite == null)
         {
-            return new OperationDataResult<TimePlanningWorkingHourSimpleModel>(false, "Site not found", null);
+            return new OperationDataResult<TimePlanningWorkingHourSimpleModel>(false, "Site not found", null!);
         }
 
         var midnight = new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, 0, 0, 0);
@@ -642,7 +642,7 @@ public async Task<OperationDataResult<TimePlanningHoursSummaryModel>> CalculateH
 
             if (sdkSite == null)
             {
-                return new OperationDataResult<TimePlanningHoursSummaryModel>(false, "Site not found", null);
+                return new OperationDataResult<TimePlanningHoursSummaryModel>(false, "Site not found", null!);
             }
 
             var planRegistrations = await dbContext.PlanRegistrations
@@ -708,7 +708,7 @@ public async Task<OperationDataResult<TimePlanningWorkingHoursModel>> Read(int s
         if (result == null)
         {
             return new OperationDataResult<TimePlanningWorkingHoursModel>(false,
-                localizationService.GetString("PlanRegistrationNotFound"), null);
+                localizationService.GetString("PlanRegistrationNotFound"), null!);
         }
         return new OperationDataResult<TimePlanningWorkingHoursModel>(true, "Plan registration found",
             result);
@@ -992,7 +992,7 @@ public async Task<OperationResult> UpdateWorkingHour(TimePlanningWorkingHoursUpd
                     : DateTime.Parse(model.Pause5StoppedAt),
                 Flex = 0,
                 WorkerComment = model.CommentWorker,
-                SdkSitId = (int)sdkSite.MicrotingUid,
+                SdkSitId = sdkSite.MicrotingUid!.Value,
                 Shift1PauseNumber = model.Shift1PauseNumber,
                 Shift2PauseNumber = model.Shift2PauseNumber,
             };
@@ -2258,11 +2258,11 @@ private void FillDataRow(Row dataRow, Worker worker, Microting.eForm.Infrastruct
         }
     }
 
-    private Cell CreateCell(string value)
+    private Cell CreateCell(string? value)
     {
         return new Cell()
         {
-            CellValue = new CellValue(value),
+            CellValue = new CellValue(value ?? string.Empty),
             DataType = CellValues.String // Explicitly setting the data type to string
         };
     }
@@ -2326,8 +2326,8 @@ private void ValidateExcel(string fileName)
                 count++;
                 sb.Append(("Error Count : " + count) + "\r\n");
                 sb.Append(("Description : " + error.Description) + "\r\n");
-                sb.Append(("Path: " + error.Path.XPath) + "\r\n");
-                sb.Append(("Part: " + error.Part.Uri) + "\r\n");
+                sb.Append(("Path: " + error.Path?.XPath) + "\r\n");
+                sb.Append(("Part: " + error.Part?.Uri) + "\r\n");
                 sb.Append("\r\n-------------------------------------------------\r\n");
             }
 
@@ -2694,24 +2694,36 @@ public async Task<OperationResult> Import(IFormFile file)
                 using (var spreadsheetDocument = SpreadsheetDocument.Open(stream, false))
                 {
                     var workbookPart = spreadsheetDocument.WorkbookPart;
+                    if (workbookPart == null)
+                    {
+                        return new OperationResult(false, localizationService.GetString("FileFormatError"));
+                    }
                     var sheets = workbookPart.Workbook.Sheets;
+                    if (sheets == null)
+                    {
+                        return new OperationResult(false, localizationService.GetString("FileFormatError"));
+                    }
 
                     foreach (Sheet sheet in sheets)
                     {
+                        if (sheet.Name?.Value == null || sheet.Id?.Value == null)
+                        {
+                            continue;
+                        }
                         var site = await sdkContext.Sites.FirstOrDefaultAsync(x => x.Name.Replace(" ", "").ToLower() == sheet.Name.Value.Replace(" ", "").ToLower());
                         if (site == null)
                         {
                             continue;
                         }
 
-                        var worksheetPart = (WorksheetPart)workbookPart.GetPartById(sheet.Id);
+                        var worksheetPart = (WorksheetPart)workbookPart.GetPartById(sheet.Id.Value);
                         var sheetData = worksheetPart.Worksheet.Elements<SheetData>().First();
 
                         var rows = sheetData.Elements<Row>();
                         foreach (var row in rows)
                         {
                             // Skip header row
-                            if (row.RowIndex == 1)
+                            if (row.RowIndex?.Value == 1)
                             {
                                 continue;
                             }
@@ -2849,10 +2861,10 @@ private string GetCellValue(WorkbookPart workbookPart, Row row, int columnIndex)
         var columnLetter = GetColumnLetter(columnIndex);
 
         // Create the cell reference (e.g., A1, B1, C1)
-        var cellReference = columnLetter + row.RowIndex;
+        var cellReference = columnLetter + row.RowIndex?.Value;
 
         // Find the cell with the matching CellReference
-        var cell = row.Elements<Cell>().FirstOrDefault(c => c.CellReference.Value == cellReference);
+        var cell = row.Elements<Cell>().FirstOrDefault(c => c.CellReference?.Value == cellReference);
 
         if (cell == null || cell.CellValue == null)
         {
@@ -2866,30 +2878,36 @@ private string GetCellValue(WorkbookPart workbookPart, Row row, int columnIndex)
             if (sharedStringTablePart != null)
             {
                 var sharedStringTable = sharedStringTablePart.SharedStringTable;
-                return sharedStringTable.ElementAt(int.Parse(cell.CellValue.Text)).InnerText;
+                if (sharedStringTable != null)
+                {
+                    return sharedStringTable.ElementAt(int.Parse(cell.CellValue.Text)).InnerText;
+                }
             }
         }
 
         // Check if the cell has a StyleIndex (to determine if it's a date)
         if (cell.StyleIndex != null)
         {
             var stylesPart = workbookPart.WorkbookStylesPart;
-            var cellFormat = stylesPart.Stylesheet.CellFormats.ElementAt((int)cell.StyleIndex.Value) as CellFormat;
-            var isDate = IsDateFormat(stylesPart, cellFormat);
-
-            // If it's a date format, interpret the numeric value as a date
-            if (isDate && double.TryParse(cell.CellValue.Text, out var oaDate))
+            if (stylesPart?.Stylesheet?.CellFormats != null)
             {
-                var dateValue = DateTime.FromOADate(oaDate);
-                return dateValue.ToString("dd.MM.yyyy"); // Format as a date
+                var cellFormat = stylesPart.Stylesheet.CellFormats.ElementAt((int)cell.StyleIndex.Value) as CellFormat;
+                var isDate = IsDateFormat(stylesPart, cellFormat);
+
+                // If it's a date format, interpret the numeric value as a date
+                if (isDate && double.TryParse(cell.CellValue.Text, out var oaDate))
+                {
+                    var dateValue = DateTime.FromOADate(oaDate);
+                    return dateValue.ToString("dd.MM.yyyy"); // Format as a date
+                }
             }
         }
 
         // Handle other numbers or strings
         return cell.CellValue.Text;
     }
 
-    private bool IsDateFormat(WorkbookStylesPart stylesPart, CellFormat cellFormat)
+    private bool IsDateFormat(WorkbookStylesPart stylesPart, CellFormat? cellFormat)
     {
         if (cellFormat == null || cellFormat.NumberFormatId == null)
         {
@@ -2908,8 +2926,8 @@ private bool IsDateFormat(WorkbookStylesPart stylesPart, CellFormat cellFormat)
         var numberFormats = stylesPart.Stylesheet.NumberingFormats?.Elements<NumberingFormat>();
         if (numberFormats != null)
         {
-            var format = numberFormats.FirstOrDefault(nf => nf.NumberFormatId.Value == cellFormat.NumberFormatId.Value);
-            if (format != null && format.FormatCode != null)
+            var format = numberFormats.FirstOrDefault(nf => nf.NumberFormatId?.Value == cellFormat.NumberFormatId.Value);
+            if (format?.FormatCode?.Value != null)
             {
                 // Check if the custom format code looks like a date format
                 var formatCode = format.FormatCode.Value.ToLower();

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,6 @@ public static async Task PullEverythingFromGoogleSheet(Core core, TimePlanningPn`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`var applicationName = "Google Sheets API Integration";`
`170`		`- var sheetName = "PlanTimer";`
`171`	`170`
`172`	`171`	`//var core = await coreHelper.GetCore();`
`173`	`172`	`await using var sdkDbContext = core.DbContextHelper.GetDbContext();`
Original file line number	Diff line number	Diff line change
`@@ -1886,7 +1886,7 @@ await dbContext.PlanRegistrations.AsNoTracking()`
`1886`	`1886`	`await planRegistration.Update(dbContext).ConfigureAwait(false);`
`1887`	`1887`	`}`
`1888`	`1888`	`}`
`1889`		`- catch (Exception e)`
	`1889`	`+ catch (Exception)`
`1890`	`1890`	`{`
`1891`	`1891`	`SentrySdk.CaptureMessage(`
`1892`	`1892`	`$"Could not parse PlanText for planning with id: {planRegistration.Id} the PlanText was: {planRegistration.PlanText}");`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class TimeSettingService(`
`56`	`56`	`IEFormCoreService core)`
`57`	`57`	`: ISettingService`
`58`	`58`	`{`
`59`		`- public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()`
	`59`	`+ public Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()`
`60`	`60`	`{`
`61`	`61`	`try`
`62`	`62`	`{`
`@@ -93,16 +93,16 @@ public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()`
`93`	`93`	`};`
`94`	`94`
`95`	`95`	`//timePlanningSettingsModel.AssignedSites = assignedSites;`
`96`		`- return new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel);`
	`96`	`+ return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel));`
`97`	`97`	`}`
`98`	`98`	`catch (Exception e)`
`99`	`99`	`{`
`100`	`100`	`SentrySdk.CaptureException(e);`
`101`	`101`	`Console.WriteLine(e);`
`102`	`102`	`logger.LogError(e.Message);`
`103`		`- return new OperationDataResult<TimePlanningSettingsModel>(`
	`103`	`+ return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(`
`104`	`104`	`false,`
`105`		`- localizationService.GetString("ErrorWhileObtainingSettings"));`
	`105`	`+ localizationService.GetString("ErrorWhileObtainingSettings")));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`