Updated to version 3.11.0.

Author: sdietz888

MyGeotabAPIAdapter.DataOptimizer/MyGeotabAPIAdapter.DataOptimizer.csproj

@@ -6,8 +6,8 @@
     <Authors>Geotab Inc.</Authors>
     <Company>Geotab Inc.</Company>
     <Product>MyGeotab API Adapter - DataOptimizer</Product>
-    <AssemblyVersion>3.10.0.0</AssemblyVersion>
-    <FileVersion>3.10.0.0</FileVersion>
+    <AssemblyVersion>3.11.0.0</AssemblyVersion>
+    <FileVersion>3.11.0.0</FileVersion>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <Description>A worker service designed to migrate data from the MyGeotab API Adapter database into another set of tables that are optimized for use by applications and data analysis tools. Additional columns are added to some of the tables and these are populated via interpolation or other query-based procedues.</Description>
   </PropertyGroup>

MyGeotabAPIAdapter.Database/DatabaseValidator.cs

@@ -17,7 +17,7 @@ public class DatabaseValidator : IDatabaseValidator
         // The required version of the middleware database for the current version of the middleware application. Any time the middleware database is updated as part of an application update:
         // 1. This value should be updated to reflect the application version at the time.
         // 2. Database changes should be included in a single script file and the filename should be formatted as "prefix_version_suffix.sql" (e.g. "MSSQL_3.0.0.0_InitialSchemaCreation.sql") where the version portion of the filename is equal to the value of this constant.
-        const string RequiredDatabaseVersion = "3.10.0.0";
+        const string RequiredDatabaseVersion = "3.11.0.0";
 
         readonly IExceptionHelper exceptionHelper;
         readonly Logger logger = LogManager.GetCurrentClassLogger();

MyGeotabAPIAdapter.Database/MyGeotabAPIAdapter.Database.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
     <PackageReference Include="FastMember" Version="1.5.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
     <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />
     <PackageReference Include="Npgsql" Version="9.0.3" />

MyGeotabAPIAdapter.GeotabObjectMappers/GeotabTripDbTripObjectMapper.cs

@@ -16,9 +16,12 @@ public List<DbTrip> CreateEntities(List<Trip> entitiesToMapTo)
             var dbTrips = new List<DbTrip>();
             foreach (var entity in entitiesToMapTo)
             {
-                var dbTrip = CreateEntity(entity);
-                dbTrip.RecordCreationTimeUtc = recordCreationTimeUtc;
-                dbTrips.Add(dbTrip);
+                if (entity.Device != null)
+                {
+                    var dbTrip = CreateEntity(entity);
+                    dbTrip.RecordCreationTimeUtc = recordCreationTimeUtc;
+                    dbTrips.Add(dbTrip);
+                }
             }
             return dbTrips;
         }

MyGeotabAPIAdapter/MyGeotabAPIAdapter.csproj

@@ -9,8 +9,8 @@
     <Product>MyGeotab API Adapter</Product>
     <Description>A .NET Core (C#) Worker Service designed to use the MyGeotab .NET API and serve as a broker between a MyGeotab database and an associated "Virtual Geotab Database". Intended for use when direct utilization of the MyGeotab SDK is not an option. Modify as required to meet individual solution objectives.</Description>
     <Copyright></Copyright>
-    <Version>3.10.0.0</Version>
-    <InformationalVersion>3.10.0.0</InformationalVersion>
+    <Version>3.11.0.0</Version>
+    <InformationalVersion>3.11.0.0</InformationalVersion>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
@@ -26,6 +26,8 @@
   <ItemGroup>
     <PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.83.265" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.7" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />

MyGeotabAPIAdapter/Program.cs

@@ -29,52 +29,50 @@
 using NLog;
 using NLog.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using System.Threading.Tasks;
 
 namespace MyGeotabAPIAdapter
 {
     /// <summary>
-    /// The main program.  Handles initialization of logging and configuration settings and instantiates the <see cref="Worker"/> class, which is responsible for execution of  application logic. 
+    /// The main program. Handles initialization of logging and configuration settings and instantiates the application's services.
     /// </summary>
     public class Program
     {
-        public static void Main(string[] args)
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        /// <param name="args">Command-line arguments.</param>
+        public static async Task Main(string[] args)
         {
             var logger = LogManager.GetCurrentClassLogger();
             try
             {
-                var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
+                var hostBuilder = Host.CreateDefaultBuilder(args);
 
-                var config = new ConfigurationBuilder()
-                    .SetBasePath(System.IO.Directory.GetCurrentDirectory())
-                    .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                    .AddJsonFile($"appsettings.{environment}.json", optional: true, reloadOnChange: true)
-                    .Build();
-
-                CreateHostBuilder(args, config).Build().Run();
-            }
-            catch (Exception ex)
-            {
-                // NLog: catch any exception and log it.
-                logger.Error(ex, $"Stopped application because of exception: \nMESSAGE [{ex.Message}]; \nSOURCE [{ex.Source}]; \nSTACK TRACE [{ex.StackTrace}]");
-            }
-            finally
-            {
-                // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
-                LogManager.Shutdown();
-            }
-        }
+                // Conditionally configure the host for Windows Service or Linux Systemd.
+                if (OperatingSystem.IsWindows())
+                {
+                    hostBuilder.UseWindowsService(options =>
+                    {
+                        // Set the name for the Windows service.
+                        options.ServiceName = "MyGeotabAPIAdapter";
+                    });
+                }
+                else if (OperatingSystem.IsLinux())
+                {
+                    hostBuilder.UseSystemd();
+                }
 
-        public static IHostBuilder CreateHostBuilder(string[] args, IConfiguration config) =>
-            Host.CreateDefaultBuilder(args)
-                // Configure logging with NLog. 
-                .ConfigureLogging((context, logging) =>
+                hostBuilder.ConfigureLogging((context, logging) =>
                 {
                     logging.ClearProviders();
                     logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
-                    logging.AddNLog(config);
+                    // NLog configuration is loaded from appsettings.json by the default builder.
+                    logging.AddNLog();
                 })
                 .ConfigureServices((hostContext, services) =>
                 {
+                    // Dependency injection registrations:
                     IConfiguration configuration = hostContext.Configuration;
                     HttpClient httpClient = new();
                     services
@@ -526,5 +524,21 @@ public static IHostBuilder CreateHostBuilder(string[] args, IConfiguration confi
                         ;
                     }
                 });
+
+                var host = hostBuilder.Build();
+                await host.RunAsync();
+            }
+            catch (Exception ex)
+            {
+                // NLog: catch any exception and log it.
+                logger.Error(ex, $"Stopped application because of exception: \nMESSAGE [{ex.Message}]; \nSOURCE [{ex.Source}]; \nSTACK TRACE [{ex.StackTrace}]");
+                throw; // Re-throw the exception to ensure the process terminates with an error code.
+            }
+            finally
+            {
+                // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
+                LogManager.Shutdown();
+            }
+        }
     }
 }