Merge pull request #624 from bcgov/2.0.6

2.0.6

.pipeline/lib/config.js

@@ -2,7 +2,7 @@
 const options = require("@bcgov/pipeline-cli").Util.parseArguments();
 
 const changeId = options.pr; //aka pull-request
-const version = "2.0.0";
+const version = "2.0.6";
 const name = "sbi"; //project name prefix
 
 Object.assign(options.git, { owner: "ychung-mot", repository: "schoolbus" });
@@ -30,11 +30,11 @@ const phases = {
     host: `sbi-e82e9a-dev.apps.silver.devops.gov.bc.ca`,
     dotnet_env: "Development",
     dbUser: "userUXN",
-    dbSize: "5Gi",
+    dbSize: "10Gi",
     transient: true,
     backupVolume: "schoolbus",
-    backupVolumeSize: "5Gi",
-    verificationVolumeSize: "5Gi",
+    backupVolumeSize: "10Gi",
+    verificationVolumeSize: "10Gi",
   },
   test: {
     namespace: "e82e9a-test",
@@ -47,7 +47,7 @@ const phases = {
     tag: `test-${version}`,
     host: `sbi-e82e9a-test.apps.silver.devops.gov.bc.ca`,
     dbUser: "user7KU",
-    dbSize: "5Gi",
+    dbSize: "6Gi",
     dotnet_env: "Staging",
     backupVolume: "schoolbus",
     backupVolumeSize: "5Gi",

README.md

@@ -20,7 +20,7 @@ The application is being developed as an open source solution.
 
 ## Prerequisites
 
-- .Net Core 3.1 SDK
+- .Net 7
 - Node.JS v13.7.0 or newer
 - PostgreSQL 10
 
@@ -130,5 +130,4 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 ## Maintenance
 
 This repository is maintained by [BC Ministry of Transportation](http://www.th.gov.bc.ca/).
-Click [here](https://github.com/orgs/bcgov/teams/tran/repositories) for a complete list of our repositories on GitHub.
-
+Click [here](https://github.com/orgs/bcgov/teams/tran/repositories) for a complete list of our repositories on GitHub.

Server/SchoolBusAPI/Authentication/SbJwtBearerEvents.cs

@@ -13,12 +13,10 @@ namespace SchoolBusAPI.Authentication
     public class SbJwtBearerEvents : JwtBearerEvents
     {
         private DbAppContext _dbContext;
-        private ILogger<SbJwtBearerEvents> _logger;
 
-        public SbJwtBearerEvents(DbAppContext dbContext, ILogger<SbJwtBearerEvents> logger) : base()
+        public SbJwtBearerEvents(DbAppContext dbContext) : base()
         {
             _dbContext = dbContext;
-            _logger = logger;
         }
 
         public override async Task AuthenticationFailed(AuthenticationFailedContext context)

Server/SchoolBusAPI/Authorization/PermissionHandler.cs

@@ -28,12 +28,10 @@ public static IServiceCollection RegisterPermissionHandler(this IServiceCollecti
     /// </remarks>
     public class PermissionHandler : AuthorizationHandler<PermissionRequirement>
     {
-        private ILogger _logger;
         private IHttpContextAccessor _httpContextAccessor;
 
-        public PermissionHandler(ILogger logger, IHttpContextAccessor httpContextAccessor)
+        public PermissionHandler(IHttpContextAccessor httpContextAccessor)
         {
-            _logger = logger;
             _httpContextAccessor = httpContextAccessor;
         }
 
@@ -53,7 +51,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
             }
             else
             {
-                _logger.Information("RequiresPermission - {user} - {url}", user.Identity.Name, _httpContextAccessor.HttpContext.Request.Path);
+                Log.Information("RequiresPermission - {user} - {url}", user.Identity.Name, _httpContextAccessor.HttpContext.Request.Path);
             }
 
             return Task.CompletedTask;

Server/SchoolBusAPI/DbAppContext.cs

@@ -12,15 +12,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Logging;
+using Serilog;
 using SchoolBusAPI.Extensions;
 using SchoolBusAPI.ViewModels;
 using SchoolBusCommon;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Text;
 
 namespace SchoolBusAPI.Models
 {    
@@ -33,18 +32,16 @@ public class DbAppContextFactory : IDbAppContextFactory
     {
         DbContextOptions<DbAppContext> _options;
         IHttpContextAccessor _httpContextAccessor;
-        ILogger<DbAppContext> _logger;
 
-        public DbAppContextFactory(IHttpContextAccessor httpContextAccessor, DbContextOptions<DbAppContext> options, ILogger<DbAppContext> logger)
+        public DbAppContextFactory(IHttpContextAccessor httpContextAccessor, DbContextOptions<DbAppContext> options)
         {
             _options = options;
             _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
         }
 
         public IDbAppContext Create()
         {
-            return new DbAppContext(_httpContextAccessor, _options, _logger);
+            return new DbAppContext(_httpContextAccessor, _options);
         }
     }
 
@@ -91,16 +88,16 @@ public interface IDbAppContext
     public class DbAppContext : DbContext, IDbAppContext
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger<DbAppContext> _logger;
 
         /// <summary>
         /// Constructor for Class used for Entity Framework access.
         /// </summary>
-        public DbAppContext(IHttpContextAccessor httpContextAccessor, DbContextOptions<DbAppContext> options, ILogger<DbAppContext> logger)
+        public DbAppContext(IHttpContextAccessor httpContextAccessor, DbContextOptions<DbAppContext> options)
                                 : base(options)
         {
             _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            // To fix datetime utc issue after upgraded to .net 7.0
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
         }
 
         /// <summary>
@@ -114,6 +111,37 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<Contact>()
                 .HasOne(s => s.SchoolBusOwner)
                 .WithMany(g => g.Contacts);
+
+            /*
+            // Npgsql 6+ datetime type issue
+            var dateTimeConverter = new ValueConverter<DateTime, DateTime>(
+                v => v.ToUniversalTime(),
+                v => DateTime.SpecifyKind(v, DateTimeKind.Utc));
+
+            var nullableDateTimeConverter = new ValueConverter<DateTime?, DateTime?>(
+                v => v.HasValue ? v.Value.ToUniversalTime() : v,
+                v => v.HasValue ? DateTime.SpecifyKind(v.Value, DateTimeKind.Utc) : v);
+
+            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+            {
+                if (entityType.IsKeyless)
+                {
+                    continue;
+                }
+
+                foreach (var property in entityType.GetProperties())
+                {
+                    if (property.ClrType == typeof(DateTime))
+                    {
+                        property.SetValueConverter(dateTimeConverter);
+                    }
+                    else if (property.ClrType == typeof(DateTime?))
+                    {
+                        property.SetValueConverter(nullableDateTimeConverter);
+                    }
+                }
+            }
+            */
         }
 
         public virtual DbSet<Audit> Audits { get; set; }
@@ -252,7 +280,8 @@ public override int SaveChanges()
             var modifiedEntries = ChangeTracker.Entries()
                     .Where(e => e.State == EntityState.Added || e.State == EntityState.Modified || e.State == EntityState.Deleted).ToList();
 
-            DateTime currentTime = DateTime.UtcNow;
+            DateTime utcCurrentTime = DateTime.UtcNow;
+            DateTime currentTime = DateTime.SpecifyKind(utcCurrentTime, DateTimeKind.Unspecified);
 
             foreach (var entry in modifiedEntries)
             {
@@ -341,7 +370,7 @@ public override int SaveChanges()
                     catch (Exception e)
                     {
                         string exceptionMessage = e.ToString();
-                        _logger.LogError($"DbAppContext exception: {exceptionMessage}");
+                        Log.Error($"DbAppContext exception: {exceptionMessage}");
                     }
                 }
             }

Server/SchoolBusAPI/Extensions/IDbAppContextExtensions.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using SchoolBusAPI.Models;
+using SchoolBusCommon.Helpers;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -251,7 +252,8 @@ private static void AddInitialUser(this IDbAppContext context, User initialUser)
                     user.UserRoles.Add(
                         new UserRole
                         {
-                            EffectiveDate = DateTime.UtcNow.Date,
+                            EffectiveDate = DateUtils.ConvertPacificToUtcTime(
+                                new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0)),
                             Role = role
                         });
                 }

Server/SchoolBusAPI/Hangfire/CcwJobService.cs

@@ -1,6 +1,6 @@
 using Hangfire;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+using Serilog;
 using SchoolBusAPI.Models;
 using SchoolBusAPI.Services;
 using SchoolBusCcw;
@@ -21,19 +21,15 @@ public class CcwJobService : ICcwJobService
         private readonly DbAppContext _context;
         private readonly IConfiguration _configuration;
         private readonly ICCWDataService _ccwDataService;
-        private readonly ILogger _logger;
-
         private readonly string _userId;
         private readonly string _userGuid;
         private readonly string _userDir;
 
-        public CcwJobService(DbAppContext context, IConfiguration configuration, ICCWDataService ccwDataService, ILogger<CcwJobService> logger)
+        public CcwJobService(DbAppContext context, IConfiguration configuration, ICCWDataService ccwDataService)
         {
             _context = context;
             _configuration = configuration;
             _ccwDataService = ccwDataService;
-            _logger = logger;
-
             _userId = _configuration["CCW_USER_ID"];
             _userGuid = _configuration["CCW_USER_GUID"];
             _userDir = _configuration["CCW_USER_DIR"];
@@ -76,17 +72,17 @@ public async Task PopulateCCWJob()
 
                 if (cCWData == null)
                 {
-                    _logger.LogInformation($"[Hangfire] PopulateCCWJob - No data from CCW for regi: {regi} vin: {vin}, plate: {plate}.");
+                    Log.Information($"[Hangfire] PopulateCCWJob - No data from CCW for regi: {regi} vin: {vin}, plate: {plate}.");
                     _context.SaveChanges();
-                    _logger.LogInformation($"[Hangfire] PopulateCCWJob - Updated bus record timestamp with the ID {data.Id}.");
+                    Log.Information($"[Hangfire] PopulateCCWJob - Updated bus record timestamp with the ID {data.Id}.");
                     return;
                 }
 
                 data.CCWData = cCWData;
 
                 // ensure that the record is touched in the database
                 _context.SaveChanges();
-                _logger.LogInformation($"[Hangfire] PopulateCCWJob - Saved bus record with the ID {data.Id}.");
+                Log.Information($"[Hangfire] PopulateCCWJob - Saved bus record with the ID {data.Id}.");
             }
         }
 
@@ -110,7 +106,7 @@ public async Task UpdateCCWJob()
 
                 if (maxUpdateCount > 500)
                 {
-                    _logger.LogInformation($"[Hangfire] UpdateCCWJob - Today's max update count({maxUpdateCount}) reached.");
+                    Log.Information($"[Hangfire] UpdateCCWJob - Today's max update count({maxUpdateCount}) reached.");
                     return;
                 }
 
@@ -138,9 +134,9 @@ public async Task UpdateCCWJob()
                 // fetch did not work, but we don't want it to fire again, so update the timestamp.
                 if (cCWData == null)
                 {
-                    _logger.LogInformation($"[Hangfire] UpdateCCWJob - No data from CCW for regi: {regi} vin: {vin}, plate: {plate}.");
+                    Log.Information($"[Hangfire] UpdateCCWJob - No data from CCW for regi: {regi} vin: {vin}, plate: {plate}.");
                     _context.SaveChanges();
-                    _logger.LogInformation($"[Hangfire] UpdateCCWJob - Updated bus record timestamp with the ID {data.Id}.");
+                    Log.Information($"[Hangfire] UpdateCCWJob - Updated bus record timestamp with the ID {data.Id}.");
                     return;
                 }
 
@@ -165,7 +161,7 @@ public async Task UpdateCCWJob()
                     }
 
                     _context.SaveChanges();
-                    _logger.LogInformation($"[Hangfire] UpdateCCWJob - Saved bus record with the ID {data.Id}.");
+                    Log.Information($"[Hangfire] UpdateCCWJob - Saved bus record with the ID {data.Id}.");
                 }
             }
 

Server/SchoolBusAPI/Middlewares/ExceptionMiddleware.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
+using Serilog;
 using SchoolBusAPI.Extensions;
 using System;
 using System.Net;
@@ -11,11 +11,9 @@ namespace SchoolBusAPI.Middlewares
     public class ExceptionMiddleware
     {
         private readonly RequestDelegate _next;
-        private readonly ILogger _logger;
 
-        public ExceptionMiddleware(RequestDelegate next, ILogger<ExceptionMiddleware> logger)
+        public ExceptionMiddleware(RequestDelegate next)
         {
-            _logger = logger;
             _next = next;
         }
 
@@ -31,7 +29,7 @@ public async Task InvokeAsync(HttpContext httpContext)
                     return;
 
                 var guid = Guid.NewGuid();
-                _logger.LogError($"HMCR Exception{guid}: {ex}");
+                Log.Error($"HMCR Exception{guid}: {ex}");
                 await HandleExceptionAsync(httpContext, guid);
             }
         }