Revert records on the Domain

alexdrl · Sep 27, 2023 · 132f6ef · 132f6ef
1 parent 38bc256
commit 132f6ef
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 43 deletions.
diff --git a/BlazorApp1.Data/WeatherForecast.cs b/BlazorApp1.Data/WeatherForecast.cs
@@ -1,9 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace BlazorApp1.Domain;
-
-public record WeatherForecast([property: Key][property: DatabaseGenerated(DatabaseGeneratedOption.Identity)] int Id, DateTime Date, int TemperatureC, string? Summary)
+namespace BlazorApp1.Domain
 {
-    public int TemperatureF => 32 + (int)Math.Round(TemperatureC / 0.5556, 0);
+    public class WeatherForecast
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+
+        public DateTime Date { get; set; }
+
+        public int TemperatureC { get; set; }
+
+        public string? Summary { get; set; }
+
+        public int TemperatureF => 32 + (int)Math.Round(TemperatureC / 0.5556, 0);
+    }
 }
diff --git a/BlazorApp1.Domain.Tests/WeatherForecastTests.cs b/BlazorApp1.Domain.Tests/WeatherForecastTests.cs
@@ -6,7 +6,7 @@ public class WeatherForecastTests
     public void TemperatureF_ConversionIsCorrect()
     {
         // Arrange
-        var weatherForecast = new WeatherForecast(default, default, default, null)
+        var weatherForecast = new WeatherForecast
         {
             TemperatureC = 25
         };
@@ -22,7 +22,7 @@ public void TemperatureF_ConversionIsCorrect()
     public void TemperatureF_ConversionIsCorrectWithNegativeCelsius()
     {
         // Arrange
-        var weatherForecast = new WeatherForecast(default, default, default, null)
+        var weatherForecast = new WeatherForecast
         {
             TemperatureC = -10
         };
@@ -33,4 +33,4 @@ public void TemperatureF_ConversionIsCorrectWithNegativeCelsius()
         // Assert
         temperatureF.Should().Be(14);
     }
-}
+}
diff --git a/BlazorApp1.Server.Integration.Tests/WeatherForecastControllerTests.cs b/BlazorApp1.Server.Integration.Tests/WeatherForecastControllerTests.cs
@@ -36,9 +36,9 @@ public async Task Get_ReturnsWeatherForecasts()
         // Arrange
         var databaseForecasts = new WeatherForecast[]
         {
-            new WeatherForecast(default, DateTime.Now.AddDays(-1), 20, null) { Summary = "Sunny" },
-            new WeatherForecast(default, DateTime.Now, 25, null) { Summary = "Cloudy" },
-            new WeatherForecast(default, DateTime.Now.AddDays(1), 30, null) { Summary = "Rainy" }
+                new WeatherForecast { Date = DateTime.Now.AddDays(-1), TemperatureC = 20, Summary = "Sunny" },
+                new WeatherForecast { Date = DateTime.Now, TemperatureC = 25, Summary = "Cloudy" },
+                new WeatherForecast { Date = DateTime.Now.AddDays(1), TemperatureC = 30, Summary = "Rainy" }
         };
 
         using (var scope = _factory.Services.CreateScope())

diff --git a/BlazorApp1.Server.Unit.Tests/WeatherForecastControllerTests.cs b/BlazorApp1.Server.Unit.Tests/WeatherForecastControllerTests.cs
@@ -26,16 +26,16 @@ public WeatherForecastControllerTests()
         _mapper = servicesCollection.GetRequiredService<IMapper>();
     }
 
-    [Fact]
-    public async Task Get_ShouldReturnAllForecasts()
-    {
-        // Arrange
-        var forecasts = new List<WeatherForecast>
+        [Fact]
+        public async Task Get_ShouldReturnAllForecasts()
         {
-            new WeatherForecast(default, default, default, null) { Date = DateTime.Today, TemperatureC = 20, Summary = "Sunny" },
-            new WeatherForecast(default, default, default, null) { Date = DateTime.Today.AddDays(1), TemperatureC = 15, Summary = "Cloudy" }
-        };
-        _weatherForecastRepositoryMock.Setup(x => x.GetAllForecasts()).ReturnsAsync(forecasts);
+            // Arrange
+            var forecasts = new List<WeatherForecast>
+            {
+                new WeatherForecast { Date = DateTime.Today, TemperatureC = 20, Summary = "Sunny" },
+                new WeatherForecast { Date = DateTime.Today.AddDays(1), TemperatureC = 15, Summary = "Cloudy" }
+            };
+            _weatherForecastRepositoryMock.Setup(x => x.GetAllForecasts()).ReturnsAsync(forecasts);
 
         var controller = new WeatherForecastController(_loggerMock.Object, _weatherForecastRepositoryMock.Object, _mapper);
 
@@ -81,12 +81,12 @@ public async Task Get_ShouldReturnExceptionWhenException()
         _weatherForecastRepositoryMock.Verify(x => x.GetAllForecasts(), Times.Once);
     }
 
-    [Fact]
-    public async Task AddForecast_ShouldCallRepository()
-    {
-        // Arrange
-        var forecast = new WeatherForecast(default, default, default, null) { Date = DateTime.Today, TemperatureC = 25, Summary = "Hot" };
-        _weatherForecastRepositoryMock.Setup(x => x.AddWeatherForecast(forecast)).Returns(Task.CompletedTask);
+        [Fact]
+        public async Task AddForecast_ShouldCallRepository()
+        {
+            // Arrange
+            var forecast = new WeatherForecast { Date = DateTime.Today, TemperatureC = 25, Summary = "Hot" };
+            _weatherForecastRepositoryMock.Setup(x => x.AddWeatherForecast(forecast)).Returns(Task.CompletedTask);
 
         var controller = new WeatherForecastController(_loggerMock.Object, _weatherForecastRepositoryMock.Object, _mapper);
 

diff --git a/BlazorApp1/Client/BlazorApp1.Client.csproj b/BlazorApp1/Client/BlazorApp1.Client.csproj
@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BlazorApp1.Server.Abstractions\BlazorApp1.Server.Abstractions.csproj" />
     <ProjectReference Include="..\Shared\BlazorApp1.Data.csproj" />
   </ItemGroup>
 

diff --git a/BlazorApp1/Client/Pages/FetchData.razor b/BlazorApp1/Client/Pages/FetchData.razor
@@ -1,7 +1,6 @@
 @page "/fetchdata"
 @using BlazorApp1.Shared
 @using BlazorApp1.Domain
-@using BlazorApp1.Server.Abstractions.Contracts
 @inject HttpClient Http
 
 <PageTitle>Weather forecast</PageTitle>
@@ -48,14 +47,14 @@ else
 }
 
 @code {
-    private WeatherForecastDto[]? forecasts;
-    private WeatherForecastDto? forecastToAdd;
+    private WeatherForecast[]? forecasts;
+    private WeatherForecast? forecastToAdd;
 
     protected override async Task OnInitializedAsync()
     {
         await ReloadDataAsync();
-        forecastToAdd = new WeatherForecastDto
-        {
+        forecastToAdd = new WeatherForecast
+            {
                 Date = DateTime.Now
             };
     }
@@ -64,14 +63,14 @@ else
     {
         if (forecastToAdd != null)
         {
-            var response = await Http.PostAsJsonAsync<WeatherForecastDto>("WeatherForecast", forecastToAdd);
+            var response = await Http.PostAsJsonAsync<WeatherForecast>("WeatherForecast", forecastToAdd);
         }
 
         await ReloadDataAsync();
     }
 
     private async Task ReloadDataAsync()
     {
-        forecasts = await Http.GetFromJsonAsync<WeatherForecastDto[]>("WeatherForecast");
+        forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("WeatherForecast");
     }
 }
diff --git a/BlazorApp1/Shared/WeatherDbContext.cs b/BlazorApp1/Shared/WeatherDbContext.cs
@@ -23,17 +23,17 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         optionsBuilder.UseSqlite("Data Source=Local.sqlite");
     }
 
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<WeatherForecast>().HasData(Enumerable.Range(1, 5).Select(index => new WeatherForecast(default, default, default, null)
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            Id = index,
-            Date = new DateTime(2022, 1, 1).AddDays(index),
-            TemperatureC = 4 + index,
-            Summary = Summaries[1 + index]
-        })
-        .ToArray());
-    }
+            modelBuilder.Entity<WeatherForecast>().HasData(Enumerable.Range(1, 5).Select(index => new WeatherForecast
+            {
+                Id = index,
+                Date = new DateTime(2022, 1, 1).AddDays(index),
+                TemperatureC = 4 + index,
+                Summary = Summaries[1 + index]
+            })
+            .ToArray());
+        }
 
     public DbSet<WeatherForecast> Forecast { get; set; }