Fixed merge issues.

Author: gauffininteractive

src/Server/OneTrueError.Api.Client.Tests/TryTheClient.cs

@@ -10,7 +10,7 @@ namespace OneTrueError.Api.Client.Tests
 #if DEBUG
     public class TryTheClient
     {
-        [Fact]
+        //[Fact]
         public async Task Test()
         {
             var client = new OneTrueApiClient();

src/Server/OneTrueError.App/Core/Accounts/IAccountRepository.cs

@@ -20,7 +20,7 @@ public interface IAccountRepository
         Task CreateAsync(Account account);
 
         /// <summary>
-        ///     find by using the actiovation key
+        ///     find by using the activation key
         /// </summary>
         /// <param name="activationKey"></param>
         /// <returns>account if found; otherwise <c>null</c>.</returns>

src/Server/OneTrueError.App/Core/ApiKeys/Events/ApplicationDeletedHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using DotNetCqs;
 using Griffin.Container;
@@ -16,7 +17,7 @@ public class ApplicationDeletedHandler : IApplicationEventSubscriber<Application
         private readonly IApiKeyRepository _repository;
 
         /// <summary>
-        ///     Creates a new instance of <see cref="ApplicationDeletedHandler" />.
+        /// Creates a new instance of <see cref="ApplicationDeletedHandler"/>.
         /// </summary>
         /// <param name="repository">repos</param>
         public ApplicationDeletedHandler(IApiKeyRepository repository)

src/Server/OneTrueError.App/Core/Notifications/EventHandlers/ApplicationDeletedHandler.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using DotNetCqs;
+using Griffin.Container;
+using Griffin.Data;
+using OneTrueError.Api.Core.Applications.Events;
+
+namespace OneTrueError.App.Core.Notifications.EventHandlers
+{
+    /// <summary>
+    ///     Will delete all reports for the given application
+    /// </summary>
+    [Component(RegisterAsSelf = true)]
+    public class ApplicationDeletedHandler : IApplicationEventSubscriber<ApplicationDeleted>
+    {
+        private IAdoNetUnitOfWork _uow;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ApplicationDeletedHandler"/>.
+        /// </summary>
+        public ApplicationDeletedHandler(IAdoNetUnitOfWork uow)
+        {
+            if (uow == null) throw new ArgumentNullException("uow");
+            _uow = uow;
+        }
+
+        public Task HandleAsync(ApplicationDeleted e)
+        {
+            _uow.ExecuteNonQuery("DELETE FROM UserNotificationSettings WHERE ApplicationId = @id", new { id = e.ApplicationId });
+            return Task.FromResult<object>(null);
+        }
+    }
+}

src/Server/OneTrueError.App/OneTrueError.App.csproj

@@ -87,6 +87,7 @@
     <Compile Include="Core\Applications\CommandHandlers\DeleteApplicationHandler.cs" />
     <Compile Include="Core\Applications\EventHandlers\UpdateTeamOnInvitationAccepted.cs" />
     <Compile Include="Core\Applications\UserApplication.cs" />
+    <Compile Include="Core\Notifications\EventHandlers\ApplicationDeletedHandler.cs" />
     <Compile Include="Core\Incidents\Jobs\DeleteEmptyIncidents.cs" />
     <Compile Include="Core\Notifications\EventHandlers\CheckForFeedbackNotificationsToSend.cs" />
     <Compile Include="Core\Reports\Config\ReportConfig.cs" />
@@ -274,6 +275,8 @@
     <EmbeddedResource Include="Modules\Messaging\Templating\Layout\Template.html" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Core\Accounts\Events\" />
+    <Folder Include="Core\ErrorReports\Events\" />
     <Folder Include="Modules\ReportSpikes\EventHandlers\" />
   </ItemGroup>
   <ItemGroup>

src/Server/OneTrueError.Data.Common/IDatabaseUtilities.cs

@@ -4,6 +4,16 @@ namespace OneTrueError.Infrastructure
 {
     public interface ISetupDatabaseTools
     {
+        /// <summary>
+        /// Check if the current DB schema is out of date compared to the embedded schema resources.
+        /// </summary>
+        bool CanSchemaBeUpgraded();
+        
+        /// <summary>
+        /// Update DB schema to latest version.
+        /// </summary>
+        void UpgradeDatabaseSchema();
+
         /// <summary>
         ///     Used to check if the given connection string actually works
         /// </summary>

src/Server/OneTrueError.SqlServer.Tests/ConnectionFactory.cs

@@ -1,4 +1,5 @@
 using System.Configuration;
+using System.Data;
 using System.Data.SqlClient;
 using Griffin.Data;
 
@@ -13,5 +14,13 @@ public static IAdoNetUnitOfWork Create()
             connection.Open();
             return new AdoNetUnitOfWork(connection, true);
         }
+
+        public static IDbConnection CreateConnection()
+        {
+            var connection = new SqlConnection();
+            connection.ConnectionString = ConfigurationManager.ConnectionStrings["Db"].ConnectionString;
+            connection.Open();
+            return connection;
+        }
     }
 }

src/Server/OneTrueError.SqlServer.Tests/OneTrueError.SqlServer.Tests.csproj

@@ -93,6 +93,8 @@
     <Compile Include="Core\ApiKeys\Queries\ListApiKeysHandlerTests.cs" />
     <Compile Include="Modules\Geolocation\ErrorOriginRepositoryTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SchemaManagerTests.cs" />
+    <Compile Include="TestTools.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -107,6 +109,10 @@
       <Project>{5EF42A74-9323-49FA-A1F6-974D6DE77202}</Project>
       <Name>OneTrueError.App</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OneTrueError.Data.Common\OneTrueError.Infrastructure.csproj">
+      <Project>{A78A50DA-C9D7-47F2-8528-D7EE39D91924}</Project>
+      <Name>OneTrueError.Infrastructure</Name>
+    </ProjectReference>
     <ProjectReference Include="..\OneTrueError.SqlServer\OneTrueError.SqlServer.csproj">
       <Project>{B967BEEA-CDDD-4A83-A4F2-1C946099ED51}</Project>
       <Name>OneTrueError.SqlServer</Name>

src/Server/OneTrueError.SqlServer.Tests/SchemaManagerTests.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Griffin.Data.Mapper;
+using Xunit;
+
+namespace OneTrueError.SqlServer.Tests
+{
+    public class SchemaManagerTests
+    {
+        public const int LatestVersion = 3;
+
+        public SchemaManagerTests()
+        {
+            var sut = new SchemaManager(ConnectionFactory.CreateConnection);
+            EnsureSchemaTable();
+        }
+
+        [Fact]
+        public void should_report_upgradable_if_schema_version_is_less()
+        {
+            SetVersion(1);
+        
+            var sut = new SchemaManager(ConnectionFactory.CreateConnection);
+            var actual = sut.CanSchemaBeUpgraded();
+
+            actual.Should().BeTrue();
+        }
+
+        [Fact]
+        public void should_not_report_upgradable_if_schema_version_is_same()
+        {
+            SetVersion(3);
+
+            var sut = new SchemaManager(ConnectionFactory.CreateConnection);
+            var actual = sut.CanSchemaBeUpgraded();
+
+            actual.Should().BeFalse();
+        }
+
+        [Fact]
+        public void should_report_upgradable_if_schema_table_is_missing()
+        {
+            DropSchemaTable();
+
+            var sut = new SchemaManager(ConnectionFactory.CreateConnection);
+            var actual = sut.CanSchemaBeUpgraded();
+
+            actual.Should().BeTrue();
+        }
+
+        [Fact]
+        public void should_be_able_to_upgrade_schema()
+        {
+
+            var sut = new SchemaManager(ConnectionFactory.CreateConnection);
+            sut.UpgradeDatabaseSchema();
+
+
+        }
+
+
+        [Fact]
+        public void should_be_able_to_upgrade_database()
+        {
+            using (var tools = new TestTools())
+            {
+                tools.CreateDatabase();
+
+                var sut = new SchemaManager(tools.CreateConnection);
+                sut.UpgradeDatabaseSchema();
+            }
+        }
+
+
+        private void SetVersion(int version)
+        {
+            using (var con = SqlServerTools.OpenConnection())
+            {
+                con.ExecuteNonQuery("UPDATE DatabaseSchema SET Version = @version", new {version = version});
+            }
+        }
+
+        private void EnsureSchemaTable()
+        {
+            using (var con = SqlServerTools.OpenConnection())
+            {
+                con.ExecuteNonQuery(@"
+IF OBJECT_ID(N'dbo.[DatabaseSchema]', N'U') IS NULL
+BEGIN
+	CREATE TABLE [dbo].[DatabaseSchema] (
+        [Version] int not null default 1
+	);
+	INSERT INTO DatabaseSchema VALUES(1);
+END
+");
+            }
+        }
+
+        private void DropSchemaTable()
+        {
+            using (var con = SqlServerTools.OpenConnection())
+            {
+                con.ExecuteNonQuery(@"DROP TABLE [dbo].[DatabaseSchema]");
+            }
+        }
+    }
+}

src/Server/OneTrueError.SqlServer.Tests/TestTools.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Griffin.Data.Mapper;
+using OneTrueError.Infrastructure;
+
+namespace OneTrueError.SqlServer.Tests
+{
+    public class TestTools : IDisposable
+    {
+        private string _dbName;
+
+        public void CreateDatabase()
+        {
+            using (var con = ConnectionFactory.CreateConnection())
+            {
+                _dbName = "T" + Guid.NewGuid().ToString("N");
+                con.ExecuteNonQuery("CREATE Database " + _dbName);
+                con.ChangeDatabase(_dbName);
+                var schemaTool = new SchemaManager(() => con);
+                schemaTool.CreateInitialStructure();
+            }
+        }
+
+        public IDbConnection CreateConnection()
+        {
+            var connection = ConnectionFactory.CreateConnection();
+            connection.ChangeDatabase(_dbName);
+            return connection;
+        }
+
+        public void Dispose()
+        {
+            if (_dbName == null)
+                return;
+
+            using (var con = ConnectionFactory.CreateConnection())
+            {
+                var sql =
+                    string.Format("alter database {0} set single_user with rollback immediate; DROP Database {0}",
+                        _dbName);
+                con.ExecuteNonQuery(sql);
+            }
+        }
+    }
+}