refactored how context collections are stored and improved search capabilities.

Author: jgauffin

src/Server/Coderr.Server.Api/Core/Incidents/Queries/FindIncidents.cs

@@ -23,13 +23,49 @@ public FindIncidents()
             ItemsPerPage = 20;
         }
 
+
         /// <summary>
-        ///     0 = find for all applications
+        ///     Find incidents assigned to the specified user
+        /// </summary>
+        public int AccountId { get; set; }
+
+        /// <summary>
+        ///     Empty = find for all applications
         /// </summary>
         /// <value>
         ///     The application identifier.
         /// </value>
-        public int ApplicationId { get; set; }
+        public int[] ApplicationIds { get; set; }
+
+        /// <summary>
+        ///     Find an incident with a specific collection
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Wildcard search is allowed, i.e. "http*"
+        ///     </para>
+        /// </remarks>
+        public string ContextCollectionName { get; set; }
+
+        /// <summary>
+        ///     Find an incident with a specific property
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Wildcard search is allowed, i.e. "http*"
+        ///     </para>
+        /// </remarks>
+        public string ContextCollectionPropertyName { get; set; }
+
+        /// <summary>
+        ///     Find an incident with a specific property value
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Wildcard search is allowed, i.e. "http*"
+        ///     </para>
+        /// </remarks>
+        public string ContextCollectionPropertyValue { get; set; }
 
         /// <summary>
         ///     Will be searched in incident.message and report.stacktrace.
@@ -91,11 +127,14 @@ public FindIncidents()
         /// </summary>
         public IncidentOrder SortType { get; set; }
 
+        /// <summary>
+        ///     Incident should have all the specified tags
+        /// </summary>
+        public string[] Tags { get; set; }
+
         /// <summary>
         ///     Version (in the form of a version string i.e. "1.2.1")
         /// </summary>
         public string Version { get; set; }
-
-        public string[] Tags { get; set; }
     }
 }

src/Server/Coderr.Server.Api/Modules/Tagging/Queries/GetTags.cs

@@ -0,0 +1,21 @@
+using DotNetCqs;
+
+namespace codeRR.Server.Api.Modules.Tagging.Queries
+{
+    /// <summary>
+    ///     Get all tags that the system have identified for an incident.
+    /// </summary>
+    [Message]
+    public class GetTags : Query<TagDTO[]>
+    {
+        /// <summary>
+        ///     Application to get tags for
+        /// </summary>
+        public int? ApplicationId { get; set; }
+
+        /// <summary>
+        ///     Incident to get tags for
+        /// </summary>
+        public int? IncidentId { get; private set; }
+    }
+}

src/Server/Coderr.Server.App/Core/Reports/Jobs/DeleteReportsBelowReportLimit.cs

@@ -59,7 +59,7 @@ public void Execute()
             {
                 cmd.CommandText =
                     @"SELECT TOP(5) IncidentId, count(Id)
-                        FROM ErrorReports
+                        FROM ErrorReports WITH (ReadPast)
                         GROUP BY IncidentId
                         HAVING Count(IncidentId) > @max
                         ORDER BY count(Id) DESC";
@@ -82,9 +82,8 @@ HAVING Count(IncidentId) > @max
                     var sql = $@"With RowsToDelete AS
                                 (
                                     SELECT TOP {rowsToDelete} Id
-                                    FROM ErrorReports 
+                                    FROM ErrorReports WITH (ReadPast)
                                     WHERE IncidentId = {incidentIdAndCount.Item1}
-                                    ORDER BY ID ASC
                                 )
                                 DELETE FROM RowsToDelete";
                     cmd.CommandText = sql;

src/Server/Coderr.Server.App/Modules/Tagging/Handlers/GetTagsHandler.cs

@@ -0,0 +1,31 @@
+using System.Linq;
+using System.Threading.Tasks;
+using codeRR.Server.Api.Modules.Tagging;
+using codeRR.Server.Api.Modules.Tagging.Queries;
+using codeRR.Server.App.Modules.Tagging.Domain;
+using DotNetCqs;
+using Griffin.Container;
+
+namespace codeRR.Server.App.Modules.Tagging.Handlers
+{
+    [Component]
+    internal class GetTagsHandler : IQueryHandler<GetTags, TagDTO[]>
+    {
+        private readonly ITagsRepository _repository;
+
+        public GetTagsHandler(ITagsRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public async Task<TagDTO[]> HandleAsync(IMessageContext context, GetTags query)
+        {
+            return (await _repository.GetTagsAsync(query.ApplicationId, query.IncidentId)).Select(ConvertTag).ToArray();
+        }
+
+        private TagDTO ConvertTag(Tag arg)
+        {
+            return new TagDTO {Name = arg.Name, OrderNumber = arg.OrderNumber};
+        }
+    }
+}

src/Server/Coderr.Server.App/Modules/Tagging/ITagsRepository.cs

@@ -18,6 +18,14 @@ public interface ITagsRepository
         /// <returns>task</returns>
         Task AddAsync(int incidentId, Tag[] tags);
 
+        /// <summary>
+        ///     Get a list of tags for an application
+        /// </summary>
+        /// <param name="applicationId">application to get tags for</param>
+        /// <returns>List of tags (or an empty list)</returns>
+        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
+        Task<IReadOnlyList<Tag>> GetApplicationTagsAsync(int applicationId);
+
         /// <summary>
         ///     Get a list of tags for a specific incident
         /// </summary>
@@ -30,8 +38,9 @@ public interface ITagsRepository
         ///     Get a list of tags for an application
         /// </summary>
         /// <param name="applicationId">application to get tags for</param>
+        /// <param name="incidentId">incident to get tags for</param>
         /// <returns>List of tags (or an empty list)</returns>
         [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        Task<IReadOnlyList<Tag>> GetApplicationTagsAsync(int applicationId);
+        Task<IReadOnlyList<Tag>> GetTagsAsync(int? applicationId, int? incidentId);
     }
 }

src/Server/Coderr.Server.ReportAnalyzer/AnalysisDbContext.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using codeRR.Server.Infrastructure;
+using codeRR.Server.ReportAnalyzer.Domain.Reports;
 using Griffin.Data;
 
 namespace codeRR.Server.ReportAnalyzer
@@ -12,17 +13,15 @@ public class AnalysisDbContext : IDisposable
     {
         private readonly Func<IDbConnection> _connectionFactory;
         private IDbConnection _con;
-        private IAdoNetUnitOfWork _unitOfWork;
+        private OurUnitOfWork _unitOfWork;
 
         public AnalysisDbContext(Func<IDbConnection> connectionFactory)
         {
             _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
         }
 
-        public AnalysisDbContext(IAdoNetUnitOfWork unitOfWork)
-        {
-            _unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));
-        }
+
+        public IDbTransaction Transaction => ((OurUnitOfWork) UnitOfWork).Transaction;
 
         /// <summary>
         ///     Open and valid connection
@@ -45,12 +44,17 @@ public IDbConnection Connection
         /// </summary>
         /// <exception cref="DataException">Connection failed.</exception>
         public IAdoNetUnitOfWork UnitOfWork => _unitOfWork
-                                               ?? (_unitOfWork = new AdoNetUnitOfWork(Connection, false));
+                                               ?? (_unitOfWork = new OurUnitOfWork(Connection, false));
 
         public void Dispose()
         {
             _unitOfWork?.Dispose();
             _con?.Dispose();
         }
+
+        public void SaveChanges()
+        {
+            _unitOfWork?.SaveChanges();
+        }
     }
 }

src/Server/Coderr.Server.ReportAnalyzer/IAnalyticsRepository.cs

@@ -56,5 +56,6 @@ public interface IAnalyticsRepository
         /// <param name="incidentAnalysis">incident to persist</param>
         /// <exception cref="ArgumentNullException">incentAnalysis</exception>
         void UpdateIncident(IncidentBeingAnalyzed incidentAnalysis);
+
     }
 }

src/Server/Coderr.Server.ReportAnalyzer/OurUnitOfWork.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Data;
+using Griffin;
+using Griffin.Data;
+
+namespace codeRR.Server.ReportAnalyzer
+{
+    public class OurUnitOfWork : IAdoNetUnitOfWork
+    {
+        private readonly bool _ownsConnection;
+        private IDbConnection _connection;
+
+        public OurUnitOfWork(IDbConnection connection, bool ownsConnection)
+        {
+            _connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            _ownsConnection = ownsConnection;
+            Transaction = connection.BeginTransaction();
+        }
+
+        public IDbTransaction Transaction { get; private set; }
+
+        public void Dispose()
+        {
+            if (Transaction != null)
+            {
+                Transaction.Dispose();
+                Transaction = null;
+            }
+
+            if (_connection != null && _ownsConnection)
+            {
+                _connection.Dispose();
+                _connection = null;
+            }
+        }
+
+        public void SaveChanges()
+        {
+            Transaction.Commit();
+            Transaction.Dispose();
+            Transaction = null;
+        }
+
+        public IDbCommand CreateCommand()
+        {
+            var cmd = _connection.CreateCommand();
+            cmd.Transaction = Transaction;
+            return cmd;
+        }
+
+        /// <summary>
+        ///     Execute a SQL query within the transaction
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="parameters"></param>
+        public void Execute(string sql, object parameters)
+        {
+            using (var cmd = CreateCommand())
+            {
+                cmd.CommandText = sql;
+                var dictionary = parameters.ToDictionary();
+                foreach (var kvp in dictionary) cmd.AddParameter(kvp.Key, kvp.Value);
+                cmd.ExecuteNonQuery();
+            }
+        }
+    }
+}

src/Server/Coderr.Server.SqlServer/Analysis/AnalyticsRepository.cs

@@ -9,6 +9,7 @@
 using codeRR.Server.ReportAnalyzer.Domain.Incidents;
 using codeRR.Server.ReportAnalyzer.Domain.Reports;
 using codeRR.Server.ReportAnalyzer.Scanners;
+using codeRR.Server.SqlServer.Analysis.Jobs;
 using codeRR.Server.SqlServer.Tools;
 using Coderr.Server.PluginApi.Config;
 using DotNetCqs;
@@ -26,6 +27,7 @@ public class AnalyticsRepository : IAnalyticsRepository
         private readonly ILog _logger = LogManager.GetLogger(typeof(AnalyticsRepository));
         private readonly ReportDtoConverter _reportDtoConverter = new ReportDtoConverter();
         private readonly IAdoNetUnitOfWork _unitOfWork;
+        private const int MaxCollectionSize = 2000000;
 
         public AnalyticsRepository(AnalysisDbContext dbContext, ConfigurationStore configurationStore)
         {
@@ -111,8 +113,35 @@ public void CreateReport(ErrorReportEntity report)
                     report.Title = report.Title.Substring(0, 100);
             }
 
+            var collections = new List<string>();
+            foreach (var context in report.ContextInfo)
+            {
+                var data = EntitySerializer.Serialize(context);
+                if (data.Length > MaxCollectionSize)
+                {
+                    var tooLargeCtx = new ErrorReportContext(context.Name,
+                        new Dictionary<string, string>()
+                        {
+                            {
+                                "Error",
+                                $"This collection was larger ({data.Length}bytes) than the threshold of {MaxCollectionSize}bytes"
+                            }
+                        });
+
+                    data = EntitySerializer.Serialize(tooLargeCtx);
+                }
+                collections.Add(data);
+            }
+
+            var cols = string.Join(", ", collections);
+            var inboound = new InboundCollection
+            {
+                JsonData = $"[{cols}]",
+                ReportId = report.Id
+            };
 
             _unitOfWork.Insert(report);
+            _unitOfWork.Insert(inboound);
         }
 
         public string GetAppName(int applicationId)

src/Server/Coderr.Server.SqlServer/Analysis/ErrorReportEntityMapper.cs

@@ -16,8 +16,7 @@ public ErrorReportEntityMapper() : base("ErrorReports")
                 .ToColumnValue(EntitySerializer.Serialize);
 
             Property(x => x.ContextInfo)
-                .ToPropertyValue(EntitySerializer.Deserialize<ErrorReportContext[]>)
-                .ToColumnValue(EntitySerializer.Serialize);
+                .Ignore();
 
             Property(x => x.ClientReportId)
                 .ColumnName("ErrorId");