From 10cea5f42ceb062baeb580707270220d5159f8a6 Mon Sep 17 00:00:00 2001
From: Stedd <toanpa@pm.me>
Date: Wed, 13 Oct 2021 21:40:50 +0200
Subject: [PATCH] Refactoring

---
 DBInteraction.cs    | 31 +++++++++++++++++++++++++++++++
 MainWindow.xaml     |  4 ++--
 MainWindow.xaml.cs  |  4 ++--
 SqliteDataAccess.cs | 41 -----------------------------------------
 Transaction.cs      |  4 +---
 Util.cs             | 17 +++++++++++++++++
 6 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 DBInteraction.cs
 delete mode 100644 SqliteDataAccess.cs
 create mode 100644 Util.cs

diff --git a/DBInteraction.cs b/DBInteraction.cs
new file mode 100644
index 0000000..a8fc693
--- /dev/null
+++ b/DBInteraction.cs
@@ -0,0 +1,31 @@
+using Dapper;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Data.SQLite;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoCalc
+{
+    class DBInteraction
+    {
+        public static List<Transaction> LoadTransactions()
+        {
+            using IDbConnection _connection = new SQLiteConnection(Util.GetConnectionString());
+            var output = _connection.Query<Transaction>("select * from RawData", new DynamicParameters());
+            Debug.WriteLine("Loaded DB data");
+            return output.ToList();
+        }
+
+        public static void SaveTransaction(Transaction transaction)
+        {
+            using IDbConnection cnn = new SQLiteConnection(Util.GetConnectionString());
+            cnn.Execute("insert into RawData (Date_Year, Date_Month, Date_Day, Time_Hour, Time_Minute, Time_Second, DateTimeString, CryptoCurrency, Amount, TransactionType, Service, Comment) values (@Date_Year, @Date_Month, @Date_Day, @Time_Hour, @Time_Minute, @Time_Second, @DateTimeString, @CryptoCurrency, @Amount, @TransactionType, @Service, @Comment)", transaction);
+            Debug.WriteLine("Saved DB data");
+        }
+    }
+}
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 2803651..d5ce735 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -7,8 +7,8 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
-        <Button x:Name="saveButton" Content="Save" HorizontalAlignment="Left" Margin="536,0,0,309" VerticalAlignment="Bottom" Height="80" Width="180" Click="saveButton_Click" FontSize="20"/>
-        <Button x:Name="readButton" Content="Read" Margin="536,0,84,0" Click="readButton_click" FontSize="20" Height="80" Width="180" VerticalAlignment="Center"/>
+        <Button x:Name="saveButton" Content="Save" HorizontalAlignment="Left" Margin="518,0,0,289" VerticalAlignment="Bottom" Height="100" Width="239" Click="saveButton_Click" FontSize="20"/>
+        <Button x:Name="readButton" Content="Read" HorizontalAlignment="Left" Margin="518,0,0,156" VerticalAlignment="Bottom" Height="100" Width="239" Click="readButton_click" FontSize="20"/>
 
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 9d34884..25731b5 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -34,12 +34,12 @@ namespace CryptoCalc
 
         private void saveButton_Click(object sender, RoutedEventArgs e)
         {
-            SqliteDataAccess.SaveTransaction(dummyTransaction());
+            DBInteraction.SaveTransaction(dummyTransaction());
         }
 
         private void readButton_click(object sender, RoutedEventArgs e)
         {
-            transactions = SqliteDataAccess.LoadTransactions();
+            transactions = DBInteraction.LoadTransactions();
             foreach (var x in transactions)
             {
                 Debug.WriteLine($"{x.DateTimeString} *** {x.CryptoCurrency} - {x.Amount}");
diff --git a/SqliteDataAccess.cs b/SqliteDataAccess.cs
deleted file mode 100644
index 1c1fd24..0000000
--- a/SqliteDataAccess.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Dapper;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Data.SQLite;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CryptoCalc
-{
-    class SqliteDataAccess
-    {
-        public static List<Transaction> LoadTransactions()
-        {
-            using (IDbConnection cnn = new SQLiteConnection(LoadConnectionString()))
-            {
-                var output = cnn.Query<Transaction>("select * from RawData", new DynamicParameters());
-                Debug.WriteLine("Loaded DB data");
-                return output.ToList();
-                
-            }
-        }
-
-        public static void SaveTransaction(Transaction transaction)
-        {
-            using (IDbConnection cnn = new SQLiteConnection(LoadConnectionString()))
-            {
-                cnn.Execute("insert into RawData (Date_Year, Date_Month, Date_Day, Time_Hour, Time_Minute, Time_Second, DateTimeString, CryptoCurrency, Amount, TransactionType, Service, Comment) values (@Date_Year, @Date_Month, @Date_Day, @Time_Hour, @Time_Minute, @Time_Second, @DateTimeString, @CryptoCurrency, @Amount, @TransactionType, @Service, @Comment)", transaction);
-                Debug.WriteLine("Saved DB data");
-            }
-        }
-
-        private static string LoadConnectionString(string id = "Default")
-        {
-            return ConfigurationManager.ConnectionStrings[id].ConnectionString;
-        }
-    }
-}
diff --git a/Transaction.cs b/Transaction.cs
index a7332ba..14a0f83 100644
--- a/Transaction.cs
+++ b/Transaction.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace CryptoCalc
 {
-    class Transaction
+    public class Transaction
     {
         public int Index { get; set; }
         public int Date_Year { get; set; }
@@ -21,7 +21,5 @@ namespace CryptoCalc
         public string TransactionType { get; set; }
         public string Service{ get; set; }
         public string Comment { get; set; }
-
-
     }
 }
diff --git a/Util.cs b/Util.cs
new file mode 100644
index 0000000..a6d6298
--- /dev/null
+++ b/Util.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Configuration;
+
+namespace CryptoCalc
+{
+    public static class Util
+    {
+        public static string GetConnectionString(string name = "Default")
+        {
+            return ConfigurationManager.ConnectionStrings[name].ConnectionString;
+        }
+    }
+}