Merge pull request #85 from faesel/build-fix

added code to override location of connection collection
faesel · Dec 17, 2020 · c4bfa62 · c4bfa62
2 parents 3605d2f + 51ffc16
commit c4bfa62
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/az-lazy.test/BlobTest/Blob.cs b/az-lazy.test/BlobTest/Blob.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System;
 using System.IO;
 using System.Reflection;
@@ -34,7 +33,7 @@ public async Task CanUploadNewBlob()
             }
             catch (Exception)
             {
-                //Suppress, its most likely becuase the container doesnt exist
+                //Suppress, its most likely because the container doesnt exist
             }
             await LocalStorageFixture.AzureContainerManager.CreateContainer(DevStorageConnectionString, PublicAccessType.None, containerName).ConfigureAwait(false);
 
@@ -60,7 +59,7 @@ public async Task CanDeleteBlob()
             }
             catch (Exception)
             {
-                //Suppress, its most likely becuase the container doesnt exist
+                //Suppress, its most likely because the container doesnt exist
             }
             await LocalStorageFixture.AzureContainerManager.CreateContainer(DevStorageConnectionString, PublicAccessType.None, containerName).ConfigureAwait(false);
 

diff --git a/az-lazy.test/LocalStorageFixture.cs b/az-lazy.test/LocalStorageFixture.cs
@@ -9,6 +9,8 @@
 using az_lazy.Manager;
 using az_lazy.Startup;
 using Microsoft.Extensions.DependencyInjection;
+using System.IO;
+using System.Reflection;
 
 namespace az_lazy.test
 {
@@ -37,6 +39,10 @@ public LocalStorageFixture()
 
             //Add development connection to connect to azure storage emulator
             LocalStorageManager = ServiceProvider.GetService<ILocalStorageManager>();
+
+            string collectionLocation = @$"{Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)}\connections.db";
+
+            LocalStorageManager.OverrideCollectionLocation(collectionLocation);
             LocalStorageManager.AddDevelopmentConnection();
 
             AzureQueueManager = ServiceProvider.GetService<IAzureQueueManager>();

diff --git a/az-lazy/Manager/LocalStorageManager.cs b/az-lazy/Manager/LocalStorageManager.cs
@@ -13,6 +13,7 @@ public interface ILocalStorageManager
     {
         void AddConnection(string connectionName, string connectionString, bool selectConnection = false);
         void AddDevelopmentConnection();
+        void OverrideCollectionLocation(string location);
         bool SelectConnection(string connectionName);
         bool RemoveConnection(string connectionName);
         bool RemoveAllConnections(string connectionName);
@@ -24,11 +25,16 @@ public class LocalStorageManager : ILocalStorageManager
     {
         private const string DevConnectionName = "devStorage";
         private const string DevConnectionString = "UseDevelopmentStorage=true";
-        private readonly string ConnectionCollection = @$"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\.dotnet\tools\.store\az-lazy\connections.db";
+        private string CollectionLocation = @$"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\.dotnet\tools\.store\az-lazy\connections.db";
+
+        public void OverrideCollectionLocation(string location)
+        {
+            CollectionLocation = location;
+        }
 
         public void AddConnection(string connectionName, string connectionString, bool selectConnection = false)
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
             var connection = new Connection(connectionName, connectionString);
 
@@ -48,7 +54,7 @@ public void AddDevelopmentConnection()
             developmentStorage.SetSelected();
             developmentStorage.SetDevelopmentStorage();
 
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             var hasDevelopmentStorage = collection.Query()
@@ -63,7 +69,7 @@ public void AddDevelopmentConnection()
 
         public List<Connection> GetConnections()
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             return collection.Query()
@@ -72,15 +78,15 @@ public List<Connection> GetConnections()
 
         public Connection GetSelectedConnection()
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             return collection.FindOne(x => x.IsSelected);
         }
 
         public bool SelectConnection(string connectionName)
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             var connectionToSelect = collection.FindOne(x => x.ConnectionName.Equals(connectionName, StringComparison.InvariantCultureIgnoreCase));
@@ -106,7 +112,7 @@ public bool SelectConnection(string connectionName)
 
         public bool RemoveConnection(string connectionName)
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             var connectionToRemove = collection.FindOne(x => x.ConnectionName.Equals(connectionName, StringComparison.InvariantCultureIgnoreCase));
@@ -123,7 +129,7 @@ public bool RemoveConnection(string connectionName)
 
         public bool RemoveAllConnections(string connectionName)
         {
-            using var db = new LiteDatabase(ConnectionCollection);
+            using var db = new LiteDatabase(CollectionLocation);
             var collection = db.GetCollection<Connection>(nameof(ModelNames.Connection));
 
             var connectionToRemove = collection