From 0a25a405ca5b4c2f521dc322854eae2b667d73e9 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Tue, 30 Jun 2020 18:53:35 +0100 Subject: [PATCH] Further refactoring of models - Created and implemented IDatabaseCollection --- DevConsole/Program.cs | 6 +++--- FireLance/Interfaces/IDatabaseConnection.cs | 11 +++++++++++ .../{IDirectories.cs => Models/IDirectoriesModel.cs} | 2 +- .../{IGameEntry.cs => Models/IGameEntryModel.cs} | 2 +- .../{ISaveData.cs => Models/ISaveDataModel.cs} | 4 ++-- GSMParser/DataModels/DirectoriesModel.cs | 2 +- GSMParser/DataModels/GameEntryModel.cs | 2 +- GSMParser/Main.cs | 12 ++++++------ 8 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 FireLance/Interfaces/IDatabaseConnection.cs rename FireLance/Interfaces/{IDirectories.cs => Models/IDirectoriesModel.cs} (92%) rename FireLance/Interfaces/{IGameEntry.cs => Models/IGameEntryModel.cs} (89%) rename FireLance/Interfaces/{ISaveData.cs => Models/ISaveDataModel.cs} (81%) diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs index bd5bce8..439dff5 100644 --- a/DevConsole/Program.cs +++ b/DevConsole/Program.cs @@ -12,7 +12,7 @@ namespace DevConsole { while (true) { - Console.WriteLine($"Connection State: {gsmParser.ReportConnectionState()}"); + Console.WriteLine($"Connection State: {gsmParser.IsConnectionOpen()}"); CommandsMenu(); } } @@ -102,7 +102,7 @@ namespace DevConsole } #endregion - private static void PrintGameEntries(IEnumerable gameEntries) + private static void PrintGameEntries(IEnumerable gameEntries) { foreach (var game in gameEntries) { @@ -114,7 +114,7 @@ namespace DevConsole } } - private static void PrintDirectories(IEnumerable directoryEntries) + private static void PrintDirectories(IEnumerable directoryEntries) { foreach (var directory in directoryEntries) { diff --git a/FireLance/Interfaces/IDatabaseConnection.cs b/FireLance/Interfaces/IDatabaseConnection.cs new file mode 100644 index 0000000..2c30dae --- /dev/null +++ b/FireLance/Interfaces/IDatabaseConnection.cs @@ -0,0 +1,11 @@ +namespace FireLance.Interfaces +{ + public interface IDatabaseConnection + { + public void OpenConnection(string dbLocation); + + public void CloseCurrentConnection(); + + public bool IsConnectionOpen(); + } +} diff --git a/FireLance/Interfaces/IDirectories.cs b/FireLance/Interfaces/Models/IDirectoriesModel.cs similarity index 92% rename from FireLance/Interfaces/IDirectories.cs rename to FireLance/Interfaces/Models/IDirectoriesModel.cs index 6759a15..b758c6a 100644 --- a/FireLance/Interfaces/IDirectories.cs +++ b/FireLance/Interfaces/Models/IDirectoriesModel.cs @@ -4,7 +4,7 @@ using System.Text; namespace FireLance.Interfaces { - public interface IDirectories + public interface IDirectoriesModel { int id { get; set; } int GameID { get; set; } diff --git a/FireLance/Interfaces/IGameEntry.cs b/FireLance/Interfaces/Models/IGameEntryModel.cs similarity index 89% rename from FireLance/Interfaces/IGameEntry.cs rename to FireLance/Interfaces/Models/IGameEntryModel.cs index 42cd9d8..2edefd6 100644 --- a/FireLance/Interfaces/IGameEntry.cs +++ b/FireLance/Interfaces/Models/IGameEntryModel.cs @@ -4,7 +4,7 @@ using System.Text; namespace FireLance.Interfaces { - public interface IGameEntry + public interface IGameEntryModel { int id { get; set; } string GameName { get; set; } diff --git a/FireLance/Interfaces/ISaveData.cs b/FireLance/Interfaces/Models/ISaveDataModel.cs similarity index 81% rename from FireLance/Interfaces/ISaveData.cs rename to FireLance/Interfaces/Models/ISaveDataModel.cs index 262ce6b..6adca53 100644 --- a/FireLance/Interfaces/ISaveData.cs +++ b/FireLance/Interfaces/Models/ISaveDataModel.cs @@ -2,9 +2,9 @@ namespace FireLance.Interfaces { - public interface ISaveData + public interface ISaveDataModel { - int id { get; set; } + string GUID { get; set; } int GameID { get; set; } string SHA256Hash { get; set; } string Description { get; set; } diff --git a/GSMParser/DataModels/DirectoriesModel.cs b/GSMParser/DataModels/DirectoriesModel.cs index d8c75cd..c0789c5 100644 --- a/GSMParser/DataModels/DirectoriesModel.cs +++ b/GSMParser/DataModels/DirectoriesModel.cs @@ -1,4 +1,4 @@ -public class DirectoriesModel : FireLance.Interfaces.IDirectories +public class DirectoriesModel : FireLance.Interfaces.IDirectoriesModel { public int id { get; set; } public int GameID { get; set; } diff --git a/GSMParser/DataModels/GameEntryModel.cs b/GSMParser/DataModels/GameEntryModel.cs index 8522ff6..26968c7 100644 --- a/GSMParser/DataModels/GameEntryModel.cs +++ b/GSMParser/DataModels/GameEntryModel.cs @@ -1,6 +1,6 @@ using System.Data.Common; -public class GameEntryModel : FireLance.Interfaces.IGameEntry +public class GameEntryModel : FireLance.Interfaces.IGameEntryModel { public int id { get; set; } public string GameName { get; set; } diff --git a/GSMParser/Main.cs b/GSMParser/Main.cs index e17f69a..d484978 100644 --- a/GSMParser/Main.cs +++ b/GSMParser/Main.cs @@ -5,7 +5,7 @@ using System.IO; using Dapper; using FireLance.Interfaces; -public class GSMParser +public class GSMParser : IDatabaseConnection { private SqliteConnection DBConnection = new SqliteConnection(); @@ -25,22 +25,22 @@ public class GSMParser DBConnection.Close(); } - public string ReportConnectionState() + public bool IsConnectionOpen() { - return Convert.ToString(DBConnection.State); + return Convert.ToBoolean(DBConnection.State); } - public IEnumerable QueryGameById(string id) + public IEnumerable QueryGameById(string id) { return DBConnection.Query(QueryBuilder.GameEntryByGameId(id), new DynamicParameters()); } - public IEnumerable QueryDirectoryById(string id) + public IEnumerable QueryDirectoryById(string id) { return DBConnection.Query(QueryBuilder.DirectoryByGameId(id), new DynamicParameters()); } - public IEnumerable QueryGameByName(string name) + public IEnumerable QueryGameByName(string name) { return DBConnection.Query(QueryBuilder.GameEntryByName(name), new DynamicParameters()); }