Nidi/add aspire support (#52)

* catch exception if web api is not available * add tax account * add investment account * finalize investment account simulation * upgrade to .net 8 * DO PACKAGE UPGRADE * save:wq * DO PACKAGE UPGRADE * implement initial version of BVG revision app --------- Co-authored-by: Dieter Niggeler <dniggeler@MacBook-Air-von-Maria.local>
dniggeler · Jun 2, 2024 · a99b443 · a99b443
1 parent 03a2acb
commit a99b443
Show file tree

Hide file tree

Showing 661 changed files with 40,028 additions and 14,024 deletions.
diff --git a/findstr b/findstr
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="LanguageExt.Core" Version="4.4.8" />
+        <PackageReference Include="FluentValidation" Version="11.9.1" />
+        <PackageReference Include="AutoMapper" Version="12.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CommonTypes\CommonTypes.csproj" />
+    <ProjectReference Include="..\CommonUtils\CommonUtils.csproj" />
+    <ProjectReference Include="..\Domain\Domain.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Features\MultiPeriodCalculation\" />
+    <Folder Include="Features\PensionVersusCapital\Models\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BvgCalculator/Bvg.cs → src/Application/Bvg/Bvg.cs b/src/BvgCalculator/Bvg.cs → src/Application/Bvg/Bvg.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using PensionCoach.Tools.CommonTypes;
+using Domain.Enums;
 using PensionCoach.Tools.CommonUtils;
 
-namespace PensionCoach.Tools.BvgCalculator
+namespace Application.Bvg
 {
     /// <summary>
     /// 
@@ -191,31 +189,32 @@ public static decimal GetUwsRateBvg(int year, Gender gender)
         }
 
         private static readonly Dictionary<int, decimal?> AhvMaxPensionDictionary = new()
-            {
-                {1969, null},
-                {1970, 0M},
-                {1984, 0M},
-                {1985, 16560M},
-                {1987, 17280M},
-                {1989, 18000M},
-                {1991, 19200M},
-                {1992, 21600M},
-                {1994, 22560M},
-                {1996, 23280M},
-                {1998, 23880M},
-                {1999, 24120M},
-                {2000, 24120M},
-                {2002, 24720M},
-                {2004, 25320M},
-                {2007, 25800M},
-                {2009, 26520M},
-                {2011, 27360M},
-                {2013, 27840M},
-                {2015, 28080M},
-                {2019, 28200M},
-                {2021, 28440M},
-                {9999, 28680M},
-            };
+        {
+            {1969, null},
+            {1970, 0},
+            {1984, 0},
+            {1985, 16560},
+            {1987, 17280},
+            {1989, 18000},
+            {1991, 19200},
+            {1992, 21600},
+            {1994, 22560},
+            {1996, 23280},
+            {1998, 23880},
+            {1999, 24120},
+            {2000, 24120},
+            {2002, 24720},
+            {2004, 25320},
+            {2007, 25800},
+            {2009, 26520},
+            {2011, 27360},
+            {2013, 27840},
+            {2015, 28080},
+            {2019, 28200},
+            {2021, 28440},
+            {2023, 28680},
+            {9999, 29400},
+        };
 
         private const decimal MinimalSalaryFactor = 0.125M;
         private const decimal SalaryEntryThresholdFactor = 0.75M;
@@ -268,7 +267,8 @@ private static decimal GetUwsRateBvgFemale(int year)
                 {2014, 0.0150M},
                 {2016, 0.0175M},
                 {2017, 0.0125M},
-                {9999, 0.0100M},
+                {2023, 0.0100M},
+                {9999, 0.0125M},
             };
     }
 }