Skip to content

Commit 58830c2

Browse files
Copilotrenemadsen
andcommitted
Eliminate all remaining C# warnings
Co-authored-by: renemadsen <[email protected]>
1 parent af48148 commit 58830c2

File tree

6 files changed

+29
-13
lines changed

6 files changed

+29
-13
lines changed

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn.Test/TestBaseSetup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
using NUnit.Framework;
1010
using Testcontainers.MariaDb;
1111

12+
#nullable enable
1213
namespace BackendConfiguration.Pn.Integration.Test;
1314

14-
public class TestBaseSetup
15+
public abstract class TestBaseSetup
1516
{
1617
private readonly MariaDbContainer _mariadbTestcontainer = new MariaDbBuilder()
1718
.WithDatabase(

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/GoogleSheetHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public static async Task PullEverythingFromGoogleSheet(Core core, TimePlanningPn
167167
}
168168

169169
var applicationName = "Google Sheets API Integration";
170-
var sheetName = "PlanTimer";
171170

172171
//var core = await coreHelper.GetCore();
173172
await using var sdkDbContext = core.DbContextHelper.GetDbContext();

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
18861886
await planRegistration.Update(dbContext).ConfigureAwait(false);
18871887
}
18881888
}
1889-
catch (Exception e)
1889+
catch (Exception)
18901890
{
18911891
SentrySdk.CaptureMessage(
18921892
$"Could not parse PlanText for planning with id: {planRegistration.Id} the PlanText was: {planRegistration.PlanText}");

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,13 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
298298
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
299299
.FirstOrDefaultAsync(x => x.SiteId == site.MicrotingUid);
300300

301+
if (dbAssignedSite == null)
302+
{
303+
return new OperationDataResult<TimePlanningPlanningModel>(
304+
false,
305+
localizationService.GetString("AssignedSiteNotFound"));
306+
}
307+
301308
var datesInPeriod = new List<DateTime>();
302309
var midnightOfDateFrom = new DateTime(model.DateFrom!.Value.Year, model.DateFrom.Value.Month, model.DateFrom.Value.Day, 0, 0, 0);
303310
var midnightOfDateTo = new DateTime(model.DateTo!.Value.Year, model.DateTo.Value.Month, model.DateTo.Value.Day, 23, 59, 59);
@@ -318,7 +325,8 @@ public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrent
318325

319326
try
320327
{
321-
siteModel.SoftwareVersionIsValid = int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
328+
siteModel.SoftwareVersionIsValid = currentUser.TimeRegistrationSoftwareVersion != null &&
329+
int.Parse(currentUser.TimeRegistrationSoftwareVersion.Replace(".", "")) >= 3114;
322330
}
323331
catch (Exception)
324332
{
@@ -896,6 +904,8 @@ await dbContext.PlanRegistrations.AsNoTracking()
896904
.OrderByDescending(x => x.Date)
897905
.FirstOrDefaultAsync();
898906

907+
if (preTimePlanningAfterThisPlanning == null) continue;
908+
899909
planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
900910
if (planningAfterThisPlanning.NettoHoursOverrideActive)
901911
{
@@ -1367,6 +1377,8 @@ await dbContext.PlanRegistrations.AsNoTracking()
13671377
.OrderByDescending(x => x.Date)
13681378
.FirstOrDefaultAsync();
13691379

1380+
if (preTimePlanningAfterThisPlanning == null) continue;
1381+
13701382
planningAfterThisPlanning.SumFlexStart = preTimePlanningAfterThisPlanning.SumFlexEnd;
13711383
planningAfterThisPlanning.SumFlexEnd = preTimePlanningAfterThisPlanning.SumFlexEnd +
13721384
planningAfterThisPlanning.NettoHours -

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class TimeSettingService(
5656
IEFormCoreService core)
5757
: ISettingService
5858
{
59-
public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
59+
public Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
6060
{
6161
try
6262
{
@@ -93,16 +93,16 @@ public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
9393
};
9494

9595
//timePlanningSettingsModel.AssignedSites = assignedSites;
96-
return new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel);
96+
return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(true, timePlanningSettingsModel));
9797
}
9898
catch (Exception e)
9999
{
100100
SentrySdk.CaptureException(e);
101101
Console.WriteLine(e);
102102
logger.LogError(e.Message);
103-
return new OperationDataResult<TimePlanningSettingsModel>(
103+
return Task.FromResult(new OperationDataResult<TimePlanningSettingsModel>(
104104
false,
105-
localizationService.GetString("ErrorWhileObtainingSettings"));
105+
localizationService.GetString("ErrorWhileObtainingSettings")));
106106
}
107107
}
108108

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,10 +2699,14 @@ public async Task<OperationResult> Import(IFormFile file)
26992699
return new OperationResult(false, localizationService.GetString("FileFormatError"));
27002700
}
27012701
var sheets = workbookPart.Workbook.Sheets;
2702+
if (sheets == null)
2703+
{
2704+
return new OperationResult(false, localizationService.GetString("FileFormatError"));
2705+
}
27022706

27032707
foreach (Sheet sheet in sheets)
27042708
{
2705-
if (sheet.Name?.Value == null || sheet.Id == null)
2709+
if (sheet.Name?.Value == null || sheet.Id?.Value == null)
27062710
{
27072711
continue;
27082712
}
@@ -2712,7 +2716,7 @@ public async Task<OperationResult> Import(IFormFile file)
27122716
continue;
27132717
}
27142718

2715-
var worksheetPart = (WorksheetPart)workbookPart.GetPartById(sheet.Id);
2719+
var worksheetPart = (WorksheetPart)workbookPart.GetPartById(sheet.Id.Value);
27162720
var sheetData = worksheetPart.Worksheet.Elements<SheetData>().First();
27172721

27182722
var rows = sheetData.Elements<Row>();
@@ -2885,7 +2889,7 @@ private string GetCellValue(WorkbookPart workbookPart, Row row, int columnIndex)
28852889
if (cell.StyleIndex != null)
28862890
{
28872891
var stylesPart = workbookPart.WorkbookStylesPart;
2888-
if (stylesPart != null)
2892+
if (stylesPart?.Stylesheet?.CellFormats != null)
28892893
{
28902894
var cellFormat = stylesPart.Stylesheet.CellFormats.ElementAt((int)cell.StyleIndex.Value) as CellFormat;
28912895
var isDate = IsDateFormat(stylesPart, cellFormat);
@@ -2922,8 +2926,8 @@ private bool IsDateFormat(WorkbookStylesPart stylesPart, CellFormat? cellFormat)
29222926
var numberFormats = stylesPart.Stylesheet.NumberingFormats?.Elements<NumberingFormat>();
29232927
if (numberFormats != null)
29242928
{
2925-
var format = numberFormats.FirstOrDefault(nf => nf.NumberFormatId.Value == cellFormat.NumberFormatId.Value);
2926-
if (format != null && format.FormatCode != null)
2929+
var format = numberFormats.FirstOrDefault(nf => nf.NumberFormatId?.Value == cellFormat.NumberFormatId.Value);
2930+
if (format?.FormatCode?.Value != null)
29272931
{
29282932
// Check if the custom format code looks like a date format
29292933
var formatCode = format.FormatCode.Value.ToLower();

0 commit comments

Comments
 (0)