Added automatic handling of application versions

Author: jgauffin

src/Server/Coderr.Server.App/Modules/Versions/Config/ApplicationVersionConfig.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using codeRR.Server.Api.Core.Incidents.Events;
-using codeRR.Server.Api.Core.Notifications;
-using codeRR.Server.App.Modules.Versions.Config;
-using codeRR.Server.Infrastructure.Configuration;
-using codeRR.Server.Infrastructure.Security;
 using Coderr.Server.PluginApi.Config;
 using DotNetCqs;
 using Griffin.Container;
@@ -15,50 +10,26 @@ namespace codeRR.Server.App.Modules.Versions.Events
     [Component]
     internal class GetVersionFromReport : IMessageHandler<ReportAddedToIncident>
     {
-        private const string NotifyNoVersion = "Versions.Configure";
-        private const string NotifyNotRecognizedVersion = "Versions.ReConfigure";
-        private IVersionRepository _repository;
-        private ConfigurationStore _configStore;
+        public const string AppAssemblyVersion = "AppAssemblyVersion";
+        private readonly IVersionRepository _repository;
 
-        public GetVersionFromReport(IVersionRepository repository, ConfigurationStore configStore)
+        public GetVersionFromReport(IVersionRepository repository)
         {
             _repository = repository;
-            _configStore = configStore;
         }
 
         public async Task HandleAsync(IMessageContext context, ReportAddedToIncident e)
         {
-            var assemblyName = GetVersionAssemblyName(e.Incident.ApplicationId);
-            if (assemblyName == null)
+            string version = null;
+            foreach (var contextCollection in e.Report.ContextCollections)
             {
-                var notice = new AddNotification(CoderrClaims.RoleSysAdmin,
-                    "There is no version assembly configured for " + e.Incident.ApplicationName +
-                    ". Go to 'System Settings'/Versions and configure one")
-                {
-                    HoldbackInterval = TimeSpan.FromDays(3),
-                    NotificationType = NotifyNoVersion
-                };
-                await context.SendAsync(notice);
-                return;
+                if (!contextCollection.Properties.TryGetValue(AppAssemblyVersion, out version))
+                    continue;
             }
 
-            var collection = Enumerable.FirstOrDefault(e.Report.ContextCollections, x => x.Name == "Assemblies");
-            if (collection == null)
+            if (version == null)
                 return;
 
-            if (!collection.Properties.TryGetValue(assemblyName, out string version))
-            {
-                var notice = new AddNotification(CoderrClaims.RoleSysAdmin,
-                    "Assembly " + assemblyName + " is configured for application " + e.Incident.ApplicationName +
-                    ". It do however not exist. Configure a new one at 'System Settings'/Versions.")
-                {
-                    HoldbackInterval = TimeSpan.FromDays(3),
-                    NotificationType = NotifyNotRecognizedVersion
-                };
-                await context.SendAsync(notice);
-                return;
-            }
-
             var isNewIncident = e.Incident.ReportCount <= 1;
             var versionEntity = await _repository.FindVersionAsync(e.Incident.ApplicationId, version)
                                 ?? new ApplicationVersion(e.Incident.ApplicationId, e.Incident.ApplicationName,
@@ -72,13 +43,10 @@ public async Task HandleAsync(IMessageContext context, ReportAddedToIncident e)
             else
                 await _repository.UpdateAsync(versionEntity);
 
-            await IncreaseReportCounter(versionEntity.Id, isNewIncident);
-        }
 
-        private string GetVersionAssemblyName(int applicationId)
-        {
-            var config = _configStore.Load<ApplicationVersionConfig>();
-            return config?.GetAssemblyName(applicationId);
+            _repository.SaveIncidentVersion(e.Incident.Id, versionEntity.Id);
+
+            await IncreaseReportCounter(versionEntity.Id, isNewIncident);
         }
 
         private async Task IncreaseReportCounter(int versionId, bool isNewIncident)

src/Server/Coderr.Server.App/Modules/Versions/Config/ApplicationVersionConfigItem.cs

@@ -28,6 +28,15 @@ public interface IVersionRepository
         /// <exception cref="DbException">Failed to insert row</exception>
         Task CreateAsync(ApplicationVersion entity);
 
+        /// <summary>
+        ///     Get version
+        /// </summary>
+        /// <param name="incidentId">Incident to get versions for</param>
+        /// <returns>version if found; otherwise <c>null</c></returns>
+        /// <exception cref="ArgumentNullException">applicationId;version</exception>
+        /// <exception cref="DbException">Failed to query DB</exception>
+        Task<IList<ApplicationVersion>> FindForIncidentAsync(int incidentId);
+
         /// <summary>
         ///     Get monthly exception report
         /// </summary>
@@ -51,13 +60,18 @@ public interface IVersionRepository
         Task<ApplicationVersion> FindVersionAsync(int applicationId, string version);
 
         /// <summary>
-        ///     Get version
+        ///     Find all versions that we've received error reports for.
         /// </summary>
-        /// <param name="incidentId">Incident to get versions for</param>
-        /// <returns>version if found; otherwise <c>null</c></returns>
-        /// <exception cref="ArgumentNullException">applicationId;version</exception>
-        /// <exception cref="DbException">Failed to query DB</exception>
-        Task<IList<ApplicationVersion>> FindForIncidentAsync(int incidentId);
+        /// <param name="appId">application id</param>
+        /// <returns>versions</returns>
+        Task<IEnumerable<string>> FindVersionsAsync(int appId);
+
+        /// <summary>
+        ///     Save version (ignore if it have already been stored).
+        /// </summary>
+        /// <param name="incidentId">incident to attach version to</param>
+        /// <param name="versionId">Id for the application version</param>
+        void SaveIncidentVersion(int incidentId, int versionId);
 
 
         /// <summary>
@@ -77,12 +91,5 @@ public interface IVersionRepository
         /// <exception cref="ArgumentNullException">entity</exception>
         /// <exception cref="DbException">Failed to query DB</exception>
         Task UpdateAsync(ApplicationVersion entity);
-
-        /// <summary>
-        /// Find all versions that we've received error reports for.
-        /// </summary>
-        /// <param name="appId">application id</param>
-        /// <returns>versions</returns>
-        Task<IEnumerable<string>> FindVersionsAsync(int appId);
     }
 }

src/Server/Coderr.Server.App/Modules/Versions/Events/AttachVersionTagToIncident.cs

@@ -11,11 +11,11 @@
 namespace codeRR.Server.App.Modules.Versions
 {
     [Component]
-    class QuickFactsProvider : IQuickfactProvider
+    class VersionQuickFactProvider : IQuickfactProvider
     {
         private IVersionRepository _repository;
 
-        public QuickFactsProvider(IVersionRepository repository)
+        public VersionQuickFactProvider(IVersionRepository repository)
         {
             _repository = repository;
         }
@@ -25,11 +25,6 @@ public async Task AssignAsync(int incidentId, ICollection<QuickFact> facts)
             var versions = await _repository.FindForIncidentAsync(incidentId);
             if (!versions.Any())
             {
-                facts.Add(new QuickFact
-                {
-                    Title = "Versions",
-                    Value = "<em class=\"text-muted\">(This feature is activated in admin)</em>"
-                });
                 return;
             }
 

src/Server/Coderr.Server.App/Modules/Versions/Events/GetVersionFromReport.cs

@@ -76,6 +76,24 @@ JOIN ApplicationVersions ON (IncidentVersions.VersionId = ApplicationVersions.Id
             }
         }
 
+        public void SaveIncidentVersion(int incidentId, int versionId)
+        {
+            var sql = @"INSERT INTO IncidentVersions (IncidentId, VersionId)
+                        SELECT @incidentId, @versionId
+                        WHERE NOT EXISTS (
+                            select IncidentId
+                              from IncidentVersions 
+                              WHERE VersionId=@versionId
+                        )";
+            using (var cmd = _uow.CreateDbCommand())
+            {
+                cmd.CommandText = sql;
+                cmd.AddParameter("incidentId", incidentId);
+                cmd.AddParameter("versionId", versionId);
+                cmd.ExecuteNonQuery();
+            }
+        }
+
         public async Task UpdateAsync(ApplicationVersionMonth month)
         {
             await _uow.UpdateAsync(month);