Resolve null warnings

liguori · Aug 26, 2024 · 5764e68 · 5764e68
1 parent 9c32266
commit 5764e68
Show file tree

Hide file tree

Showing 23 changed files with 122 additions and 118 deletions.
diff --git a/src/Savings.API/Authentication/ApiKeyAuthenticationBuilder.cs b/src/Savings.API/Authentication/ApiKeyAuthenticationBuilder.cs
@@ -28,8 +28,8 @@ public class ApiKeyAuthOptions : AuthenticationSchemeOptions
 
     public class CustomAuthHandler : AuthenticationHandler<ApiKeyAuthOptions>
     {
-        public CustomAuthHandler(IOptionsMonitor<ApiKeyAuthOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
-            : base(options, logger, encoder, clock)
+        public CustomAuthHandler(IOptionsMonitor<ApiKeyAuthOptions> options, ILoggerFactory logger, UrlEncoder encoder)
+            : base(options, logger, encoder)
         {
         }
 

diff --git a/src/Savings.API/Controllers/MaterializedMoneyItemsController.cs b/src/Savings.API/Controllers/MaterializedMoneyItemsController.cs
@@ -20,11 +20,18 @@ public MaterializedMoneyItemsController(SavingsContext context)
         public async Task<ActionResult> PostLastMaterializedMoneyItemPeriod(DateTime date, decimal amount)
         {
             var res = await _context.MaterializedMoneyItems.Where(x => x.EndPeriod).OrderByDescending(x => x.Date).FirstOrDefaultAsync();
-            res.Date = date;
-            res.Amount = amount;
-            res.Projection = amount;
-            await _context.SaveChangesAsync();
-            return Ok();
+            if (res != null)
+            {
+                res.Date = date;
+                res.Amount = amount;
+                res.Projection = amount;
+                await _context.SaveChangesAsync();
+                return Ok();
+            }
+            else
+            {
+                return NotFound();
+            }
         }
 
 
@@ -33,7 +40,14 @@ public async Task<ActionResult> PostLastMaterializedMoneyItemPeriod(DateTime dat
         public async Task<ActionResult<MaterializedMoneyItem>> GetLastMaterializedMoneyItemPeriod()
         {
             var res = await _context.MaterializedMoneyItems.Where(x => x.EndPeriod).OrderByDescending(x => x.Date).FirstOrDefaultAsync();
-            return res;
+            if(res == null)
+            {
+                return NotFound();
+            }
+            else
+            {
+                return res;
+            }
         }
 
         // GET: api/MaterializedMoneyItems

diff --git a/src/Savings.API/Controllers/RecurrencyAdjustementsController.cs b/src/Savings.API/Controllers/RecurrencyAdjustementsController.cs
@@ -31,7 +31,7 @@ public async Task<ActionResult<IEnumerable<RecurrencyAdjustement>>> GetRecurrenc
 
         // GET: api/RecurrencyAdjustements/ByIDRecurrencyAndDate
         [HttpGet("ByIDRecurrencyAndDate", Name = "ByIDRecurrencyAndDate")]
-        public async Task<ActionResult<RecurrencyAdjustement>> GetByIDRecurrency(long idRecurrency, DateTime date)
+        public async Task<ActionResult<RecurrencyAdjustement?>> GetByIDRecurrency(long idRecurrency, DateTime date)
         {
             return await _context.RecurrencyAdjustements.Where(x => x.RecurrentMoneyItemID == idRecurrency && (x.RecurrencyNewDate.HasValue && x.RecurrencyNewDate == date.Date || !x.RecurrencyNewDate.HasValue && x.RecurrencyDate == date.Date)).FirstOrDefaultAsync();
         }

diff --git a/src/Savings.API/Controllers/RecurrentMoneyItemsController.cs b/src/Savings.API/Controllers/RecurrentMoneyItemsController.cs
@@ -109,7 +109,7 @@ public async Task<ActionResult<RecurrentMoneyItem>> InsertCreditFixedMoneyItem(F
             DateTime targetDate = DateTime.Now.AddMonths(1);
             targetDate = new DateTime(targetDate.Year, targetDate.Month, defaultCreditMoneyItem.StartDate.Day);
 
-            var recurrentMoneyItem = new RecurrentMoneyItem { CategoryID = fixedItem.CategoryID, Amount = fixedItem.Amount.Value, Note = fixedItem.Note, RecurrentMoneyItemID = defaultCreditMoneyItem.ID, StartDate = targetDate, EndDate = targetDate };
+            var recurrentMoneyItem = new RecurrentMoneyItem { CategoryID = fixedItem.CategoryID, Amount = fixedItem.Amount!.Value, Note = fixedItem.Note, RecurrentMoneyItemID = defaultCreditMoneyItem.ID, StartDate = targetDate, EndDate = targetDate };
             _context.RecurrentMoneyItems.Add(recurrentMoneyItem);
             await _context.SaveChangesAsync();
 

diff --git a/src/Savings.API/Controllers/SavingsController.cs b/src/Savings.API/Controllers/SavingsController.cs
@@ -38,11 +38,11 @@ public async Task<ActionResult> PostSavingsToHistory(DateTime date)
         public async Task<ActionResult> GetBackup()
         {
             byte[] fileContent;
-            using (var fs = new FileStream(configuration["DatabasePath"], FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using (var fs = new FileStream(configuration["DatabasePath"]!, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
                 using (var ms = new MemoryStream())
                 {
-                    fs.CopyTo(ms);
+                    await fs.CopyToAsync(ms);
                     fileContent = ms.ToArray();
                 }
             }

diff --git a/src/Savings.API/Program.cs b/src/Savings.API/Program.cs
@@ -41,7 +41,7 @@
         options.DefaultAuthenticateScheme = ApiKeyAuthOptions.ApiKeySchemaName;
         options.DefaultChallengeScheme = ApiKeyAuthOptions.ApiKeySchemaName;
     })
-    .AddApiKeyAuth(options => options.AuthKeys = builder.Configuration[ApiKeys].Split(","));
+    .AddApiKeyAuth(options => options.AuthKeys = builder.Configuration[ApiKeys]?.Split(","));
 }
 
 builder.Services.AddTransient<IProjectionCalculator, ProjectionCalculator>();

diff --git a/src/Savings.API/Savings.API.csproj b/src/Savings.API/Savings.API.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Savings.API/Services/ProjectionCalculator.cs b/src/Savings.API/Services/ProjectionCalculator.cs
@@ -111,7 +111,7 @@ public async Task<IEnumerable<MaterializedMoneyItem>> CalculateAsync(DateTime? f
                 var recurrentItems = await context.RecurrentMoneyItems
                                                     .Include(x => x.Adjustements).Include(x => x.AssociatedItems).Include(x => x.Category)
                                                     .Where(x => (x.StartDate <= periodEnd && (!x.EndDate.HasValue || periodStart <= x.EndDate) && x.RecurrentMoneyItemID == null) ||
-                                                                (x.Adjustements.Count() > 0 && x.Adjustements.First().RecurrencyNewDate.HasValue && x.Adjustements.First().RecurrencyNewDate.Value >= periodStart && x.Adjustements.First().RecurrencyNewDate.Value <= periodEnd))
+                                                                (x.Adjustements.Count() > 0 && x.Adjustements.First().RecurrencyNewDate.HasValue && x.Adjustements.First().RecurrencyNewDate!.Value >= periodStart && x.Adjustements.First().RecurrencyNewDate!.Value <= periodEnd))
                                                     .AsNoTracking().ToListAsync();
 
                 if (onlyInstallment) recurrentItems = recurrentItems.Where(x => x.Type == MoneyType.InstallmentPayment).ToList();
@@ -131,14 +131,14 @@ public async Task<IEnumerable<MaterializedMoneyItem>> CalculateAsync(DateTime? f
                     {
                         Date = fixedItem.Date,
                         CategoryID = fixedItem?.Category?.ID,
-                        Amount = fixedItem.Amount ?? 0,
+                        Amount = fixedItem?.Amount ?? 0,
                         EndPeriod = false,
-                        Note = fixedItem.Note,
+                        Note = fixedItem?.Note,
                         Type = MoneyType.Others,
-                        TimelineWeight = fixedItem.TimelineWeight,
+                        TimelineWeight = fixedItem?.TimelineWeight ?? 0,
                         IsRecurrent = false,
-                        FixedMoneyItemID = fixedItem.ID,
-                        Cash = fixedItem.Cash
+                        FixedMoneyItemID = fixedItem?.ID,
+                        Cash = fixedItem?.Cash ?? false
                     });
                 }
 
@@ -169,13 +169,13 @@ public async Task<IEnumerable<MaterializedMoneyItem>> CalculateAsync(DateTime? f
                     foreach (var installment in installments)
                     {
                         //Check the adjustements
-                        var currentAdjustment = recurrentItem.Adjustements?.Where(x => x.RecurrencyDate == installment.currentDate || x.RecurrencyNewDate.HasValue && x.RecurrencyNewDate == installment.currentDate).FirstOrDefault();
+                        var currentAdjustment = recurrentItem?.Adjustements?.Where(x => x.RecurrencyDate == installment.currentDate || x.RecurrencyNewDate.HasValue && x.RecurrencyNewDate == installment.currentDate).FirstOrDefault();
                         var currentInstallmentDate = currentAdjustment?.RecurrencyNewDate ?? installment.original;
-                        var currentInstallmentAmount = currentAdjustment?.RecurrencyNewAmount ?? recurrentItem.Amount;
-                        var currentInstallmentNote = recurrentItem.Note;
+                        var currentInstallmentAmount = currentAdjustment?.RecurrencyNewAmount ?? recurrentItem!.Amount;
+                        var currentInstallmentNote = recurrentItem?.Note;
 
                         //Check if is a budget for subtract the accumulated
-                        if (recurrentItem.Type == MoneyType.PeriodicBudget)
+                        if (recurrentItem!.Type == MoneyType.PeriodicBudget)
                         {
                             decimal accumulatorToSubtract = accumulatedForBudgetLeft < currentInstallmentAmount ? currentInstallmentAmount : accumulatedForBudgetLeft;
                             accumulatedForBudgetLeft -= accumulatorToSubtract;
@@ -216,10 +216,10 @@ public async Task<IEnumerable<MaterializedMoneyItem>> CalculateAsync(DateTime? f
                             Amount = currentInstallmentAmount,
                             EndPeriod = false,
                             Note = currentInstallmentNote,
-                            Type = recurrentItem.Type,
-                            TimelineWeight = recurrentItem.TimelineWeight,
+                            Type = recurrentItem?.Type ?? MoneyType.Others,
+                            TimelineWeight = recurrentItem?.TimelineWeight ?? 0,
                             IsRecurrent = true,
-                            RecurrentMoneyItemID = recurrentItem.ID,
+                            RecurrentMoneyItemID = recurrentItem?.ID,
                             Subitems = lstSubItemsRecurrent
                         });
                     }
@@ -232,7 +232,7 @@ public async Task<IEnumerable<MaterializedMoneyItem>> CalculateAsync(DateTime? f
                 periodStart = periodEnd.AddDays(1);
             }
             //Calculate the projection
-            var lastProjectionValue = context.MaterializedMoneyItems.Where(x => x.Date <= fromDate).OrderByDescending(x => x.Date).ThenByDescending(x => x.EndPeriod).AsNoTracking().FirstOrDefault().Projection;
+            var lastProjectionValue = context.MaterializedMoneyItems.Where(x => x.Date <= fromDate).OrderByDescending(x => x.Date).ThenByDescending(x => x.EndPeriod).AsNoTracking().FirstOrDefault()!.Projection;
             res = res.OrderBy(x => x.Date).ThenByDescending(x => x.TimelineWeight).ToList();
             foreach (var resItem in res)
             {
@@ -266,7 +266,7 @@ private static DateTime CalculateActualInstallmentDate(RecurrentMoneyItem item,
             DateTime currentInstallmentDate;
             var adjustment = item.Adjustements?.Where(x => x.RecurrencyDate == currentInstallmentOriginal && x.RecurrencyNewDate.HasValue).FirstOrDefault();
             if (adjustment != null)
-                currentInstallmentDate = adjustment.RecurrencyNewDate.Value;
+                currentInstallmentDate = adjustment.RecurrencyNewDate!.Value;
             else
                 currentInstallmentDate = currentInstallmentOriginal;
             return currentInstallmentDate;

diff --git a/src/Savings.SPA/Authorization/CustomAuthorizationMessageHandler.cs b/src/Savings.SPA/Authorization/CustomAuthorizationMessageHandler.cs
@@ -10,7 +10,7 @@ public CustomAuthorizationMessageHandler(IConfiguration configuration, IAccessTo
             : base(provider, navigationManager)
         {
             ConfigureHandler(
-                authorizedUrls: new[] { configuration["SavingsApiServiceUrl"] });
+                authorizedUrls: new[] { configuration["SavingsApiServiceUrl"] ?? throw new ArgumentNullException("SavingsApiServiceUrl") });
         }
     }
 }
diff --git a/src/Savings.SPA/Components/InputSelectNumber.cs b/src/Savings.SPA/Components/InputSelectNumber.cs
@@ -1,39 +1,35 @@
 using Microsoft.AspNetCore.Components.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Savings.SPA.Components
 {
     public class InputSelectNumber<T> : InputSelect<T>
     {
-        protected override bool TryParseValueFromString(string value, out T result, out string validationErrorMessage)
+        protected override bool TryParseValueFromString(string? value, out T result, out string validationErrorMessage)
         {
             if (typeof(T) == typeof(int) || typeof(T) == typeof(long?))
             {
                 if (typeof(T) == typeof(int) && int.TryParse(value, out var resultInt))
                 {
                     result = (T)(object)resultInt;
-                    validationErrorMessage = null;
+                    validationErrorMessage = string.Empty;
                     return true;
                 }
                 else if (typeof(T) == typeof(long?) && long.TryParse(value, out var resultLong))
                 {
                     result = (T)(object)resultLong;
-                    validationErrorMessage = null;
+                    validationErrorMessage = string.Empty;
                     return true;
                 }
                 else
                 {
-                    result = default;
+                    result = default!;
                     validationErrorMessage = "The chosen value is not a valid number.";
                     return false;
                 }
             }
             else
             {
-                return base.TryParseValueFromString(value, out result, out validationErrorMessage);
+                return base.TryParseValueFromString(value, out result!, out validationErrorMessage!);
             }
         }
     }

diff --git a/src/Savings.SPA/Pages/ConfigurationEdit.razor.cs b/src/Savings.SPA/Pages/ConfigurationEdit.razor.cs
@@ -8,11 +8,11 @@ public partial class ConfigurationEdit : ComponentBase
     {
 
         [Inject]
-        private ISavingsApi savingsAPI { get; set; }
+        private ISavingsApi savingsAPI { get; set; } = default!;
 
-        private Configuration Configuration { get; set; }
+        private Configuration Configuration { get; set; } = default!;
 
-        public MoneyCategory[] Categories { get; set; }
+        public MoneyCategory[] Categories { get; set; } = default!;
 
         public DateTime LastMaterializedDate { get; set; }
 

diff --git a/src/Savings.SPA/Pages/FixedItemEdit.razor.cs b/src/Savings.SPA/Pages/FixedItemEdit.razor.cs
@@ -10,16 +10,16 @@ public partial class FixedItemEdit : ComponentBase
     {
 
         [Inject]
-        public ISavingsApi savingsAPI { get; set; }
+        public ISavingsApi savingsAPI { get; set; } = default!;
 
         [Inject]
-        DialogService dialogService { get; set; }
+        DialogService dialogService { get; set; } = default!;
 
         [Inject]
-        public NotificationService notificationService { get; set; }
+        public NotificationService notificationService { get; set; } = default!;
 
         [Parameter]
-        public FixedMoneyItem fixedItemToEdit { get; set; }
+        public FixedMoneyItem fixedItemToEdit { get; set; } = default!;
 
         public bool Incoming { get; set; }
 
@@ -30,9 +30,9 @@ public partial class FixedItemEdit : ComponentBase
 
         public bool OperationRunning { get; set; } = false;
 
-        public MoneyCategory[] Categories { get; set; }
+        public MoneyCategory[]? Categories { get; set; }
 
-        InputNumber<decimal?> amountInputNumber;
+        InputNumber<decimal?>? amountInputNumber;
 
         protected override void OnInitialized()
         {
@@ -49,7 +49,7 @@ protected override async void OnAfterRender(bool firstRender)
             if (firstRender)
             {
                 await Task.Delay(500);
-                await amountInputNumber.Element.Value.FocusAsync();
+                await amountInputNumber!.Element!.Value.FocusAsync();
             }
         }
 
@@ -105,11 +105,11 @@ private async void OnValidSubmit()
                 if (!ValidateData()) return;
                 if (Incoming)
                 {
-                    fixedItemToEdit.Amount = Math.Abs(fixedItemToEdit.Amount.Value);
+                    fixedItemToEdit.Amount = Math.Abs(fixedItemToEdit.Amount!.Value);
                 }
                 else
                 {
-                    fixedItemToEdit.Amount = -Math.Abs(fixedItemToEdit.Amount.Value);
+                    fixedItemToEdit.Amount = -Math.Abs(fixedItemToEdit.Amount!.Value);
                 }
                 if (isNew)
                 {

diff --git a/src/Savings.SPA/Pages/FixedItems.razor b/src/Savings.SPA/Pages/FixedItems.razor
@@ -76,7 +76,7 @@ else
                         <td data-title="Date">@item.Date.ToString("dd/MM/yyyy")</td>
                         <td data-title="Amount" class="text-end">@((item.Amount ?? 0).ToString("N2"))</td>
                         <td data-title="Category">@item?.Category?.Icon?.ToString() @item?.Category?.Description?.ToString()</td>
-                        <td data-title="Note">@item.Note</td>
+                        <td data-title="Note">@item?.Note</td>
                     </tr>
                 }
             </tbody>

diff --git a/src/Savings.SPA/Pages/FixedItems.razor.cs b/src/Savings.SPA/Pages/FixedItems.razor.cs
@@ -2,39 +2,36 @@
 using Radzen;
 using Savings.Model;
 using Savings.SPA.Services;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Savings.SPA.Pages
 {
     public partial class FixedItems : ComponentBase
     {
 
         [Inject]
-        public ISavingsApi savingsAPI { get; set; }
+        public ISavingsApi savingsAPI { get; set; } = default!;
 
         [Inject]
-        public DialogService dialogService { get; set; }
+        public DialogService dialogService { get; set; } = default!;
 
-        public Configuration CurrentConfiguration { get; set; }
+        public Configuration CurrentConfiguration { get; set; } = default!;
 
-        private FixedMoneyItem[] fixedMoneyItems;
+        private FixedMoneyItem[] fixedMoneyItems = default!;
 
         public DateTime? FilterDateFrom { get; set; }
 
         public DateTime? FilterDateTo { get; set; }
 
         public long? FilterCategory { get; set; }
 
-        public MoneyCategory[] Categories { get; set; }
+        public MoneyCategory[] Categories { get; set; } = default!;
 
         protected override async Task OnInitializedAsync()
         {
             FilterDateFrom = DateTime.Now.Date.AddMonths(-2);
             FilterDateTo = DateTime.Now.Date.AddDays(15);
             Categories = await savingsAPI.GetMoneyCategories();
-            CurrentConfiguration = (await savingsAPI.GetConfigurations()).FirstOrDefault();
+            CurrentConfiguration = (await savingsAPI.GetConfigurations()).First();
             await InitializeList();
         }
 
@@ -46,7 +43,7 @@ async void Change(DateTime? value, string name)
 
         async Task FilterCategoryChanged(ChangeEventArgs e)
         {
-            var selectedString = e.Value.ToString();
+            var selectedString = e.Value?.ToString();
             FilterCategory = string.IsNullOrWhiteSpace(selectedString) ? null : long.Parse(selectedString);
 
             await InitializeList();

diff --git a/src/Savings.SPA/Pages/History.razor.cs b/src/Savings.SPA/Pages/History.razor.cs
@@ -9,12 +9,12 @@ public partial class History : ComponentBase
     {
 
         [Inject]
-        public ISavingsApi savingsAPI { get; set; }
+        public ISavingsApi savingsAPI { get; set; } = default!;
 
-        private MaterializedMoneyItem[] materializedMoneyItems;
+        private MaterializedMoneyItem[]? materializedMoneyItems;
 
         [Inject]
-        public DialogService dialogService { get; set; }
+        public DialogService dialogService { get; set; } = default!;
         public DateTime? FilterDateFrom { get; set; }
 
         public DateTime? FilterDateTo { get; set; }