Refactoring

DevConsole/Program.cs

@@ -63,7 +63,7 @@ namespace DevConsole
         private static void ConnectToFirelanceManager()
         {
             flcMgr.OpenConnection("sr3", 27017);
-            flcCRUD = new FirelanceCRUD(flcMgr.DBInstance);
+            flcCRUD = new FirelanceCRUD(flcMgr.Database);
             Console.WriteLine($"FireLance Connection State: {flcMgr.IsConnectionOpen()}");
         }
 
@@ -261,7 +261,7 @@ namespace DevConsole
 
         private static void FlcUploadToGridFsAction()
         {
-            var flcGFS = new FirelanceGFS(flcMgr.DBInstance);
+            var flcGFS = new FirelanceGFS(flcMgr.Database);
             var ulResult = flcGFS.UploadFile("TestFile", @"C:\Users\Dunestorm\Downloads\OpenMW-0.46.0-win64.exe");
             Console.WriteLine(ulResult.Result);
         }
@@ -270,7 +270,7 @@ namespace DevConsole
         {
             var objId = "5f00a560b65a2f02d0c7996e";
 
-            var flcGFC = new FirelanceGFS(flcMgr.DBInstance);
+            var flcGFC = new FirelanceGFS(flcMgr.Database);
             var dlResult = flcGFC.DownloadFile(new MongoDB.Bson.ObjectId(objId), @$"D:\Temp\{objId}.exe");
             Console.WriteLine($"Download Successful: {dlResult.Result}");
         }

FireLance/FireLanceCRUD.cs

@@ -5,23 +5,23 @@ using System.Collections.Generic;
 
 namespace FireLance
 {
-    public class FirelanceCRUD : IFlcMongoConnecton
+    public class FirelanceCRUD : IFlcMongoDBConnecton
     {
-        public IMongoDatabase DBInstance { get; set; }
+        public IMongoDatabase Database { get; set; }
         public FirelanceCRUD(IMongoDatabase db)
         {
-            DBInstance = db;
+            Database = db;
         }
 
         public void InsertRecord<T>(string table, T record)
         {
-            var collection = DBInstance.GetCollection<T>(table);
+            var collection = Database.GetCollection<T>(table);
             collection.InsertOne(record);
         }
 
         public void UpsertRecordById<T>(string table, Guid id, T record)
         {
-            var collection = DBInstance.GetCollection<T>(table);
+            var collection = Database.GetCollection<T>(table);
             collection.ReplaceOne(
                 new BsonDocument("_id", id),
                 record,
@@ -30,13 +30,13 @@ namespace FireLance
 
         public List<T> LoadRecordsFromTable<T>(string table)
         {
-            var collection = DBInstance.GetCollection<T>(table);
+            var collection = Database.GetCollection<T>(table);
             return collection.Find(new BsonDocument()).ToList();
         }
 
         public T LoadRecordById<T>(string table, Guid id)
         {
-            var collection = DBInstance.GetCollection<T>(table);
+            var collection = Database.GetCollection<T>(table);
             var filter = Builders<T>.Filter.Eq("Id", id);
 
             return collection.Find(filter).First();
@@ -44,7 +44,7 @@ namespace FireLance
 
         public void DeleteRecordById<T>(string table, Guid id)
         {
-            var collection = DBInstance.GetCollection<T>(table);
+            var collection = Database.GetCollection<T>(table);
             var filter = Builders<T>.Filter.Eq("Id", id);
             collection.DeleteOne(filter);
         }

FireLance/FirelanceMgr.cs

@@ -5,23 +5,23 @@ using System;
 
 namespace FireLance
 {
-    public class FirelanceMgr : IFlcDbConnection, IFlcMongoConnecton
+    public class FirelanceMgr : IFlcBaseDBConnection, IFlcMongoDBConnecton
     {
-        public IMongoDatabase DBInstance { get; private set; }
+        public IMongoDatabase Database { get; private set; }
 
         public void OpenConnection(string dbLocation, int port)
         {
             var client = new MongoClient($"mongodb://{dbLocation}:{port}");
             var settings = new MongoDatabaseSettings { GuidRepresentation = GuidRepresentation.Standard };
 
-            DBInstance = client.GetDatabase(dbLocation, settings);
+            Database = client.GetDatabase(dbLocation, settings);
         }
 
         public bool IsConnectionOpen()
         {
             int connectionCnt = 0;
 
-            try { connectionCnt = DBInstance.Client.ListDatabases().ToList().Count; }
+            try { connectionCnt = Database.Client.ListDatabases().ToList().Count; }
             catch { }
 
             return (connectionCnt > 0) ? true : false;

FireLance/Interfaces/IFlcBaseDBConnection.cs

@@ -1,6 +1,6 @@
 namespace FireLance.Interfaces
 {
-    public interface IFlcDbConnection
+    public interface IFlcBaseDBConnection
     {
         public void OpenConnection(string dbLocation, int port);
         public void CloseCurrentConnection();

FireLance/Interfaces/IFlcMongoConnecton.cs

@@ -1,9 +0,0 @@
-using MongoDB.Driver;
-
-namespace FireLance
-{
-    public interface IFlcMongoConnecton
-    {
-        public IMongoDatabase DBInstance { get; }
-    }
-}

FireLance/Interfaces/IFlcMongoDBConnecton.cs

@@ -0,0 +1,9 @@
+using MongoDB.Driver;
+
+namespace FireLance
+{
+    public interface IFlcMongoDBConnecton
+    {
+        public IMongoDatabase Database { get; }
+    }
+}

GSMParser/GsmDB.cs

@@ -5,7 +5,7 @@ using FireLance.Interfaces;
 
 namespace Gsm
 {
-    public abstract class GsmDB : IFlcDbConnection
+    public abstract class GsmDB : IFlcBaseDBConnection
     {
         internal SqliteConnection DBConnection = new SqliteConnection();