Pull Request: Migrate Project to .NET 8 and Improve Yield Calculation (…

…#7) * core: migrate domain to net8.0 * update EF to v8 * fix: not adding new operation when setting a new yield * fix(ef): add the account as a member of AccountOperation to fix the relationship * fix(ef): add account to relationship mapping * refactor: the yield calculator should not set value on account directly, only calculates the yield and then the handle will be responsible for it * test: update tests to compare values returned from YieldService * style: remove unused namespaces * chore: create config to enable debugging on vs code * docs: update .net version on readme * setup CI on a project * ci: add MySQL db to GA configuration
almeidaalex · Aug 13, 2024 · c4f69b1 · c4f69b1
1 parent 04b4d7f
commit c4f69b1
Show file tree

Hide file tree

Showing 19 changed files with 169 additions and 78 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,10 +15,10 @@
       ]
     },
     "dotnet-ef": {
-      "version": "6.0.26",
+      "version": "8.0.7",
       "commands": [
         "dotnet-ef"
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -0,0 +1,34 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    services:
+      mysql:
+        image: mysql:9.0.1
+        env:
+          MYSQL_ROOT_PASSWORD: b@nk1
+          MYSQL_DATABASE: bank_db
+        ports:
+          - "3307:3306"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,33 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/Bank.Api/bin/Debug/net6.0/Bank.Api.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/Bank.Api",
+            "stopAtEntry": false,
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Bank.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/Bank.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/Bank.sln"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/Bank.Api/Bank.Api.csproj b/Bank.Api/Bank.Api.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\Bank</DockerfileContext>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
@@ -9,10 +9,10 @@
     <PackageReference Include="MediatR" Version="10.0.1" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bank.Domain\Bank.Domain.csproj" />
     <ProjectReference Include="..\Bank.Infra\Bank.Infra.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Bank.Api/Dockerfile b/Bank.Api/Dockerfile
@@ -1,10 +1,10 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore

diff --git a/Bank.Api/Handlers/IncomeRequestHandler.cs b/Bank.Api/Handlers/IncomeRequestHandler.cs
@@ -22,12 +22,18 @@ public IncomeRequestHandler(BankDbContext context, IYieldService yieldService)
       _yieldService = yieldService;
     }
 
-    public async Task<Unit> Handle(CalculateIncomeCommand request, CancellationToken cancellationToken)
+    public Task<Unit> Handle(CalculateIncomeCommand request, CancellationToken cancellationToken)
     {
       var accounts = this._context.Accounts.ToArray();
-      _yieldService.CalculateInterestFor(request.ForDate, accounts, request.InterestRate, cancellationToken, days: 1);
-      await _context.SaveChangesAsync(cancellationToken);
-      return Unit.Value;
+
+      foreach (var account in accounts)
+      {
+        var yield = _yieldService.CalculateInterestFor(request.ForDate, account, request.InterestRate, days: 1);
+        account.SetYield(yield, request.ForDate);
+      }
+
+      _context.SaveChanges();
+      return Unit.Task;
     }
   }
 }
diff --git a/Bank.Api/Startup.cs b/Bank.Api/Startup.cs
@@ -1,27 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-
-using Bank.Api.Handlers;
 using Bank.Domain;
 using Bank.Domain.Contracts;
-using Bank.Domain.Events;
-using Bank.Domain.SeedWork;
 using Bank.Infra;
 
 using MediatR;
-using MediatR.Pipeline;
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
 
 namespace Bank.Api

diff --git a/Bank.Api/appsettings.Development.json b/Bank.Api/appsettings.Development.json
@@ -3,7 +3,8 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Information"
     }
   },
   "ConnectionStrings": {

diff --git a/Bank.Domain/Account.cs b/Bank.Domain/Account.cs
@@ -90,15 +90,16 @@ public void ChargePayment(Invoice invoice)
     public void AddOperation(AccountOperation accountOperation) =>
         _operations.Add(accountOperation);
 
-    public IReadOnlyCollection<AccountOperation> Operations => _operations;
+    public IReadOnlyCollection<AccountOperation> Operations => _operations.AsReadOnly();
 
     public DateTime? LastYieldedDate { get; private set; }
 
     public void SetYield(decimal yield, DateTime currentDate)
     {
+      this.AddOperation(new AccountOperation(currentDate, $"Rendimento em {currentDate}", yield, EventType.Income));
       this.Balance += yield;
       this.LastYieldedDate = currentDate;
       this.AddDomainEvent(new CalculatedIncomeEvent(this, yield));
     }
   }
-}
+}
diff --git a/Bank.Domain/AccountOperation.cs b/Bank.Domain/AccountOperation.cs
@@ -23,6 +23,7 @@ public AccountOperation(DateTime date, string description, decimal amount, Event
     public string Description { get; private set; }
     public decimal Amount { get; private set; }
     public EventType Operation { get; private set; }
-    public int AccountNo { get; private set; }
+    public int AccountNo { get; set; }
+    public Account Account { get; set; }
   }
-}
+}
diff --git a/Bank.Domain/Bank.Domain.csproj b/Bank.Domain/Bank.Domain.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MediatR" Version="10.0.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Bank.Domain/Contracts/IYieldService.cs b/Bank.Domain/Contracts/IYieldService.cs
@@ -1,15 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Bank.Domain.Contracts
 {
   public interface IYieldService
   {
-    void CalculateInterestFor(DateTime currentDate, IYieldAccount account, double interestRate, uint days = 1);
-    void CalculateInterestFor(DateTime currentDate, IEnumerable<IYieldAccount> accounts, double interestRate, CancellationToken cancellationToken, uint days = 1);
+    decimal CalculateInterestFor(DateTime currentDate, IYieldAccount account, double interestRate, uint days = 1);
   }
-}
+}
diff --git a/Bank.Domain/YieldService.cs b/Bank.Domain/YieldService.cs
@@ -10,28 +10,21 @@ namespace Bank.Domain
 {
   public class YieldService : IYieldService
   {
-    public void CalculateInterestFor(DateTime forDate, IYieldAccount account, double interestRate, uint days = 1)
+    public decimal CalculateInterestFor(DateTime forDate, IYieldAccount account, double interestRate, uint days = 1)
     {
       if (HasPositiveBalance(account)
           && ItHasAlreadyBeenCalculated(forDate, account.LastYieldedDate.GetValueOrDefault(), days))
       {
         decimal calc = Convert.ToDecimal(Math.Pow(1 + interestRate / 100d, days / 252d) - 1);
-        var balance = Math.Round(calc * account.Balance, 2);
-        account.SetYield(balance, forDate);
+        var yield = Math.Round(calc * account.Balance, 2);
+        return yield;
       }
+      return 0;
     }
-
-    public void CalculateInterestFor(DateTime forDate, IEnumerable<IYieldAccount> accounts, double interestRate, CancellationToken cancellationToken, uint days = 1)
-    {
-      var paralleOptions = new ParallelOptions { CancellationToken = cancellationToken };
-
-      Parallel.ForEach(accounts, paralleOptions, account =>
-          this.CalculateInterestFor(forDate, account, interestRate, days));
-    }
-
+
     private static bool ItHasAlreadyBeenCalculated(DateTime forDate, DateTime lastYieldedDate, uint days) =>
         forDate > lastYieldedDate.AddDays(days);
 
     private static bool HasPositiveBalance(IYieldAccount account) => account.Balance > 0;
   }
-}
+}
diff --git a/Bank.Infra/Bank.Infra.csproj b/Bank.Infra/Bank.Infra.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MediatR" Version="10.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.26">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.25" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.26" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.26" />
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bank.Domain\Bank.Domain.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Bank.Infra/BankContext.cs b/Bank.Infra/BankContext.cs
@@ -88,7 +88,7 @@ private void ConfigureAccount(ModelBuilder builder)
       account.Property(a => a.OwnerId);
 
       account.HasMany(a => a.Operations)
-             .WithOne()
+             .WithOne(o => o.Account)
              .HasForeignKey(h => h.AccountNo)
              .OnDelete(DeleteBehavior.Cascade);
 
@@ -106,4 +106,4 @@ private static void CleanEvents(IEnumerable<IEntity> entities)
         entity.ClearEvents();
     }
   }
-}
+}
diff --git a/Bank.Tests/Bank.Tests.csproj b/Bank.Tests/Bank.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
@@ -22,12 +22,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.26" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.26" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bank.Api\Bank.Api.csproj" />
     <ProjectReference Include="..\Bank.Domain\Bank.Domain.csproj" />
     <ProjectReference Include="..\Bank.Infra\Bank.Infra.csproj" />
   </ItemGroup>
-</Project>
+</Project>