WIP commit

topnax · topnax · commit f37d8e8f5218 · 2021-04-04T22:17:05.000+02:00
diff --git a/.idea/.idea.CryptoTracker/.idea/sqldialects.xml b/.idea/.idea.CryptoTracker/.idea/sqldialects.xml
diff --git a/Database/SqlKataDatabase.cs b/Database/SqlKataDatabase.cs
@@ -14,14 +14,16 @@ public SqlKataDatabase(IDbConnection dbConnection, Compiler compiler)
         {
             _dbConnection = dbConnection;
             _queryFactory = new(dbConnection, compiler);
-
+            
             Console.WriteLine("SqlKataDatabase constructor invoked");
+            SqlSchema.Init(this);
         }
 
         public QueryFactory Get() => _queryFactory;
 
         public void Dispose()
         {
+            // TODO check whether dispose is called
             Console.WriteLine("Disposing SqlKataDatabase");
             _dbConnection.Close();
         }
diff --git a/Database/SqlSchema.cs b/Database/SqlSchema.cs
@@ -0,0 +1,37 @@
+namespace Database
+{
+    public class SqlSchema
+    {
+        public static void Init(SqlKataDatabase db)
+        {
+            db.Get().Statement(@"
+
+                CREATE TABLE IF NOT EXISTS portfolios (
+                   id           INTEGER NOT NULL PRIMARY KEY  AUTOINCREMENT,
+                   name         TEXT NOT NULL,
+                   description  TEXT NOT NULL
+                );
+
+                CREATE TABLE IF NOT EXISTS portfolio_entries (
+                   id           INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                   symbol       TEXT NOT NULL,
+                   portfolio_id INTEGER NOT NULL,
+                   FOREIGN KEY(portfolio_id) REFERENCES portfolios(portfolio_id)
+                );
+
+                CREATE TABLE IF NOT EXISTS market_orders (
+                   id           INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                   currency     TEXT NOT NULL,
+                   filled_price INTEGER NOT NULL,
+                   fee          INTEGER NOT NULL,
+                   size         INTEGER NOT NULL,
+                   date         INTEGER NOT NULL,
+                   buy          INTEGER NOT NULL,
+                   portfolio_entry_id INTEGER NOT NULL,
+                   FOREIGN KEY(portfolio_entry_id) REFERENCES portfolio_entries(portfolio_entry_id)
+                );
+
+            ");
+        }
+    }
+}
diff --git a/Model/Model.cs b/Model/Model.cs
@@ -2,11 +2,13 @@
 
 namespace Model
 {
-    public record MarketOrder(string Symbol, Currency Currency, decimal FilledPrice, decimal Fee, decimal Size,
-        DateTime Date, bool Buy, int Id = -1, int PortfolioId = -1);
+    public record MarketOrder(Currency Currency, decimal FilledPrice, decimal Fee, decimal Size,
+        DateTime Date, bool Buy, int Id = -1, int PortfolioEntryId = -1);
 
     public record Portfolio(string Name, string Description, int Id = -1);
 
+    public record PortfolioEntry(string Symbol, int PortfolioId = -1, int Id = -1);
+
     public enum Currency
     {
         Czk,
diff --git a/Repository/IRepository.cs b/Repository/IRepository.cs
@@ -0,0 +1,23 @@
+using Model;
+
+namespace Repository
+{
+    public interface IRepository<T>
+    {
+        public object ToRow(T entry);
+
+        public void Add(T entry);
+
+        public void Update(T entry);
+
+        public void Delete(T entry);
+    }
+
+    public interface IMarketOrderRepository : IRepository<MarketOrder>
+    {
+    }
+
+    public interface IPortfolioRepository : IRepository<Portfolio>
+    {
+    }
+}
diff --git a/Repository/MarketOrders/IMarketOrderRepository.cs b/Repository/MarketOrders/IMarketOrderRepository.cs
diff --git a/Repository/MarketOrders/SqlKataMarketOrderRepository.cs b/Repository/MarketOrders/SqlKataMarketOrderRepository.cs
diff --git a/Repository/Repository.csproj b/Repository/Repository.csproj
@@ -13,7 +13,10 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.4" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
       <PackageReference Include="SqlKata.Execution" Version="2.3.2" />
+      <PackageReference Include="xunit.assert" Version="2.4.1" />
+      <PackageReference Include="xunit.core" Version="2.4.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Repository/SqlKataMarketOrderRepository.cs b/Repository/SqlKataMarketOrderRepository.cs
@@ -0,0 +1,28 @@
+using System;
+using Database;
+using Model;
+
+namespace Repository
+{
+    public class SqlKataMarketOrderRepository : SqlKataRepository<MarketOrder>
+    {
+        public SqlKataMarketOrderRepository(SqlKataDatabase db) : base(db, "market_orders")
+        {
+        }
+
+        protected override int _getEntryId(MarketOrder entry) => entry.Id;
+
+        public override object ToRow(MarketOrder entry) => new
+        {
+            currency = entry.Currency.ToString(),
+            filled_price = (int) (entry.FilledPrice * 100),
+            fee = (int) (entry.Fee * 100),
+            size = (int) (entry.Size * 100),
+            date = entry.Date.ToBinary(),
+            buy = ((DateTimeOffset) entry.Date).ToUnixTimeSeconds(),
+            portfolio_entrY_id = entry.PortfolioEntryId,
+        };
+
+        public override MarketOrder FromRow(dynamic d) => new(Currency.Czk, 0, 0, 0, DateTime.Now, true, 0, 0);
+    }
+}
diff --git a/Repository/SqlKataPortfolioEntryRepository.cs b/Repository/SqlKataPortfolioEntryRepository.cs
@@ -0,0 +1,22 @@
+using Database;
+using Model;
+
+namespace Repository
+{
+    public class SqlKataPortfolioEntryRepository : SqlKataRepository<PortfolioEntry>
+    {
+        public SqlKataPortfolioEntryRepository(SqlKataDatabase db) : base(db, "portfolio_entries")
+        {
+        }
+
+        protected override int _getEntryId(PortfolioEntry entry) => entry.Id;
+
+        public override object ToRow(PortfolioEntry entry) => new
+        {
+            symbol = entry.Symbol,
+            portfolio_id = entry.PortfolioId
+        };
+        
+        public override PortfolioEntry FromRow(dynamic d) => new(d.symbol, d.portfolio_entry_id, d.id);
+    }
+}
diff --git a/Repository/SqlKataPortfolioRepository.cs b/Repository/SqlKataPortfolioRepository.cs
@@ -0,0 +1,23 @@
+using Database;
+using Model;
+
+namespace Repository
+{
+    public class SqlKataPortfolioRepository : SqlKataRepository<Portfolio>
+    {
+        public SqlKataPortfolioRepository(SqlKataDatabase db) : base(db, "portfolios")
+        {
+        }
+
+        protected override int _getEntryId(Portfolio entry) => entry.Id;
+
+        public override object ToRow(Portfolio entry) => new
+        {
+            name = entry.Name,
+            description = entry.Description
+        };
+
+        public override Portfolio FromRow(dynamic d) => new((string) d.name, (string) d.description, (int) d.id);
+
+    }
+}
diff --git a/Repository/SqlKataRepository.cs b/Repository/SqlKataRepository.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Database;
+using SqlKata.Execution;
+
+namespace Repository
+{
+    public abstract class SqlKataRepository<T> : IRepository<T>
+    {
+        protected readonly SqlKataDatabase Db;
+        private readonly string _tableName;
+
+        public SqlKataRepository(SqlKataDatabase db, string tableName)
+        {
+            this.Db = db;
+            this._tableName = tableName;
+        }
+
+        public abstract object ToRow(T entry);
+
+        public abstract T FromRow(dynamic d);
+
+        protected abstract int _getEntryId(T entry);
+
+        public void Add(T entry)
+        {
+            var id = Db.Get().Query(_tableName).InsertGetId<int>(ToRow(entry));
+
+            Console.WriteLine($"added! {id}");
+            Db.Get().Query(_tableName).AsInsert(ToRow(entry)).Get();
+            id = Db.Get().Query(_tableName).InsertGetId<int>(ToRow(entry));
+            Console.WriteLine($"added! {id}");
+        }
+
+        public void Update(T entry)
+        {
+            Db.Get().Query(_tableName).Where("id", _getEntryId(entry)).AsUpdate(ToRow(entry));
+        }
+
+        public void Delete(T entry)
+        {
+            Db.Get().Query(_tableName).Where("id", _getEntryId(entry)).AsDelete();
+        }
+
+        public List<T> All()
+        {
+            List<T> items = new List<T>();
+            foreach (var row in Db.Get().Query(_tableName).Select().Get())
+            {
+                items.Add(FromRow(row));
+                
+            }
+
+            return items;
+        }
+    }
+}
diff --git a/Repository/Tests/Tests.csproj b/Repository/Tests/Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/Repository/Tests/UnitTest1.cs b/Repository/Tests/UnitTest1.cs
@@ -0,0 +1,14 @@
+using Xunit;
+
+namespace Repository.Tests
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+
+
+        }
+    }
+}
diff --git a/WebFrontend/Data/WeatherForecastService.cs b/WebFrontend/Data/WeatherForecastService.cs
@@ -4,7 +4,7 @@
 
 namespace ServerSideBlazor.Data
 {
-    public class WeatherForecastService
+    public class WeatherForecastService: IDisposable
     {
         private static readonly string[] Summaries = new[]
         {
@@ -23,5 +23,10 @@ public async Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
                 Summary = Summaries[rng.Next(Summaries.Length)]
             }).ToArray();
         }
+
+        public void Dispose()
+        {
+            Console.WriteLine("Disposin foreccast...");
+        }
     }
 }
diff --git a/WebFrontend/Startup.cs b/WebFrontend/Startup.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Net.Http;
 using CryptoStatsSource;
 using Database;
@@ -7,6 +8,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Model;
+using Repository;
 using ServerSideBlazor.Data;
 using SqlKata.Compilers;
 
@@ -35,7 +38,15 @@ public void ConfigureServices(IServiceCollection services)
 
             // TODO ensure that SqlKataDatabase gets disposed
             var dbConnection = new SqliteConnection("Data Source=data.db");
-            services.AddSingleton(ctx => new SqlKataDatabase(dbConnection, new SqliteCompiler()));
+            var db = new SqlKataDatabase(dbConnection, new SqliteCompiler());
+            var portfolioRepository = new SqlKataPortfolioRepository(db);
+            portfolioRepository.Add(new Portfolio("My portfolio", "ADA holdings"));
+            foreach (var portfolio in portfolioRepository.All())
+            {
+                Console.WriteLine($"{portfolio.Name} - {portfolio.Description}"); 
+            }
+            dbConnection.Close();
+            services.AddSingleton(ctx => db);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/WebFrontend/data.db b/WebFrontend/data.db

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,16 @@ public SqlKataDatabase(IDbConnection dbConnection, Compiler compiler)`
`14`	`14`	`{`
`15`	`15`	`_dbConnection = dbConnection;`
`16`	`16`	`_queryFactory = new(dbConnection, compiler);`
`17`		`-`
	`17`	`+`
`18`	`18`	`Console.WriteLine("SqlKataDatabase constructor invoked");`
	`19`	`+ SqlSchema.Init(this);`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public QueryFactory Get() => _queryFactory;`
`22`	`23`
`23`	`24`	`public void Dispose()`
`24`	`25`	`{`
	`26`	`+ // TODO check whether dispose is called`
`25`	`27`	`Console.WriteLine("Disposing SqlKataDatabase");`
`26`	`28`	`_dbConnection.Close();`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@`
`2`	`2`
`3`	`3`	`namespace Model`
`4`	`4`	`{`
`5`		`- public record MarketOrder(string Symbol, Currency Currency, decimal FilledPrice, decimal Fee, decimal Size,`
`6`		`- DateTime Date, bool Buy, int Id = -1, int PortfolioId = -1);`
	`5`	`+ public record MarketOrder(Currency Currency, decimal FilledPrice, decimal Fee, decimal Size,`
	`6`	`+ DateTime Date, bool Buy, int Id = -1, int PortfolioEntryId = -1);`
`7`	`7`
`8`	`8`	`public record Portfolio(string Name, string Description, int Id = -1);`
`9`	`9`
	`10`	`+ public record PortfolioEntry(string Symbol, int PortfolioId = -1, int Id = -1);`
	`11`	`+`
`10`	`12`	`public enum Currency`
`11`	`13`	`{`
`12`	`14`	`Czk,`