Contain nullable reference warnings

Revert serilog sink to email as its broken
benjaminsampica · Jul 1, 2022 · ea2a9b7 · ea2a9b7
1 parent 0ba895b
commit ea2a9b7
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 79 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -47,7 +47,6 @@ jobs:
       env:
         ConnectionStrings.DefaultConnection: ${{ secrets.connectionstring }}
         Email.Password: ${{ secrets.email_password }}
-        Email.AdminEmail: ${{ secrets.admin_email }}
     - name: Create app_offline file
       if: startsWith(github.ref, 'refs/tags/v')
       shell: pwsh

diff --git a/src/Server/DynamoLeagueBlazor.Server.csproj b/src/Server/DynamoLeagueBlazor.Server.csproj
@@ -29,8 +29,8 @@
 	<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" />
 	<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
 	<PackageReference Include="Serilog.AspNetCore.Ingestion" Version="1.0.0-dev-00021" />
-	<PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
 	<PackageReference Include="Serilog.Sinks.Trace" Version="3.0.0" />
+  	<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Server/Infrastructure/EmailSender.cs b/src/Server/Infrastructure/EmailSender.cs
@@ -55,5 +55,5 @@ public class EmailSettings
     public string SenderName { get; set; } = null!;
     public string Sender { get; set; } = null!;
     public string Password { get; set; } = null!;
-    public string AdminEmail { get; set; }
+    public string AdminEmail { get; set; } = null!;
 }
diff --git a/src/Server/Program.cs b/src/Server/Program.cs
@@ -29,23 +29,8 @@
         .MinimumLevel.Override("System", LogEventLevel.Warning)
         .MinimumLevel.Override("Duende", LogEventLevel.Error)
         .Enrich.FromLogContext()
-        .Enrich.WithProperty("Environment", builder.Environment.EnvironmentName);
-
-    builder.Services.Configure<EmailSettings>(builder.Configuration.GetSection(EmailSettings.Email))
-        .AddSingleton(s => s.GetRequiredService<IOptions<EmailSettings>>().Value);
-
-    if (builder.Environment.IsProduction())
-    {
-        builder.Services.AddSingleton<IEmailSender, EmailSender>();
-
-        var emailSettings = builder.Services.BuildServiceProvider().GetRequiredService<EmailSettings>();
-        loggerConfiguration.WriteTo.Email(emailSettings.Sender, emailSettings.AdminEmail, mailServer: emailSettings.MailServer, restrictedToMinimumLevel: LogEventLevel.Error, mailSubject: "An error occured on Dynamo League.");
-    }
-    else
-    {
-        builder.Services.AddSingleton<IEmailSender, DevelopmentEmailSender>();
-        loggerConfiguration.WriteTo.Trace();
-    }
+        .Enrich.WithProperty("Environment", builder.Environment.EnvironmentName)
+        .WriteTo.File(".logs/log.log", rollingInterval: RollingInterval.Day);
 
     Log.Logger = loggerConfiguration.CreateLogger();
 
@@ -99,6 +84,18 @@
     builder.Services.AddTransient<IBidAmountValidator, BidAmountValidator>();
     builder.Services.AddTransient<IPlayerHeadshotService, PlayerHeadshotService>();
 
+    builder.Services.Configure<EmailSettings>(builder.Configuration.GetSection(EmailSettings.Email))
+        .AddSingleton(s => s.GetRequiredService<IOptions<EmailSettings>>().Value);
+
+    if (builder.Environment.IsProduction())
+    {
+        builder.Services.AddSingleton<IEmailSender, EmailSender>();
+    }
+    else
+    {
+        builder.Services.AddSingleton<IEmailSender, DevelopmentEmailSender>();
+    }
+
     var app = builder.Build();
 
     // Configure the HTTP request pipeline.

diff --git a/src/Server/appsettings.json b/src/Server/appsettings.json
@@ -8,8 +8,7 @@
     "MailPort": 25,
     "SenderName": "Dynamo League - Fantasy Football",
     "Sender": "[email protected]",
-    "Password": "",
-    "AdminEmail": ""
+    "Password": ""
   },
   "IdentityServer": {
     "Clients": {

diff --git a/src/Shared/Features/Admin/AddPlayer.cs b/src/Shared/Features/Admin/AddPlayer.cs
@@ -8,8 +8,8 @@ namespace DynamoLeagueBlazor.Shared.Features.Admin;
 
 public class AddPlayerRequest
 {
-    public string Name { get; set; }
-    public string Position { get; set; }
+    public string Name { get; set; } = null!;
+    public string Position { get; set; } = null!;
     public int TeamId { get; set; }
     public int ContractValue { get; set; }
 }
@@ -21,7 +21,7 @@ public class TeamNameListResult
     public class TeamNameItem
     {
         public int Id { get; set; }
-        public string Name { get; set; }
+        public string Name { get; set; } = null!;
     }
 }
 
@@ -54,8 +54,8 @@ public AddPlayerRequestValidator(IPlayerHeadshotService playerHeadshotService)
 
 public class PlayerPreviewRequest
 {
-    public string Name { get; set; }
-    public string Position { get; set; }
+    public string Name { get; set; } = null!;
+    public string Position { get; set; } = null!;
 }
 
 public class PlayerPreviewRequestValidator : AbstractValidator<PlayerPreviewRequest>

diff --git a/src/Shared/Features/Admin/Users/Delete.cs b/src/Shared/Features/Admin/Users/Delete.cs
@@ -2,5 +2,5 @@
 
 public class DeleteUserRequest
 {
-    public string UserId { get; set; }
+    public string UserId { get; set; } = null!;
 }
diff --git a/src/Shared/Features/Admin/Users/List.cs b/src/Shared/Features/Admin/Users/List.cs
@@ -6,9 +6,9 @@ public class UserListResult
 
     public class UserItem
     {
-        public string Id { get; set; }
-        public string Team { get; set; }
-        public string Email { get; set; }
+        public string Id { get; set; } = null!;
+        public string Team { get; set; } = null!;
+        public string Email { get; set; } = null!;
         public bool EmailConfirmed { get; set; }
     }
 }
diff --git a/src/Shared/Features/AsyncAbstractValidator.cs b/src/Shared/Features/AsyncAbstractValidator.cs
@@ -12,7 +12,7 @@ namespace DynamoLeagueBlazor.Shared.Helpers;
 /// </summary>
 public abstract class AsyncAbstractValidator<T> : AbstractValidator<T>
 {
-    private Task<ValidationResult> _validateTask;
+    private Task<ValidationResult> _validateTask = null!;
 
     public override Task<ValidationResult> ValidateAsync(ValidationContext<T> context, CancellationToken cancellation = default)
         => _validateTask = base.ValidateAsync(context, cancellation);
@@ -25,6 +25,6 @@ public override ValidationResult Validate(ValidationContext<T> context)
     }
 
     public Task<ValidationResult> WaitForValidateAsync()
-         => _validateTask ?? Task.FromResult<ValidationResult>(null);
+         => _validateTask ?? Task.FromResult<ValidationResult>(null!);
 
 }
diff --git a/src/Shared/Features/Dashboard/TopOffenders.cs b/src/Shared/Features/Dashboard/TopOffenders.cs
@@ -8,9 +8,9 @@ public class TopOffendersResult
 
     public class PlayerItem : IRankedItem
     {
-        public string ImageUrl { get; set; }
-        public string Name { get; set; }
-        public string Amount { get; set; }
+        public string ImageUrl { get; set; } = null!;
+        public string Name { get; set; } = null!;
+        public string Amount { get; set; } = null!;
     }
 }
 

diff --git a/src/Shared/Features/Dashboard/TopTeamFines.cs b/src/Shared/Features/Dashboard/TopTeamFines.cs
@@ -8,9 +8,9 @@ public class TopTeamFinesResult
 
     public class TeamItem : IRankedItem
     {
-        public string ImageUrl { get; set; }
-        public string Name { get; set; }
-        public string Amount { get; set; }
+        public string ImageUrl { get; set; } = null!;
+        public string Name { get; set; } = null!;
+        public string Amount { get; set; } = null!;
     }
 }
 

diff --git a/src/Shared/Features/Fines/List.cs b/src/Shared/Features/Fines/List.cs
@@ -7,13 +7,13 @@ public class FineListResult
     public class FineItem
     {
         public int Id { get; set; }
-        public string PlayerHeadShotUrl { get; set; }
-        public string PlayerName { get; set; }
-        public string TeamName { get; set; }
-        public string TeamLogoUrl { get; set; }
-        public string Reason { get; set; }
+        public string PlayerHeadShotUrl { get; set; } = null!;
+        public string PlayerName { get; set; } = null!;
+        public string TeamName { get; set; } = null!;
+        public string TeamLogoUrl { get; set; } = null!;
+        public string Reason { get; set; } = null!;
         public decimal Amount { get; set; }
-        public string Status { get; set; }
+        public string Status { get; set; } = null!;
     }
 }
 

diff --git a/src/Shared/Features/FreeAgents/Detail.cs b/src/Shared/Features/FreeAgents/Detail.cs
@@ -2,19 +2,19 @@
 
 public class FreeAgentDetailResult
 {
-    public string Name { get; set; }
-    public string Position { get; set; }
-    public string HeadShotUrl { get; set; }
-    public string Team { get; set; }
-    public string EndOfFreeAgency { get; set; }
+    public string Name { get; set; } = null!;
+    public string Position { get; set; } = null!;
+    public string HeadShotUrl { get; set; } = null!;
+    public string Team { get; set; } = null!;
+    public string EndOfFreeAgency { get; set; } = null!;
 
     public IEnumerable<BidItem> Bids { get; set; } = Enumerable.Empty<BidItem>();
 
     public class BidItem
     {
-        public string Team { get; set; }
-        public string Amount { get; set; }
-        public string CreatedOn { get; set; }
+        public string Team { get; set; } = null!;
+        public string Amount { get; set; } = null!;
+        public string CreatedOn { get; set; } = null!;
     }
 }
 

diff --git a/src/Shared/Features/FreeAgents/List.cs b/src/Shared/Features/FreeAgents/List.cs
@@ -2,15 +2,15 @@
 
 public class FreeAgentListResult
 {
-    public List<FreeAgentItem> FreeAgents { get; set; }
+    public List<FreeAgentItem> FreeAgents { get; set; } = new();
 
     public class FreeAgentItem
     {
         public int Id { get; set; }
-        public string Name { get; set; }
-        public string Position { get; set; }
-        public string Team { get; set; }
-        public string HeadShotUrl { get; set; }
+        public string Name { get; set; } = null!;
+        public string Position { get; set; } = null!;
+        public string Team { get; set; } = null!;
+        public string HeadShotUrl { get; set; } = null!;
         public DateTime BiddingEnds { get; set; }
         public int HighestBid { get; set; }
         public bool CurrentUserIsHighestBidder { get; set; }

diff --git a/src/Shared/Features/OfferMatching/List.cs b/src/Shared/Features/OfferMatching/List.cs
@@ -7,10 +7,10 @@ public class OfferMatchingListResult
     public class OfferMatchingItem
     {
         public int Id { get; set; }
-        public string Name { get; set; }
-        public string Position { get; set; }
-        public string HeadShotUrl { get; set; }
-        public string OfferingTeam { get; set; }
+        public string Name { get; set; } = null!;
+        public string Position { get; set; } = null!;
+        public string HeadShotUrl { get; set; } = null!;
+        public string OfferingTeam { get; set; } = null!;
         public int Offer { get; set; }
     }
 }

diff --git a/src/Shared/Features/Players/AddFine.cs b/src/Shared/Features/Players/AddFine.cs
@@ -6,7 +6,7 @@ namespace DynamoLeagueBlazor.Shared.Features.Players;
 public class AddFineRequest
 {
     public int PlayerId { get; set; }
-    public string FineReason { get; set; }
+    public string FineReason { get; set; } = null!;
 }
 
 public class AddFineRequestValidator : AbstractValidator<AddFineRequest>

diff --git a/src/Shared/Features/Players/List.cs b/src/Shared/Features/Players/List.cs
@@ -7,10 +7,10 @@ public class PlayerListResult
     public class PlayerItem
     {
         public int Id { get; set; }
-        public string HeadShotUrl { get; set; }
-        public string Name { get; set; }
-        public string Position { get; set; }
-        public string Team { get; set; }
+        public string HeadShotUrl { get; set; } = null!;
+        public string Name { get; set; } = null!;
+        public string Position { get; set; } = null!;
+        public string Team { get; set; } = null!;
         public int ContractValue { get; set; }
         public int YearContractExpires { get; set; }
     }

diff --git a/src/Shared/Features/Teams/Detail.cs b/src/Shared/Features/Teams/Detail.cs
@@ -2,9 +2,9 @@
 
 public class TeamDetailResult
 {
-    public string LogoUrl { get; set; }
-    public string Name { get; set; }
-    public string CapSpace { get; set; }
+    public string LogoUrl { get; set; } = null!;
+    public string Name { get; set; } = null!;
+    public string CapSpace { get; set; } = null!;
     public List<PlayerItem> RosteredPlayers { get; set; } = new List<PlayerItem>();
     public List<PlayerItem> UnrosteredPlayers { get; set; } = new List<PlayerItem>();
     public List<PlayerItem> UnsignedPlayers { get; set; } = new List<PlayerItem>();
@@ -13,9 +13,9 @@ public class TeamDetailResult
     public class PlayerItem
     {
         public int Id { get; set; }
-        public string HeadShotUrl { get; set; }
-        public string Name { get; set; }
-        public string Position { get; set; }
+        public string HeadShotUrl { get; set; } = null!;
+        public string Name { get; set; } = null!;
+        public string Position { get; set; } = null!;
         public int ContractValue { get; set; }
         public int? YearContractExpires { get; set; }
     }

diff --git a/src/Shared/Features/Teams/List.cs b/src/Shared/Features/Teams/List.cs
@@ -7,12 +7,12 @@ public class TeamListResult
     public class TeamItem
     {
         public int Id { get; set; }
-        public string LogoUrl { get; set; }
-        public string Name { get; set; }
-        public string RosteredPlayerCount { get; set; }
-        public string UnrosteredPlayerCount { get; set; }
-        public string UnsignedPlayerCount { get; set; }
-        public string CapSpace { get; set; }
+        public string LogoUrl { get; set; } = null!;
+        public string Name { get; set; } = null!;
+        public string RosteredPlayerCount { get; set; } = null!;
+        public string UnrosteredPlayerCount { get; set; } = null!;
+        public string UnsignedPlayerCount { get; set; } = null!;
+        public string CapSpace { get; set; } = null!;
     }
 }