Merge branch 'pre-release' into 'master'

Merge changes for version 1.3 See merge request Axelander/openbudgeteer!10
TheAxelander · Dec 15, 2020 · aa5cc48 · aa5cc48
2 parents 031f813 + 9044f3f
commit aa5cc48
Show file tree

Hide file tree

Showing 74 changed files with 3,940 additions and 631 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,10 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+## Custom files
+*.db
+*.DS_Store
+
 # User-specific files
 *.rsuser
 *.suo
@@ -337,4 +341,4 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.3 (2020-12-15)
+
+* [Add] Support for Sqlite databases #2
+* [Add] Unit Tests (not full coverage yet)
+
 ### 1.2.1 (2020-12-14)
 
 * [Fixed] Crash on Report Page due to wrong DateTime creation

diff --git a/OpenBudgeteer.Blazor/Dockerfile b/OpenBudgeteer.Blazor/Dockerfile
@@ -8,6 +8,7 @@ EXPOSE 443
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
 WORKDIR /src
 COPY ["OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj", "OpenBudgeteer.Blazor/"]
+COPY ["OpenBudgeteer.Core/OpenBudgeteer.Core.csproj", "OpenBudgeteer.Core/"]
 RUN dotnet restore "OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj"
 COPY . .
 WORKDIR "/src/OpenBudgeteer.Blazor"
@@ -19,4 +20,5 @@ RUN dotnet publish "OpenBudgeteer.Blazor.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
+RUN mkdir database
 ENTRYPOINT ["dotnet", "OpenBudgeteer.dll"]
diff --git a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj
@@ -7,38 +7,21 @@
     <AssemblyName>OpenBudgeteer</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Migrations\20200608152200_DecimalPrecision.cs" />
-    <Compile Remove="Migrations\20200608152200_DecimalPrecision.Designer.cs" />
-    <Compile Remove="Migrations\20200612082043_FixedBucketVersion.cs" />
-    <Compile Remove="Migrations\20200612082043_FixedBucketVersion.Designer.cs" />
-    <Compile Remove="Migrations\20200701131446_TransactionDateTime.cs" />
-    <Compile Remove="Migrations\20200701131446_TransactionDateTime.Designer.cs" />
-    <Compile Remove="Migrations\20200707141411_ImportProfileDateNumberFormat.cs" />
-    <Compile Remove="Migrations\20200707141411_ImportProfileDateNumberFormat.Designer.cs" />
-    <Compile Remove="Migrations\20200814120506_AutomaticBucketAssignment.cs" />
-    <Compile Remove="Migrations\20200814120506_AutomaticBucketAssignment.Designer.cs" />
-    <Compile Remove="Migrations\20200818091835_foobar.cs" />
-    <Compile Remove="Migrations\20200818091835_foobar.Designer.cs" />
-    <Compile Remove="Migrations\20200818091949_AutomaticBucketAssignment.cs" />
-    <Compile Remove="Migrations\20200818091949_AutomaticBucketAssignment.Designer.cs" />
-    <Compile Remove="Migrations\20200818093918_AutomaticBucketAssignment.cs" />
-    <Compile Remove="Migrations\20200818093918_AutomaticBucketAssignment.Designer.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="ChartJs.Blazor" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.1" />
     <PackageReference Include="Tewr.Blazor.FileReader" Version="2.0.0.20242" />
-    <PackageReference Include="TinyCsvParser" Version="2.5.2" />
   </ItemGroup>
 
-  <Import Project="..\OpenBudgeteer.Core\OpenBudgeteer.Core.projitems" Label="Shared" />
+  <ItemGroup>
+    <ProjectReference Include="..\OpenBudgeteer.Core\OpenBudgeteer.Core.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/OpenBudgeteer.Blazor/Pages/Account.razor b/OpenBudgeteer.Blazor/Pages/Account.razor
@@ -1,10 +1,11 @@
 @page "/account"
 
 @using OpenBudgeteer.Core.ViewModels
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using Microsoft.EntityFrameworkCore
 @using OpenBudgeteer.Core.ViewModels.ItemViewModels
 @using System.Globalization
+@using OpenBudgeteer.Core.Common
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 
 <div class="row">
@@ -74,7 +75,7 @@
             _dataContext.LoadData();
             StateHasChanged();
         };
-        HandleResult(new Tuple<bool, string>(true, ""));
+        HandleResult(new ViewModelOperationResult(true));
     }
 
     private void CreateNewAccount()
@@ -109,12 +110,11 @@
         HandleResult(account.CloseAccount());
     }
 
-    void HandleResult(Tuple<bool, string> result)
+    void HandleResult(ViewModelOperationResult result)
     {
-        var (success, errorMessage) = result;
-        if (!success)
+        if (!result.IsSuccessful)
         {
-            _errorModalDialogMessage = errorMessage;
+            _errorModalDialogMessage = result.Message;
             _isErrorModalDialogVisible = true;
         }
     }

diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor
@@ -1,10 +1,11 @@
 @page "/bucket"
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using OpenBudgeteer.Core.ViewModels
 @using OpenBudgeteer.Core.ViewModels.ItemViewModels
 @using Microsoft.EntityFrameworkCore
 @using System.Drawing
 @using System.Globalization
+@using OpenBudgeteer.Core.Common
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 @inject YearMonthSelectorViewModel YearMonthDataContext
 
@@ -397,20 +398,19 @@
         StateHasChanged();
     }
 
-    void HandleResult(Tuple<bool, string> result)
+    void HandleResult(ViewModelOperationResult result)
     {
-        var (success, errorMessage) = result;
-        if (!success)
+        if (!result.IsSuccessful)
         {
-            _errorModalDialogMessage = errorMessage;
+            _errorModalDialogMessage = result.Message;
             _isErrorModalDialogVisible = true;
         }
     }
 
     void InOut_Changed(BucketViewModelItem bucket, KeyboardEventArgs args)
     {
         var result = bucket.HandleInOutInput(args.Key);
-        if (result.Item1)
+        if (result.IsSuccessful)
         {
             HandleResult(_dataContext.UpdateBalanceFigures());
             StateHasChanged();

diff --git a/OpenBudgeteer.Blazor/Pages/Import.razor b/OpenBudgeteer.Blazor/Pages/Import.razor
@@ -1,10 +1,11 @@
 @page "/import"
 
 @using OpenBudgeteer.Core.ViewModels
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using Microsoft.EntityFrameworkCore
 @using System.IO
 @using System.Text
+@using OpenBudgeteer.Core.Common
 @using OpenBudgeteer.Core.Models
 @using Tewr.Blazor.FileReader
 @inject DbContextOptions<DatabaseContext> DbContextOptions
@@ -362,7 +363,7 @@
             _dataContext.SelectedImportProfile = _dataContext.AvailableImportProfiles.First();
         }
         var result = _dataContext.LoadProfile();
-        if (result.Item1)
+        if (result.IsSuccessful)
         {
             _step3Enabled = _dataContext.SelectedImportProfile.ImportProfileId != 0;
             CheckColumnMapping();  
@@ -377,7 +378,7 @@
     void LoadHeaders()
     {
         var result = _dataContext.LoadHeaders();
-        if (result.Item1)
+        if (result.IsSuccessful)
         {
             _step3Enabled = true;
         }
@@ -404,13 +405,13 @@
 
     void ValidateData()
     {
-        _validationErrorMessage = _dataContext.ValidateData();
+        _validationErrorMessage = _dataContext.ValidateData().Message;
     }
 
     void ImportData()
     {
         var result = _dataContext.ImportData();
-        _importConfirmationMessage = result.Item2;
+        _importConfirmationMessage = result.Message;
         _isConfirmationModalDialogVisible = true;
     }
 
@@ -457,12 +458,11 @@
         CheckColumnMapping();
     }
 
-    void HandleResult(Tuple<bool, string> result)
+    void HandleResult(ViewModelOperationResult result)
     {
-        var (success, errorMessage) = result;
-        if (!success)
+        if (!result.IsSuccessful)
         {
-            _errorModalDialogMessage = errorMessage;
+            _errorModalDialogMessage = result.Message;
             _isErrorModalDialogVisible = true;
         }
     }

diff --git a/OpenBudgeteer.Blazor/Pages/Report.razor b/OpenBudgeteer.Blazor/Pages/Report.razor
@@ -9,7 +9,7 @@
 @using ChartJs.Blazor.ChartJS.Common.Properties
 @using ChartJs.Blazor.Util
 @using Microsoft.EntityFrameworkCore
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using OpenBudgeteer.Blazor.ViewModels
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 

diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor
@@ -1,10 +1,11 @@
 @page "/rules"
 
 @using Microsoft.EntityFrameworkCore
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using OpenBudgeteer.Core.ViewModels
 @using OpenBudgeteer.Core.ViewModels.ItemViewModels
 @using System.Drawing
+@using OpenBudgeteer.Core.Common
 @using OpenBudgeteer.Core.Models
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 
@@ -305,12 +306,11 @@
         HandleResult(_dataContext.DeleteRuleSetItem(_ruleSetToBeDeleted));
     }
 
-    void HandleResult(Tuple<bool, string> result)
+    void HandleResult(ViewModelOperationResult result)
     {
-        var (success, errorMessage) = result;
-        if (!success)
+        if (!result.IsSuccessful)
         {
-            _errorModalDialogMessage = errorMessage;
+            _errorModalDialogMessage = result.Message;
             _isErrorModalDialogVisible = true;
         }
     }

diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor
@@ -1,9 +1,10 @@
 @page "/transaction"
 
 @using OpenBudgeteer.Core.ViewModels
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using Microsoft.EntityFrameworkCore
 @using System.Drawing
+@using OpenBudgeteer.Core.Common
 @using OpenBudgeteer.Core.ViewModels.ItemViewModels
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 @inject YearMonthSelectorViewModel YearMonthDataContext
@@ -292,12 +293,11 @@
         HandleResult(_transactionToBeDeleted.DeleteItem());
     }
 
-    void HandleResult(Tuple<bool, string> result)
+    void HandleResult(ViewModelOperationResult result)
     {
-        var (success, errorMessage) = result;
-        if (!success)
+        if (!result.IsSuccessful)
         {
-            _errorModalDialogMessage = errorMessage;
+            _errorModalDialogMessage = result.Message;
             _isErrorModalDialogVisible = true;
         }
     }

diff --git a/OpenBudgeteer.Blazor/Shared/NavMenu.razor b/OpenBudgeteer.Blazor/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-@using OpenBudgeteer.Core.Common
+@using OpenBudgeteer.Core.Common.Database
 @using Microsoft.EntityFrameworkCore
 @inject DbContextOptions<DatabaseContext> DbContextOptions
 
@@ -54,7 +54,7 @@
             </div>
             <div class="navbar-text">
                 <span>
-                    Version: 1.2 (<a href="https://gitlab.com/Axelander/openbudgeteer/-/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
+                    Version: 1.3 (<a href="https://gitlab.com/Axelander/openbudgeteer/-/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
                 </span>
             </div>
         </div>

diff --git a/OpenBudgeteer.Blazor/Startup.cs b/OpenBudgeteer.Blazor/Startup.cs
@@ -12,7 +12,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using OpenBudgeteer.Core.Common;
+using OpenBudgeteer.Core.Common.Database;
 using OpenBudgeteer.Core.ViewModels;
 using Tewr.Blazor.FileReader;
 
@@ -36,20 +36,52 @@ public void ConfigureServices(IServiceCollection services)
             services.AddFileReaderService();
             services.AddScoped<YearMonthSelectorViewModel>();
             var configurationSection = Configuration.GetSection("Connection");
-            var connectionString = $"Server={configurationSection?["Server"]};" +
+            var provider = configurationSection?["Provider"];
+            string connectionString;
+            switch (provider)
+            {
+                case "mysql":
+                    connectionString = $"Server={configurationSection?["Server"]};" +
                                    $"Port={configurationSection?["Port"]};" +
                                    $"Database={configurationSection?["Database"]};" +
                                    $"User={configurationSection?["User"]};" +
                                    $"Password={configurationSection?["Password"]}";
-            services.AddDbContext<DatabaseContext>(options => options.UseMySql(
-                    connectionString, 
-                    b => b.MigrationsAssembly("OpenBudgeteer")), 
-                ServiceLifetime.Transient);
+
+                    services.AddDbContext<DatabaseContext>(options => options.UseMySql(
+                            connectionString,
+                            b => b.MigrationsAssembly("OpenBudgeteer.Core")),
+                        ServiceLifetime.Transient);
+
+                    // Check on Pending Db Migrations
+                    var mySqlDbContext = new MySqlDatabaseContextFactory().CreateDbContext(Configuration);
+                    if (mySqlDbContext.Database.GetPendingMigrations().Any()) mySqlDbContext.Database.Migrate();
+
+                    break;
+                case "sqlite":
+#if DEBUG
+                    connectionString = "Data Source=openbudgeteer.db";
+#else
+                    connectionString = "Data Source=database/openbudgeteer.db";
+#endif
+                    services.AddDbContext<DatabaseContext>(options => options.UseSqlite(
+                            connectionString,
+                            b => b.MigrationsAssembly("OpenBudgeteer.Core")),
+                        ServiceLifetime.Transient);
+
+                    // Check on Pending Db Migrations
+                    var sqliteDbContext = new SqliteDatabaseContextFactory().CreateDbContext(connectionString);
+                    if (sqliteDbContext.Database.GetPendingMigrations().Any()) sqliteDbContext.Database.Migrate();
+
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException($"Database provider {provider} not supported");
+            }
+
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // Required to read ANSI Text files
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, DatabaseContext dbContext)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -73,7 +105,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, Database
                 endpoints.MapFallbackToPage("/_Host");
             });
 
-            if (dbContext.Database.GetPendingMigrations().Any()) dbContext.Database.Migrate();
             // TODO Get Culture from Settings
             var cultureInfo = new CultureInfo("de-DE");
             CultureInfo.DefaultThreadCurrentCulture = cultureInfo;

diff --git a/OpenBudgeteer.Blazor/ViewModels/BlazorReportViewModel.cs b/OpenBudgeteer.Blazor/ViewModels/BlazorReportViewModel.cs
@@ -14,7 +14,7 @@
 using ChartJs.Blazor.ChartJS.LineChart;
 using ChartJs.Blazor.Util;
 using Microsoft.EntityFrameworkCore;
-using OpenBudgeteer.Core.Common;
+using OpenBudgeteer.Core.Common.Database;
 using OpenBudgeteer.Core.ViewModels;
 
 namespace OpenBudgeteer.Blazor.ViewModels