Further refactoring of models

- Created and implemented IDatabaseCollection
This commit is contained in:
2020-06-30 18:53:35 +01:00
parent aed3f0e3ac
commit 0a25a405ca
8 changed files with 26 additions and 15 deletions
+3 -3
View File
@@ -12,7 +12,7 @@ namespace DevConsole
{ {
while (true) while (true)
{ {
Console.WriteLine($"Connection State: {gsmParser.ReportConnectionState()}"); Console.WriteLine($"Connection State: {gsmParser.IsConnectionOpen()}");
CommandsMenu(); CommandsMenu();
} }
} }
@@ -102,7 +102,7 @@ namespace DevConsole
} }
#endregion #endregion
private static void PrintGameEntries(IEnumerable<IGameEntry> gameEntries) private static void PrintGameEntries(IEnumerable<IGameEntryModel> gameEntries)
{ {
foreach (var game in gameEntries) foreach (var game in gameEntries)
{ {
@@ -114,7 +114,7 @@ namespace DevConsole
} }
} }
private static void PrintDirectories(IEnumerable<IDirectories> directoryEntries) private static void PrintDirectories(IEnumerable<IDirectoriesModel> directoryEntries)
{ {
foreach (var directory in directoryEntries) foreach (var directory in directoryEntries)
{ {
@@ -0,0 +1,11 @@
namespace FireLance.Interfaces
{
public interface IDatabaseConnection
{
public void OpenConnection(string dbLocation);
public void CloseCurrentConnection();
public bool IsConnectionOpen();
}
}
@@ -4,7 +4,7 @@ using System.Text;
namespace FireLance.Interfaces namespace FireLance.Interfaces
{ {
public interface IDirectories public interface IDirectoriesModel
{ {
int id { get; set; } int id { get; set; }
int GameID { get; set; } int GameID { get; set; }
@@ -4,7 +4,7 @@ using System.Text;
namespace FireLance.Interfaces namespace FireLance.Interfaces
{ {
public interface IGameEntry public interface IGameEntryModel
{ {
int id { get; set; } int id { get; set; }
string GameName { get; set; } string GameName { get; set; }
@@ -2,9 +2,9 @@
namespace FireLance.Interfaces namespace FireLance.Interfaces
{ {
public interface ISaveData public interface ISaveDataModel
{ {
int id { get; set; } string GUID { get; set; }
int GameID { get; set; } int GameID { get; set; }
string SHA256Hash { get; set; } string SHA256Hash { get; set; }
string Description { get; set; } string Description { get; set; }
+1 -1
View File
@@ -1,4 +1,4 @@
public class DirectoriesModel : FireLance.Interfaces.IDirectories public class DirectoriesModel : FireLance.Interfaces.IDirectoriesModel
{ {
public int id { get; set; } public int id { get; set; }
public int GameID { get; set; } public int GameID { get; set; }
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Data.Common; using System.Data.Common;
public class GameEntryModel : FireLance.Interfaces.IGameEntry public class GameEntryModel : FireLance.Interfaces.IGameEntryModel
{ {
public int id { get; set; } public int id { get; set; }
public string GameName { get; set; } public string GameName { get; set; }
+6 -6
View File
@@ -5,7 +5,7 @@ using System.IO;
using Dapper; using Dapper;
using FireLance.Interfaces; using FireLance.Interfaces;
public class GSMParser public class GSMParser : IDatabaseConnection
{ {
private SqliteConnection DBConnection = new SqliteConnection(); private SqliteConnection DBConnection = new SqliteConnection();
@@ -25,22 +25,22 @@ public class GSMParser
DBConnection.Close(); DBConnection.Close();
} }
public string ReportConnectionState() public bool IsConnectionOpen()
{ {
return Convert.ToString(DBConnection.State); return Convert.ToBoolean(DBConnection.State);
} }
public IEnumerable<IGameEntry> QueryGameById(string id) public IEnumerable<IGameEntryModel> QueryGameById(string id)
{ {
return DBConnection.Query<GameEntryModel>(QueryBuilder.GameEntryByGameId(id), new DynamicParameters()); return DBConnection.Query<GameEntryModel>(QueryBuilder.GameEntryByGameId(id), new DynamicParameters());
} }
public IEnumerable<IDirectories> QueryDirectoryById(string id) public IEnumerable<IDirectoriesModel> QueryDirectoryById(string id)
{ {
return DBConnection.Query<DirectoriesModel>(QueryBuilder.DirectoryByGameId(id), new DynamicParameters()); return DBConnection.Query<DirectoriesModel>(QueryBuilder.DirectoryByGameId(id), new DynamicParameters());
} }
public IEnumerable<IGameEntry> QueryGameByName(string name) public IEnumerable<IGameEntryModel> QueryGameByName(string name)
{ {
return DBConnection.Query<GameEntryModel>(QueryBuilder.GameEntryByName(name), new DynamicParameters()); return DBConnection.Query<GameEntryModel>(QueryBuilder.GameEntryByName(name), new DynamicParameters());
} }