Tweaks for stability

Reviewed-on: #1

PartSource.Automation/Jobs/BulkUpdateInventory.cs

@@ -14,18 +14,21 @@ using PartSource.Automation.Models.Ftp;
 using PartSource.Automation.Services;
 using Ratermania.Automation.Interfaces;
 
-namespace PartSource.Automation.Jobs.POC
+namespace PartSource.Automation.Jobs
 {
     public class BulkUpdateInventory : IAutomationJob
     {
         private readonly FtpService _ftpService;
         private readonly ILogger<BulkUpdateInventory> _logger;
+		private readonly string _connectionString;
 
         public BulkUpdateInventory(IConfiguration configuration, ILogger<BulkUpdateInventory> logger)
         {
             FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
             _ftpService = new FtpService(ftpConfiguration);
 
+            _connectionString = configuration.GetConnectionString("PartSourceDatabase");
+
             _logger = logger;
         }
 
@@ -46,7 +49,7 @@ namespace PartSource.Automation.Jobs.POC
 
 			DataTable dataTable = GetDataTable(file);
 
-			using SqlConnection connection = new SqlConnection("Server=tcp:ps-whi.database.windows.net,1433;Initial Catalog=ps-whi-test;Persist Security Info=False;User ID=ps-whi;Password=9-^*N5dw!6:|.5Q;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;");
+			using SqlConnection connection = new SqlConnection(_connectionString);
 			connection.Open();
 
 			using SqlCommand command = new SqlCommand("TRUNCATE TABLE PartAvailability", connection);

PartSource.Automation/Jobs/ExecuteSsisPackages.cs

@@ -1,9 +1,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using PartSource.Automation.Models.Configuration;
+using PartSource.Automation.Models.Ftp;
 using PartSource.Automation.Services;
 using Ratermania.Automation.Interfaces;
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,11 +19,11 @@ namespace PartSource.Automation.Jobs
 		private readonly ILogger<ExecuteSsisPackages> _logger;
 
 		// TODO: set from config
-		private readonly string[] _ssisPackages = {"Parts Availability" };
+		private readonly string[] _ssisPackages = {"Parts Price" };
 
 		public ExecuteSsisPackages(EmailService emailService, IConfiguration configuration, SsisService ssisService, ILogger<ExecuteSsisPackages> logger)
 		{
-			FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AzureConfiguration").Get<FtpConfiguration>();
+			FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
 
 			_emailService = emailService;
 			_ftpService = new FtpService(ftpConfiguration);
@@ -36,7 +38,18 @@ namespace PartSource.Automation.Jobs
 				{
 					try
 					{
-					//	_ftpService.Download($"{package}.txt");
+                        FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended()
+						   .Where(f => f.FileType == FtpFileType.File && f.Filename.IndexOf(package) > -1)
+						   .OrderByDescending(f => f.Modified)
+						   .FirstOrDefault();
+
+                        if (lastUploadedFile == null)
+                        {
+                            _logger.LogInformation($"No {package} file available.");
+                            return;
+                        }
+
+                        _ftpService.Download($"{package}.txt");
 						_ssisService.Execute($"{package}.dtsx");
 
 						_logger.LogInformation($"Execution of SSIS package {package} completed successfully.");
@@ -45,7 +58,6 @@ namespace PartSource.Automation.Jobs
 					catch (Exception ex)
 					{
 						_logger.LogError($"Execution of SSIS package {package} failed.", ex);
-
 						throw;
 					}
 				}

PartSource.Automation/Jobs/POC/ImageList.cs

@@ -18,13 +18,13 @@ using Ratermania.Shopify.Resources;
 
 namespace PartSource.Automation.Jobs.POC
 {
-    public class GetImageUrls : IAutomationJob
+    public class ImageList : IAutomationJob
     {
         private readonly NexpartService _nexpartService;
         private readonly PartSourceContext _partSourceContext;
         private readonly FitmentContext _fitmentContext;
 
-        public GetImageUrls(NexpartService nexpartService, PartSourceContext partSourceContext, FitmentContext fitmentContext)
+        public ImageList(NexpartService nexpartService, PartSourceContext partSourceContext, FitmentContext fitmentContext)
         {
             _nexpartService = nexpartService;
             _partSourceContext = partSourceContext;

PartSource.Automation/Jobs/PartialInventoryUpdate.cs

@@ -14,18 +14,21 @@ using PartSource.Automation.Models.Ftp;
 using PartSource.Automation.Services;
 using Ratermania.Automation.Interfaces;
 
-namespace PartSource.Automation.Jobs.POC
+namespace PartSource.Automation.Jobs
 {
     public class PartialInventoryUpdate : IAutomationJob
     {
         private readonly FtpService _ftpService;
         private readonly ILogger<PartialInventoryUpdate> _logger;
+        private readonly string _connectionString;
 
         public PartialInventoryUpdate(IConfiguration configuration, ILogger<PartialInventoryUpdate> logger)
         {
             FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
             _ftpService = new FtpService(ftpConfiguration);
 
+            _connectionString = _connectionString = configuration.GetConnectionString("PartSourceDatabase");
+
             _logger = logger;
         }
 
@@ -46,7 +49,7 @@ namespace PartSource.Automation.Jobs.POC
 
             string file = _ftpService.Download($"{lastUploadedFile.Filename}");
 
-            using SqlConnection connection = new SqlConnection("Server=tcp:ps-whi.database.windows.net,1433;Initial Catalog=ps-whi-test;Persist Security Info=False;User ID=ps-whi;Password=9-^*N5dw!6:|.5Q;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;");
+            using SqlConnection connection = new SqlConnection(_connectionString);
 			connection.Open();
 
             using StreamReader reader = new StreamReader(file);

PartSource.Automation/Jobs/UpdateFitment.cs

@@ -93,7 +93,7 @@ namespace PartSource.Automation.Jobs
                                 ? string.Empty
                                 : product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("</ul>") + "</ul>".Length);
 
-                            IList<Vehicle> vehicles = _vehicleFitmentService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
+                            IList<Vehicle> vehicles = await _vehicleFitmentService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
                             IList<int> vehicleIdFitment = _vehicleFitmentService.GetVehicleIdFitment(vehicles);
 
                             if (!vehicleIdFitment.Any())

PartSource.Automation/Program.cs

@@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using PartSource.Automation.Jobs;
-using PartSource.Automation.Jobs.POC;
 using PartSource.Automation.Services;
 using PartSource.Data.AutoMapper;
 using PartSource.Data.Contexts;
@@ -93,6 +92,15 @@ namespace PartSource.Automation
                             //.HasJob<StatusCheck>(options => options.HasInterval(new TimeSpan(24, 0, 0))
                             //	.StartsAt(DateTime.Parse("2021-04-01 08:00:00"))
                             //)
+                            .HasJob<ExecuteSsisPackages>(options =>
+                                options.HasInterval(new TimeSpan(24, 0, 0))
+                                    .StartsAt(DateTime.Today.AddHours(-24))
+                                )
+                            .HasJob<UpdatePricing>(options =>
+                                options.HasInterval(new TimeSpan(24, 0, 0))
+                                    .StartsAt(DateTime.Today.AddHours(-22))
+                                    .HasDependency<ExecuteSsisPackages>()
+                                )
                             .HasJob<BulkUpdateInventory>(options =>
                                 options.HasInterval(new TimeSpan(1, 0, 0))
                                     .StartsAt(DateTime.Today.AddHours(-27))

PartSource.Automation/appsettings.json

@@ -11,19 +11,18 @@
 		"SmtpHost": "localhost"
 	},
 	"FtpServers": {
-		"AzureConfiguration": {
-			"Username": "ps-ftp\\$ps-ftp",
-			"Password": "ycvXptffBxqkBXW4vuRYqn4Zi1soCvnvMMolTe5HNSeAlcl3bAyJYtNhG579",
-			"Url": "ftp://waws-prod-yq1-007.ftp.azurewebsites.windows.net/site/wwwroot",
-			"Destination": "C:\\Partsource.Automation\\Downloads",
-			"Port":  21
-		},
 		"WhiConfiguration": {
 			"Username": "ctc_seo",
 			"Password": "YD3gtaQ5kPdtNKs",
 			"Url": "ftp://ftp.whisolutions.com",
 			"Destination": "C:\\Partsource.Automation\\Downloads\\WHI",
 			"Port": 3001
+		},
+		"AutomationConfiguration": {
+			"Username": "stageuser",
+			"Password": "FXepK^cFYS|[H<",
+			"Url": "ftp://localhost",
+			"Destination": "C:\\Partsource.Automation\\Downloads"
 		}
 	},
 	"ssisConfiguration": {