Updated to version 3.10.0.

Author: sdietz888

MyGeotabAPIAdapter.Configuration/AdapterConfiguration.cs

@@ -128,6 +128,10 @@ public class AdapterConfiguration : IAdapterConfiguration
         // > AppSettings:Feeds:FaultData
         const string ArgNameEnableFaultDataFeed = "AppSettings:Feeds:FaultData:EnableFaultDataFeed";
         const string ArgNameFaultDataFeedIntervalSeconds = "AppSettings:Feeds:FaultData:FaultDataFeedIntervalSeconds";
+        const string ArgNamePopulateEffectOnComponentAndRecommendation = "AppSettings:Feeds:FaultData:PopulateEffectOnComponentAndRecommendation";
+        // > AppSettings:Feeds:FuelAndEnergyUsed
+        const string ArgNameEnableFuelAndEnergyUsedFeed = "AppSettings:Feeds:FuelAndEnergyUsed:EnableFuelAndEnergyUsedFeed";
+        const string ArgNameFuelAndEnergyUsedFeedIntervalSeconds = "AppSettings:Feeds:FuelAndEnergyUsed:FuelAndEnergyUsedFeedIntervalSeconds";
         // > AppSettings:Feeds:LogRecord
         const string ArgNameEnableLogRecordFeed = "AppSettings:Feeds:LogRecord:EnableLogRecordFeed";
         const string ArgNameLogRecordFeedIntervalSeconds = "AppSettings:Feeds:LogRecord:LogRecordFeedIntervalSeconds";
@@ -356,6 +360,9 @@ public class AdapterConfiguration : IAdapterConfiguration
         /// <inheritdoc/>
         public bool EnableFaultDataLocationService { get; private set; }
 
+        /// <inheritdoc/>
+        public bool EnableFuelAndEnergyUsedFeed { get; private set; }
+
         /// <inheritdoc/>
         public bool EnableGroupCache { get; private set; }
 
@@ -458,6 +465,9 @@ public class AdapterConfiguration : IAdapterConfiguration
         /// <inheritdoc/>
         public DateTime FeedStartSpecificTimeUTC { get; private set; }
 
+        /// <inheritdoc/>
+        public int FuelAndEnergyUsedFeedIntervalSeconds { get; private set; }
+
         /// <inheritdoc/>
         public DateTime GroupCacheIntervalDailyReferenceStartTimeUTC { get; private set; }
 
@@ -503,6 +513,9 @@ public class AdapterConfiguration : IAdapterConfiguration
         /// <inheritdoc/>
         public string MyGeotabUser { get; private set; }
 
+        /// <inheritdoc/>
+        public bool PopulateEffectOnComponentAndRecommendation { get; private set; }
+
         /// <inheritdoc/>
         public DateTime RuleCacheIntervalDailyReferenceStartTimeUTC { get; private set; }
 
@@ -792,6 +805,11 @@ public void ProcessConfigItems()
             // AppSettings:Feeds:FaultData:
             EnableFaultDataFeed = configurationHelper.GetConfigKeyValueBoolean(ArgNameEnableFaultDataFeed);
             FaultDataFeedIntervalSeconds = configurationHelper.GetConfigKeyValueInt(ArgNameFaultDataFeedIntervalSeconds, null, false, MinFeedIntervalSeconds, MaxFeedIntervalSeconds, DefaultFeedIntervalSeconds);
+            PopulateEffectOnComponentAndRecommendation = configurationHelper.GetConfigKeyValueBoolean(ArgNamePopulateEffectOnComponentAndRecommendation);
+
+            // AppSettings:Feeds:FuelAndEnergyUsed:
+            EnableFuelAndEnergyUsedFeed = configurationHelper.GetConfigKeyValueBoolean(ArgNameEnableFuelAndEnergyUsedFeed);
+            FuelAndEnergyUsedFeedIntervalSeconds = configurationHelper.GetConfigKeyValueInt(ArgNameFuelAndEnergyUsedFeedIntervalSeconds, null, false, MinFeedIntervalSeconds, MaxFeedIntervalSeconds, DefaultFeedIntervalSeconds);
 
             // AppSettings:Feeds:LogRecord:
             EnableLogRecordFeed = configurationHelper.GetConfigKeyValueBoolean(ArgNameEnableLogRecordFeed);

MyGeotabAPIAdapter.Configuration/IAdapterConfiguration.cs

@@ -222,6 +222,11 @@ public interface IAdapterConfiguration
         /// </summary>
         bool EnableFaultDataLocationService { get; }
 
+        /// <summary>
+        /// Indicates whether a <see cref="FuelAndEnergyUsed"/> data feed should be enabled. 
+        /// </summary>
+        bool EnableFuelAndEnergyUsedFeed { get; }
+
         /// <summary>
         /// Indicates whether a <see cref="Group"/> cache should be enabled. 
         /// </summary>
@@ -392,6 +397,11 @@ public interface IAdapterConfiguration
         /// </summary>
         DateTime FeedStartSpecificTimeUTC { get; }
 
+        /// <summary>
+        /// The minimum number of seconds to wait between GetFeed() calls for <see cref="FuelAndEnergyUsed"/> objects.
+        /// </summary>
+        int FuelAndEnergyUsedFeedIntervalSeconds { get; }
+
         /// <summary>
         /// The <see cref="DateTime"/> of which the time of day portion will be used as the basis for calculation of cache update and refresh intervals for the <see cref="Group"/> cache.
         /// </summary>
@@ -467,6 +477,11 @@ public interface IAdapterConfiguration
         /// </summary>
         string MyGeotabUser { get; }
 
+        /// <summary>
+        /// If <see cref="EnableFaultDataFeed"/> is <c>true</c>, indicates whether the EffectOnComponent and Recommendation columns in the associated adapter database table will be populated. Setting this property to <c>false</c> will result in the EffectOnComponent and Recommendation columns being set to <c>null</c> for all records in the associated adapter database table, thereby potentially saving on disk space if these property values are not of interest. WARNING: There is no way to update these columns for records that have already been downloaded.
+        /// </summary>
+        bool PopulateEffectOnComponentAndRecommendation { get; }
+
         /// <summary>
         /// The <see cref="DateTime"/> of which the time of day portion will be used as the basis for calculation of cache update and refresh intervals for the <see cref="Rule"/> cache.
         /// </summary>

MyGeotabAPIAdapter.Configuration/MyGeotabAPIAdapter.Configuration.csproj

@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

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.9.0.0</AssemblyVersion>
-    <FileVersion>3.9.0.0</FileVersion>
+    <AssemblyVersion>3.10.0.0</AssemblyVersion>
+    <FileVersion>3.10.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>
@@ -17,10 +17,10 @@
   </ItemGroup> 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" 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.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

MyGeotabAPIAdapter.Database.EntityPersisters/MyGeotabAPIAdapter.Database.EntityPersisters.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

MyGeotabAPIAdapter.Database/AdapterDatabaseObjectNames.cs

@@ -110,6 +110,9 @@ public class AdapterDatabaseObjectNames : IAdapterDatabaseObjectNames
         /// <inheritdoc/>
         public string DbFaultDataLocation2TrackingTableName => "FaultDataLocations2Tracking";
 
+        /// <inheritdoc/>
+        public string DbFuelAndEnergyUsed2TableName => "FuelAndEnergyUsed2";
+
         /// <inheritdoc/>
         public string DbGroupTableName => "Groups";
 
@@ -178,6 +181,9 @@ public class AdapterDatabaseObjectNames : IAdapterDatabaseObjectNames
         /// <inheritdoc/>
         public string DbStgExceptionEvent2TableName => "stg_ExceptionEvents2";
 
+        /// <inheritdoc/>
+        public string DbStgFuelAndEnergyUsed2TableName => "stg_FuelAndEnergyUsed2";
+
         /// <inheritdoc/>
         public string DbStgGroup2TableName => "stg_Groups2";
 
@@ -253,6 +259,9 @@ public class AdapterDatabaseObjectNames : IAdapterDatabaseObjectNames
         /// <inheritdoc/>
         public string MergeStagingExceptionEventsProcedureName => "spMerge_stg_ExceptionEvents2";
 
+        /// <inheritdoc/>
+        public string MergeStagingFuelAndEnergyUsedProcedureName => "spMerge_stg_FuelAndEnergyUsed2";
+
         /// <inheritdoc/>
         public string MergeStagingGroupsProcedureName => "spMerge_stg_Groups2";
 

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.9.0.0";
+        const string RequiredDatabaseVersion = "3.10.0.0";
 
         readonly IExceptionHelper exceptionHelper;
         readonly Logger logger = LogManager.GetCurrentClassLogger();

MyGeotabAPIAdapter.Database/IAdapterDatabaseObjectNames.cs

@@ -183,6 +183,11 @@ public interface IAdapterDatabaseObjectNames
         /// </summary>
         string DbFaultDataLocation2TrackingTableName { get; }
 
+        /// <summary>
+        /// The name of the database table associated with <see cref="DbFuelAndEnergyUsed"/> entities.
+        /// </summary>
+        string DbFuelAndEnergyUsed2TableName { get; }
+
         /// <summary>
         /// The name of the database table associated with <see cref="DbGroup"/> entities.
         /// </summary>
@@ -298,6 +303,11 @@ public interface IAdapterDatabaseObjectNames
         /// </summary>
         string DbStgExceptionEvent2TableName { get; }
 
+        /// <summary>
+        /// The name of the database table associated with <see cref="DbStgFuelAndEnergyUsed2"/> entities.
+        /// </summary>
+        string DbStgFuelAndEnergyUsed2TableName { get; }
+
         /// <summary>
         /// The name of the database table associated with <see cref="DbStgGroup2"/> entities.
         /// </summary>
@@ -423,6 +433,11 @@ public interface IAdapterDatabaseObjectNames
         /// </summary>
         string MergeStagingExceptionEventsProcedureName { get; }
 
+        /// <summary>
+        /// The name of the stored procedure or function responsible for merging staging FuelAndEnergyUsed records into the main FuelAndEnergyUsed2 table.
+        /// </summary>
+        string MergeStagingFuelAndEnergyUsedProcedureName { get; }
+
         /// <summary>
         /// The name of the stored procedure or function responsible for merging staging Groups into the main Groups2 table.
         /// </summary>

MyGeotabAPIAdapter.Database/Models/DbFaultData2.cs

@@ -27,14 +27,20 @@ public class DbFaultData2 : IDbEntity
         public long DiagnosticId { get; set; }
         public DateTime? DismissDateTime { get; set; }
         public long? DismissUserId { get; set; }
+        public string EffectOnComponent { get; set; }
         public int? FailureModeCode { get; set; }
         public string FailureModeId { get; set; }
         public string FailureModeName { get; set; }
+        public string FaultDescription { get; set; }
         public string FaultLampState { get; set; }
         public string FaultState { get; set; }
+        public string FlashCodeId { get; set; }
+        public string FlashCodeName { get; set; }
         public bool? MalfunctionLamp { get; set; }
         public bool? ProtectWarningLamp { get; set; }
+        public string Recommendation { get; set; }
         public bool? RedStopLamp { get; set; }
+        public double? RiskOfBreakdown { get; set; }
         public string Severity { get; set; }
         public int? SourceAddress { get; set; }
         [ChangeTracker]

MyGeotabAPIAdapter.Database/Models/DbFuelAndEnergyUsed2.cs

@@ -0,0 +1,30 @@
+using Dapper.Contrib.Extensions;
+using System;
+
+namespace MyGeotabAPIAdapter.Database.Models
+{
+    [Table("FuelAndEnergyUsed2")]
+    public class DbFuelAndEnergyUsed2 : IDbEntity
+    {
+        /// <inheritdoc/>
+        [Write(false)]
+        public string DatabaseTableName => "FuelAndEnergyUsed2";
+
+        /// <inheritdoc/>
+        [Write(false)]
+        public Common.DatabaseWriteOperationType DatabaseWriteOperationType { get; set; }
+
+        [ExplicitKey]
+        public Guid id { get; set; }
+        public string GeotabId { get; set; }
+        public DateTime? DateTime { get; set; }
+        public long DeviceId { get; set; }
+        public double? TotalEnergyUsedKwh { get; set; }
+        public double? TotalFuelUsed { get; set; }
+        public double? TotalIdlingEnergyUsedKwh { get; set; }
+        public double? TotalIdlingFuelUsedL { get; set; }
+        public long Version { get; set; }
+        [ChangeTracker]
+        public DateTime RecordLastChangedUtc { get; set; }
+    }
+}