More docker adjustments

Author: jgauffin

src/DockerCompose/Windows/docker-compose.yml

@@ -9,12 +9,17 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://+:5000
+      
+      # To enable https, use these lines and configure a certificate
       #- ASPNETCORE_URLS=https://+:5001;http://+:5000
       #- ASPNETCORE_HTTPS_PORT=5001
 
-      #Change these
+      # Adjust the connection string
       - CODERR_CONNECTIONSTRING=Data Source=host.docker.internal,1433;Initial Catalog=Coderr;Integrated Security=false;Connect Timeout=15;user=coderr;password=c0d3rr
-      - CODERR_CONFIG_PASSWORD=changeThis2
+      
+      # Comment out this line once Coderr have been configured (run through the install wizard)
+      # and then restart the container.
+      # - CODERR_CONFIG_PASSWORD=changeThis2
     ports:
       - "60473:5000/tcp"
       - "60474:5001"

…e/Incidents/Jobs/DeleteEmptyIncidents.cs …ore/Incidents/Jobs/DeleteOldIncidents.cssrc/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteEmptyIncidents.cs renamed to src/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteOldIncidents.cs src/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteEmptyIncidents.cs renamed to src/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteOldIncidents.cs

@@ -23,17 +23,17 @@ namespace Coderr.Server.App.Core.Incidents.Jobs
     ///     </para>
     /// </remarks>
     [ContainerService(RegisterAsSelf = true)]
-    internal class DeleteEmptyIncidents : IBackgroundJobAsync
+    internal class DeleteOldIncidents : IBackgroundJobAsync
     {
-        private readonly ILog _logger = LogManager.GetLogger(typeof(DeleteEmptyIncidents));
+        private readonly ILog _logger = LogManager.GetLogger(typeof(DeleteOldIncidents));
         private readonly IDbConnection _connection;
         private readonly IConfiguration<ReportConfig> _reportConfiguration;
 
         /// <summary>
-        ///     Creates a new instance of <see cref="DeleteEmptyIncidents" />.
+        ///     Creates a new instance of <see cref="DeleteOldIncidents" />.
         /// </summary>
         /// <param name="connection">Used for SQL queries</param>
-        public DeleteEmptyIncidents(IDbConnection connection, IConfiguration<ReportConfig> reportConfiguration)
+        public DeleteOldIncidents(IDbConnection connection, IConfiguration<ReportConfig> reportConfiguration)
         {
             _connection = connection;
             _reportConfiguration = reportConfiguration;

src/Server/Coderr.Server.SqlServer/Core/Applications/ApplicationRepository.cs

@@ -17,8 +17,7 @@ public class ApplicationRepository : IApplicationRepository
 
         public ApplicationRepository(IAdoNetUnitOfWork uow)
         {
-            if (uow == null) throw new ArgumentNullException("uow");
-            _uow = uow;
+            _uow = uow ?? throw new ArgumentNullException(nameof(uow));
         }
 
         public async Task CreateAsync(ApplicationTeamMember member)
@@ -29,9 +28,10 @@ public async Task CreateAsync(ApplicationTeamMember member)
         public async Task<UserApplication[]> GetForUserAsync(int accountId)
         {
             if (accountId <= 0) throw new ArgumentOutOfRangeException(nameof(accountId));
-            using (var cmd = (DbCommand) _uow.CreateCommand())
+            using (var cmd = (DbCommand)_uow.CreateCommand())
             {
-                cmd.CommandText = @"SELECT a.Id ApplicationId, a.Name ApplicationName, ApplicationMembers.Roles, a.NumberOfFtes NumberOfDevelopers
+                cmd.CommandText =
+                    @"SELECT a.Id ApplicationId, a.Name ApplicationName, ApplicationMembers.Roles, a.NumberOfFtes NumberOfDevelopers
                                         FROM Applications a
                                         JOIN ApplicationMembers ON (ApplicationMembers.ApplicationId = a.Id) 
                                         WHERE ApplicationMembers.AccountId = @userId
@@ -60,7 +60,7 @@ JOIN ApplicationMembers ON (ApplicationMembers.ApplicationId = a.Id)
 
         public async Task RemoveTeamMemberAsync(int applicationId, string invitedEmailAddress)
         {
-            using (var cmd = (DbCommand) _uow.CreateCommand())
+            using (var cmd = (DbCommand)_uow.CreateCommand())
             {
                 cmd.CommandText = "DELETE FROM ApplicationMembers WHERE ApplicationId=@appId AND EmailAddress = @email";
                 cmd.AddParameter("appId", applicationId);
@@ -132,7 +132,7 @@ public async Task CreateAsync(Application application)
         {
             if (application == null) throw new ArgumentNullException("application");
 
-            using (var cmd = (DbCommand) _uow.CreateCommand())
+            using (var cmd = (DbCommand)_uow.CreateCommand())
             {
                 cmd.CommandText =
                     @"INSERT INTO Applications (Name, AppKey, CreatedById, CreatedAtUtc, ApplicationType, SharedSecret, EstimatedNumberOfErrors, NumberOfFtes) 
@@ -145,8 +145,8 @@ public async Task CreateAsync(Application application)
                 cmd.AddParameter("SharedSecret", application.SharedSecret);
                 cmd.AddParameter("EstimatedNumberOfErrors", application.EstimatedNumberOfErrors);
                 cmd.AddParameter("NumberOfFtes", application.NumberOfFtes);
-                var item = (decimal) await cmd.ExecuteScalarAsync();
-                application.GetType().GetProperty("Id").SetValue(application, (int) item);
+                var item = (decimal)await cmd.ExecuteScalarAsync();
+                application.GetType().GetProperty("Id").SetValue(application, (int)item);
             }
         }
 
@@ -170,7 +170,7 @@ public async Task DeleteAsync(int applicationId)
 
         public async Task<Application[]> GetAllAsync()
         {
-            using (var cmd = (DbCommand) _uow.CreateCommand())
+            using (var cmd = (DbCommand)_uow.CreateCommand())
             {
                 cmd.CommandText = "SELECT * FROM Applications ORDER BY Name";
 
@@ -187,7 +187,7 @@ public async Task UpdateAsync(Application entity)
 
         public async Task RemoveTeamMemberAsync(int applicationId, int userId)
         {
-            using (var cmd = (DbCommand) _uow.CreateCommand())
+            using (var cmd = (DbCommand)_uow.CreateCommand())
             {
                 cmd.CommandText = "DELETE FROM ApplicationMembers WHERE ApplicationId=@appId AND AccountId = @userId";
                 cmd.AddParameter("appId", applicationId);

src/Server/Coderr.Server.Web/ClientApp/boot.ts

@@ -5,7 +5,7 @@ import { AppRoot } from "./services/AppRoot"
 import { IUser } from "./vue-shim";
 import { DateTime } from 'luxon';
 import * as helpers from "./helpers";
-
+export { default as $ } from 'jquery';
 //Vue.use(VeeValidate);
 Vue.use(VueRouter);
 Vue.config.devtools = true;
@@ -30,7 +30,7 @@ Vue.filter("monthDay",
 Vue.filter("isoDate",
     (value: string) => {
         if (!value) return "n/a";
-        return moment.utc(value).local().format("YYYY-MM-DD HH:MM:SS");
+        return helpers.isoDate(value);
     });
 
 Vue.filter("niceTime",

src/Server/Coderr.Server.Web/ClientApp/helpers.ts

@@ -9,6 +9,10 @@ export function getLuxonDate(valueUtc: string | Date): DateTime {
     }
 }
 
+export function isoDate(valueUtc: string | Date): string {
+    return getLuxonDate(valueUtc).toISO({ suppressMilliseconds: true, includeOffset: false });
+}
+
 export function ago(valueUtc: string | Date): string {
     if (!valueUtc) return "n/a";
 

src/Server/Coderr.Server.Web/appsettings.json

@@ -1,7 +1,7 @@
 {
   "Installation": {
-    "IsConfigured": false,
-    "Password": "changeThis2"
+    "IsConfigured": true,
+    "Password": "changeThis"
   },
   "EnableCors": true,
   "ConnectionStrings": {

src/Server/Coderr.Server.Web/package-lock.json

@@ -11,7 +11,7 @@ var bundleOutputDir = "./wwwroot/dist";
 function resolve(dir) {
     return path.join(__dirname, dir);
 }
-
+//TODO: include jquery
 const baseConfig = {
     entry: {
         'main': "./ClientApp/boot.ts",