");
-
- if (parts.Length > 2)
- {
- string ul = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("") + "".Length);
- string seoData = "
" + parts[1].Substring(0, parts[1].IndexOf("") + "".Length) + "
";
- string vehicleIds = new Regex("
").Match(product.BodyHtml).Value;
-
- product.BodyHtml = ul + seoData + vehicleIds;
-
- await _shopifyClient.Products.Update(product);
- }
- }
-
- catch
- {
- Console.WriteLine($"Failed to update {product.Id}");
- }
- }
-
- try
- {
- Console.WriteLine("Did 250");
- products = await _shopifyClient.Products.GetNext();
- }
-
- catch (Exception ex)
- {
- products = await _shopifyClient.Products.GetPrevious();
- }
- }
- }
- }
-}
diff --git a/PartSource.Automation/Jobs/POC/ImageList.cs b/PartSource.Automation/Jobs/POC/ImageList.cs
new file mode 100644
index 0000000..77ec44e
--- /dev/null
+++ b/PartSource.Automation/Jobs/POC/ImageList.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using PartSource.Data.Contexts;
+using PartSource.Data.Models;
+using PartSource.Data.Nexpart;
+using PartSource.Services;
+using Ratermania.Automation.Interfaces;
+using Ratermania.Shopify;
+using Ratermania.Shopify.Resources;
+
+namespace PartSource.Automation.Jobs.POC
+{
+ public class GetImageUrls : IAutomationJob
+ {
+ private readonly NexpartService _nexpartService;
+ private readonly PartSourceContext _partSourceContext;
+
+ public GetImageUrls(NexpartService nexpartService, PartSourceContext partSourceContext)
+ {
+ _nexpartService = nexpartService;
+ _partSourceContext = partSourceContext;
+ }
+
+ public async Task Run(CancellationToken token, params string[] arguments)
+ {
+ IList
rows = new List {
+ "\"Line Code\", \"Part Number\", \"Image URL(s)\""
+ };
+
+ IList importData = await _partSourceContext.ImportData
+ //.Take(5000)
+ .ToListAsync();
+
+ foreach (ImportData item in importData)
+ {
+ SmartPageDataSearch dataSearch = new SmartPageDataSearch
+ {
+ Items = new Item[]
+ {
+ new Item
+ {
+ MfrCode = item.LineCode,
+ PartNumber = item.PartNumber
+ }
+ },
+ DataOption = new[] { "DIST_LINE", "ALL" }
+ };
+
+ SmartPageDataSearchResponse response = await _nexpartService.SendRequest(dataSearch);
+
+ if (response.ResponseBody.Item?.Length > 0)
+ {
+ List urls = new List();
+
+ if (!string.IsNullOrEmpty(response.ResponseBody.Item[0].PrimaryImg?.ImgUrl))
+ {
+ urls.Add(response.ResponseBody.Item[0].PrimaryImg?.ImgUrl);
+ };
+
+ if (response.ResponseBody.Item[0].AddImgs?.AddImg?.Length > 0)
+ {
+ urls.AddRange(response.ResponseBody.Item[0].AddImgs.AddImg.Select(i => i.AddImgUrl));
+ }
+
+ if (urls.Count > 0)
+ {
+ rows.Add($"\"{item.LineCode}\", \"{item.PartNumber}\", \"{string.Join(";", urls)}\"");
+ }
+ }
+
+ }
+
+ await File.WriteAllLinesAsync("C:\\users\\Tommy\\desktop\\WHI Images.csv", rows);
+ }
+ }
+}
\ No newline at end of file
diff --git a/PartSource.Automation/Jobs/POC/UpdateFitmentHtml.cs b/PartSource.Automation/Jobs/POC/UpdateFitmentHtml.cs
deleted file mode 100644
index 36019af..0000000
--- a/PartSource.Automation/Jobs/POC/UpdateFitmentHtml.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using PartSource.Automation.Models;
-using PartSource.Data;
-using PartSource.Data.Contexts;
-using PartSource.Data.Models;
-using PartSource.Services;
-using Ratermania.Automation.Interfaces;
-using Ratermania.Shopify;
-using Ratermania.Shopify.Exceptions;
-using Ratermania.Shopify.Resources;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PartSource.Automation.Jobs
-{
- public class UpdateFitmentHtml : IAutomationJob
- {
- private readonly ILogger _logger;
- private readonly ShopifyClient _shopifyClient;
- private readonly PartSourceContext _partSourceContext;
- private readonly FitmentContext _fitmentContext;
- private readonly VehicleService _vehicleService;
-
- public UpdateFitmentHtml(ILogger logger, PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleService vehicleService)
- {
- _logger = logger;
- _partSourceContext = partSourceContext;
- _fitmentContext = fitmentContext;
- _shopifyClient = shopifyClient;
- _vehicleService = vehicleService;
- }
-
- public async Task Run(CancellationToken token, params string[] arguments)
- {
-
- IEnumerable products = null;
-
- try
- {
- products = await _shopifyClient.Products.Get(new Dictionary { { "limit", 250 }, { "vendor", "FRAM" } });
- }
-
- catch (Exception ex)
- {
- _logger.LogError("Failed to get products from Shopify", ex);
- throw;
- }
-
- int i = 1;
-
- while (products != null && products.Any())
- {
- foreach (Product product in products)
- {
- ImportData importData = null;
-
- try
- {
- importData = await _partSourceContext.ImportData.FirstOrDefaultAsync(parts => parts.VariantSku == product.Variants[0].Sku);
-
- if (importData == null)
- {
- continue;
- }
-
- product.BodyHtml = importData.BodyHtml;
-
- IList vehicles = _vehicleService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
-
- IList ymmFitment = _vehicleService.GetYmmFitment(vehicles);
- if (ymmFitment.Count > 0)
- {
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.AppendLine("| This Part Fits |
|---|
");
-
- foreach (string fitment in ymmFitment)
- {
- try
- {
- string[] parts = fitment.Split(' ', 2);
-
- stringBuilder.AppendLine($"| {parts[1]} | {parts[0].Replace("-", ", ")} |
");
- }
-
- catch
- {
- // This is still a POC at this point. Oh well...
- }
- }
-
- stringBuilder.AppendLine("
");
-
- product.BodyHtml += $"{stringBuilder.ToString()}
";
- }
-
- IList vehicleIdFitment = _vehicleService.GetVehicleIdFitment(vehicles);
-
- if (vehicleIdFitment.Count > 0)
- {
- string vehicleIdString = string.Join('-', vehicleIdFitment.Select(j => $"v{j}"));
- product.BodyHtml += $"{vehicleIdString}
";
- }
-
- List tags = new List
- {
- importData.LineCode,
- importData.PartNumber,
- "zzzIsFitment=true"
- };
-
- product.Tags = string.Join(',', tags);
-
- await _shopifyClient.Products.Update(product);
- }
-
- catch (Exception ex)
- {
- _logger.LogError($"Failed to updated fitment data for SKU {importData?.VariantSku} - {ex.Message}", ex);
- }
- }
-
- try
- {
- Console.WriteLine(i);
- products = await _shopifyClient.Products.GetNext();
-
- i++;
- }
-
- catch (Exception ex)
- {
- _logger.LogWarning(ex, "Failed to get the next set of products. Retrying");
- products = await _shopifyClient.Products.GetPrevious();
- }
- }
- }
- }
-}
diff --git a/PartSource.Automation/Jobs/POC/UpdateFitmentScratchpad.cs b/PartSource.Automation/Jobs/POC/UpdateFitmentScratchpad.cs
deleted file mode 100644
index 2190ff5..0000000
--- a/PartSource.Automation/Jobs/POC/UpdateFitmentScratchpad.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using PartSource.Automation.Models;
-using PartSource.Data;
-using PartSource.Data.Contexts;
-using PartSource.Data.Dtos;
-using PartSource.Data.Models;
-using PartSource.Services;
-using Ratermania.Automation.Interfaces;
-using Ratermania.Shopify;
-using Ratermania.Shopify.Exceptions;
-using Ratermania.Shopify.Resources;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PartSource.Automation.Jobs.POC
-{
- public class UpdateFitmentScratchpad : IAutomationJob
- {
- private readonly ILogger _logger;
- private readonly ShopifyClient _shopifyClient;
- private readonly PartSourceContext _partSourceContext;
- private readonly FitmentContext _fitmentContext;
- private readonly VehicleService _vehicleService;
-
- public UpdateFitmentScratchpad(ILogger logger, PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleService vehicleService)
- {
- _logger = logger;
- _partSourceContext = partSourceContext;
- _fitmentContext = fitmentContext;
- _shopifyClient = shopifyClient;
- _vehicleService = vehicleService;
- }
-
- public async Task Run(CancellationToken token, params string[] arguments)
- {
- IList productTypes = new List
- {
- "C172-S231-F23107_(PS) Wipers - TRICO Neoform",
- "CA172-SC231-FL23106_Wiper Blades - Bosch Icon",
- "CA172-SC231-FL23107_(PS) Wipers - TRICO Neoform",
- "CA172-SC231-FL23109_(PS) Wipers - TRICO Tech/Exact Fit",
- "CA172-SC231-FL23110_Wiper Accessories",
- "CA172-SC231-FL23114_Wiper Blades - Rear",
- "CA172-SC231-FL23116_(PS) Wipers - Bosch Insight (Hybrid)",
- "CA172-SC231-FL23117_(PS) Wipers - Bosch Clear Advantage (Beam)",
- "CA172-SC231-FL23118_(PS) Wipers - Winter",
- "CA172-SC231-FL23125_Wiper Blades - Bosch Areotwin"
- };
-
- IList csvData = new List
- {
- "\"Line Code\", \"Part Number\", \"Year\", \"Make\", \"Model\", \"Position\""
- };
-
- foreach (string type in productTypes)
- {
- IEnumerable products = null;
-
- try
- {
- products = await _shopifyClient.Products.Get(new Dictionary { { "limit", 250 }, { "product_type", type } });
- }
-
- catch (Exception ex)
- {
- _logger.LogError("Failed to get products from Shopify", ex);
- throw;
- }
-
-
-
- while (products != null && products.Any())
- {
- foreach (Product product in products)
- {
- ImportData importData = null;
-
- try
- {
- IEnumerable metafields = await _shopifyClient.Metafields.Get(new Dictionary { { "metafield[owner_id]", product.Id }, { "metafield[owner_resource]", "product" } });
-
- importData = new ImportData
- {
- LineCode = metafields.FirstOrDefault(m => m.Key == "custom_label_0").Value ?? string.Empty,
- PartNumber = product.Title.Split(' ')[0],
- VariantSku = product.Variants[0].Sku // They know we can't do fitment for variants
- };
-
- string csvRow = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("") + "".Length);
-
- IList vehicles = _vehicleService.GetVehicleFitmentForPart(importData.PartNumber, importData.LineCode);
-
- if (vehicles.Count > 0)
- {
- foreach (VehicleFitmentDto vehicle in vehicles)
- {
- try
- {
- csvData.Add($"\"{importData.LineCode}\", \"{importData.PartNumber}\", \"{vehicle.Vehicle.Year}\", \"{vehicle.Vehicle.MakeName}\", \"{vehicle.Vehicle.ModelName}\", \"{vehicle.Fitment.Position}\"");
- }
-
- catch
- {
- // This is still a POC at this point. Oh well...
- }
- }
-
-
- }
- }
-
- catch (Exception ex)
- {
- _logger.LogError($"Failed to updated fitment data for SKU {importData?.VariantSku} - {ex.Message}", ex);
- }
- }
-
- try
- {
- Console.WriteLine($"Did an iteration of {type}");
- products = await _shopifyClient.Products.GetNext();
- }
-
- catch (Exception ex)
- {
- _logger.LogWarning(ex, "Failed to get the next set of products. Retrying");
- products = await _shopifyClient.Products.GetPrevious();
- }
- }
- }
-
- await File.WriteAllLinesAsync("C:\\users\\Tommy\\desktop\\Wiper Fitment.csv", csvData);
- ;
- }
- }
-}
diff --git a/PartSource.Automation/Jobs/ProcessWhiFitment.cs b/PartSource.Automation/Jobs/ProcessWhiFitment.cs
index 78a2122..240ebac 100644
--- a/PartSource.Automation/Jobs/ProcessWhiFitment.cs
+++ b/PartSource.Automation/Jobs/ProcessWhiFitment.cs
@@ -19,163 +19,163 @@ using System.Threading.Tasks;
namespace PartSource.Automation.Jobs
{
- public class ProcessWhiFitment : IAutomationJob
- {
- private readonly ILogger _logger;
- private readonly WhiSeoService _whiSeoService;
- private readonly FtpConfiguration _ftpConfiguration;
- private readonly SeoDataType _seoDataType;
+ public class ProcessWhiFitment : IAutomationJob
+ {
+ private readonly ILogger _logger;
+ private readonly WhiSeoService _whiSeoService;
+ private readonly FtpConfiguration _ftpConfiguration;
+ private readonly SeoDataType _seoDataType;
- private readonly IDictionary _noteDictionary;
+ private readonly IDictionary _noteDictionary;
- public ProcessWhiFitment(IConfiguration configuration, ILogger logger, WhiSeoService whiSeoService)
- {
- _logger = logger;
- _whiSeoService = whiSeoService;
+ public ProcessWhiFitment(IConfiguration configuration, ILogger logger, WhiSeoService whiSeoService)
+ {
+ _logger = logger;
+ _whiSeoService = whiSeoService;
- _seoDataType = SeoDataType.Fitment;
+ _seoDataType = SeoDataType.Fitment;
- _ftpConfiguration = configuration.GetSection("ftpServers:WhiConfiguration").Get();
+ _ftpConfiguration = configuration.GetSection("ftpServers:WhiConfiguration").Get();
- _noteDictionary = new ConcurrentDictionary();
- }
+ _noteDictionary = new ConcurrentDictionary();
+ }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2008:Do not create tasks without passing a TaskScheduler", Justification = "Not library code")]
- public async Task Run(CancellationToken token, params string[] arguments)
- {
- _whiSeoService.TruncateFitmentTables();
- _whiSeoService.GetFiles(_seoDataType);
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2008:Do not create tasks without passing a TaskScheduler", Justification = "")]
+ public async Task Run(CancellationToken token, params string[] arguments)
+ {
+ _whiSeoService.TruncateFitmentTables();
+ // _whiSeoService.GetFiles(_seoDataType);
- string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
- DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+ string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
+ DirectoryInfo directoryInfo = new DirectoryInfo(directory);
- ConcurrentQueue> fileGroups = new ConcurrentQueue>();
+ ConcurrentQueue> fileGroups = new ConcurrentQueue>();
- foreach (IGrouping fileGroup in directoryInfo.GetFiles().Where(f => f.Name.EndsWith("csv.gz")).GroupBy(x => x.Name.Split('_').Last()))
- {
- fileGroups.Enqueue(fileGroup);
- }
+ foreach (IGrouping fileGroup in directoryInfo.GetFiles().Where(f => f.Name.EndsWith("csv.gz")).GroupBy(x => x.Name.Split('_').Last()))
+ {
+ fileGroups.Enqueue(fileGroup);
+ }
- Task[] taskArray = new Task[Environment.ProcessorCount / 2];
+ Task[] taskArray = new Task[8];
- for (int i = 0; i < taskArray.Length; i++)
- {
- taskArray[i] = Task.Factory.StartNew(() =>
- {
- while (fileGroups.TryDequeue(out IGrouping fileGroup))
- {
- foreach (FileInfo fileInfo in fileGroup)
- {
- try
- {
- string filename = Decompress(fileInfo);
- string tableName = fileInfo.Name.Substring(0, fileInfo.Name.IndexOf('.'));
+ for (int i = 0; i < taskArray.Length; i++)
+ {
+ taskArray[i] = Task.Factory.StartNew(() =>
+ {
+ while (fileGroups.TryDequeue(out IGrouping fileGroup))
+ {
+ foreach (FileInfo fileInfo in fileGroup)
+ {
+ try
+ {
+ string filename = Decompress(fileInfo);
+ string tableName = fileInfo.Name.Substring(0, fileInfo.Name.IndexOf('.'));
- DataTable dataTable = GetDataTable(filename);
+ DataTable dataTable = GetDataTable(filename);
- _whiSeoService.BulkCopyFitment(dataTable, tableName);
- _logger.LogInformation($"Copied {fileInfo.Name} to the database.");
+ _whiSeoService.BulkCopyFitment(dataTable, tableName);
+ _logger.LogInformation($"Copied {fileInfo.Name} to the database.");
- File.Delete(filename);
- }
+ File.Delete(filename);
+ }
- catch (Exception ex)
- {
- _logger.LogError($"Failed to write {fileInfo.Name} to the database - {ex.Message}", ex);
- }
- }
+ catch (Exception ex)
+ {
+ _logger.LogError($"Failed to write {fileInfo.Name} to the database - {ex.Message}", ex);
+ }
+ }
- string fitmentTable = fileGroup.Key.Substring(0, fileGroup.Key.IndexOf('.'));
- _whiSeoService.CreateFitmentTable(fitmentTable);
+ string fitmentTable = fileGroup.Key.Substring(0, fileGroup.Key.IndexOf('.'));
+ _whiSeoService.CreateFitmentTable(fitmentTable);
- _logger.LogInformation($"Created fitment table for part group {fitmentTable}.");
+ _logger.LogInformation($"Created fitment table for part group {fitmentTable}.");
- }
- }, token);
- }
+ }
+ });
+ }
- Task.WaitAll(taskArray);
+ Task.WaitAll(taskArray);
- _whiSeoService.CreateFitmentView();
+ _whiSeoService.CreateFitmentView();
- _whiSeoService.SaveNotes(_noteDictionary);
- }
+ _whiSeoService.SaveNotes(_noteDictionary);
+ }
- public string Decompress(FileInfo fileInfo)
- {
- string decompressedFile = fileInfo.FullName.Remove(fileInfo.FullName.Length - fileInfo.Extension.Length);
+ public string Decompress(FileInfo fileInfo)
+ {
+ string decompressedFile = fileInfo.FullName.Remove(fileInfo.FullName.Length - fileInfo.Extension.Length);
- using FileStream filestream = File.Create(decompressedFile);
- using GZipStream decompressionStream = new GZipStream(fileInfo.OpenRead(), CompressionMode.Decompress);
+ using FileStream filestream = File.Create(decompressedFile);
+ using GZipStream decompressionStream = new GZipStream(fileInfo.OpenRead(), CompressionMode.Decompress);
- decompressionStream.CopyTo(filestream);
+ decompressionStream.CopyTo(filestream);
- return decompressedFile;
- }
+ return decompressedFile;
+ }
- private DataTable GetDataTable(string filename)
- {
- using DataTable dataTable = new DataTable();
- dataTable.Columns.Add("LineCode", typeof(string));
- dataTable.Columns.Add("PartNumber", typeof(string));
- dataTable.Columns.Add("BaseVehicleId", typeof(int));
- dataTable.Columns.Add("EngineConfigId", typeof(int));
- dataTable.Columns.Add("Position", typeof(string));
- dataTable.Columns.Add("FitmentNoteHash", typeof(string));
+ private DataTable GetDataTable(string filename)
+ {
+ using DataTable dataTable = new DataTable();
+ dataTable.Columns.Add("LineCode", typeof(string));
+ dataTable.Columns.Add("PartNumber", typeof(string));
+ dataTable.Columns.Add("BaseVehicleId", typeof(int));
+ dataTable.Columns.Add("EngineConfigId", typeof(int));
+ dataTable.Columns.Add("Position", typeof(string));
+ dataTable.Columns.Add("FitmentNoteHash", typeof(string));
- using StreamReader reader = new StreamReader(filename);
- string line = reader.ReadLine(); // Burn the header row
+ using StreamReader reader = new StreamReader(filename);
+ string line = reader.ReadLine(); // Burn the header row
- while (reader.Peek() > 0)
- {
- line = reader.ReadLine();
+ while (reader.Peek() > 0)
+ {
+ line = reader.ReadLine();
- string[] columns = line.Split("\",\"");
- for (int i = 0; i < columns.Length; i++)
- {
- columns[i] = columns[i].Replace("\"", string.Empty);
- }
+ string[] columns = line.Split("\",\"");
+ for (int i = 0; i < columns.Length; i++)
+ {
+ columns[i] = columns[i].Replace("\"", string.Empty);
+ }
- string lineCode = Regex.Replace(columns[0], "[^a-zA-Z0-9]", string.Empty).Trim();
- string partNumber = Regex.Replace(columns[1], "[^a-zA-Z0-9]", string.Empty).Trim();
- string position = columns[7].Trim();
+ string lineCode = Regex.Replace(columns[0], "[^a-zA-Z0-9]", string.Empty).Trim();
+ string partNumber = Regex.Replace(columns[1], "[^a-zA-Z0-9]", string.Empty).Trim();
+ string position = columns[7].Trim();
- string noteText = columns[4].Trim();
- string noteTextHash = GetMD5Hash(noteText);
+ string noteText = columns[4].Trim();
+ string noteTextHash = GetMD5Hash(noteText);
- if (!_noteDictionary.ContainsKey(noteTextHash))
- {
- _noteDictionary.Add(noteTextHash, noteText);
- }
+ if (!_noteDictionary.ContainsKey(noteTextHash))
+ {
+ _noteDictionary.Add(noteTextHash, noteText);
+ }
- if (!string.IsNullOrEmpty(lineCode)
- && !string.IsNullOrEmpty(partNumber)
- && int.TryParse(columns[5], out int baseVehicleId)
- && int.TryParse(columns[6], out int engineConfigId))
- {
- dataTable.Rows.Add(new object[] { lineCode, partNumber, baseVehicleId, engineConfigId, position, noteTextHash });
- }
- }
+ if (!string.IsNullOrEmpty(lineCode)
+ && !string.IsNullOrEmpty(partNumber)
+ && int.TryParse(columns[5], out int baseVehicleId)
+ && int.TryParse(columns[6], out int engineConfigId))
+ {
+ dataTable.Rows.Add(new object[] { lineCode, partNumber, baseVehicleId, engineConfigId, position, noteTextHash });
+ }
+ }
- return dataTable;
- }
+ return dataTable;
+ }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA5351:Do Not Use Broken Cryptographic Algorithms", Justification = "Not used for security")]
- private string GetMD5Hash(string input)
- {
- using MD5 md5 = MD5.Create();
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA5351:Do Not Use Broken Cryptographic Algorithms", Justification = "Not used for security")]
+ private string GetMD5Hash(string input)
+ {
+ using MD5 md5 = MD5.Create();
- byte[] inputBytes = Encoding.UTF8.GetBytes(input);
- byte[] hashBytes = md5.ComputeHash(inputBytes);
+ byte[] inputBytes = Encoding.UTF8.GetBytes(input);
+ byte[] hashBytes = md5.ComputeHash(inputBytes);
- StringBuilder stringBuilder = new StringBuilder();
+ StringBuilder stringBuilder = new StringBuilder();
- for (int i = 0; i < hashBytes.Length; i++)
- {
- stringBuilder.Append(hashBytes[i].ToString("X2"));
- }
+ for (int i = 0; i < hashBytes.Length; i++)
+ {
+ stringBuilder.Append(hashBytes[i].ToString("X2"));
+ }
- return stringBuilder.ToString();
- }
- }
+ return stringBuilder.ToString();
+ }
+ }
}
\ No newline at end of file
diff --git a/PartSource.Automation/Jobs/ProcessWhiVehicles.cs b/PartSource.Automation/Jobs/ProcessWhiVehicles.cs
index 0db132f..2a0bae5 100644
--- a/PartSource.Automation/Jobs/ProcessWhiVehicles.cs
+++ b/PartSource.Automation/Jobs/ProcessWhiVehicles.cs
@@ -19,117 +19,118 @@ using System.Threading.Tasks;
namespace PartSource.Automation.Jobs
{
- public class ProcessWhiVehicles : IAutomationJob
- {
- private readonly ILogger _logger;
- private readonly WhiSeoService _whiSeoService;
- private readonly FtpConfiguration _ftpConfiguration;
- private readonly SeoDataType _seoDataType;
+ public class ProcessWhiVehicles : IAutomationJob
+ {
+ private readonly ILogger _logger;
+ private readonly WhiSeoService _whiSeoService;
+ private readonly FtpConfiguration _ftpConfiguration;
+ private readonly SeoDataType _seoDataType;
- public ProcessWhiVehicles(IConfiguration configuration, ILogger logger, WhiSeoService whiSeoService)
- {
- _logger = logger;
- _whiSeoService = whiSeoService;
+ public ProcessWhiVehicles(IConfiguration configuration, ILogger logger, WhiSeoService whiSeoService)
+ {
+ _logger = logger;
+ _whiSeoService = whiSeoService;
- _seoDataType = SeoDataType.Vehicle;
+ _seoDataType = SeoDataType.Vehicle;
- _ftpConfiguration = configuration.GetSection("ftpServers:WhiConfiguration").Get();
+ _ftpConfiguration = configuration.GetSection("ftpServers:WhiConfiguration").Get();
- }
+ }
- public async Task Run(CancellationToken token, params string[] arguments)
- {
- _whiSeoService.TruncateVehicleTables();
- _whiSeoService.GetFiles(_seoDataType);
+ public async Task Run(CancellationToken token, params string[] arguments)
+ {
+ _whiSeoService.TruncateVehicleTable();
+ // _whiSeoService.GetFiles(_seoDataType);
- string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
- DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+ string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
+ DirectoryInfo directoryInfo = new DirectoryInfo(directory);
- IEnumerable files = directoryInfo.GetFiles().Where(f => f.Name.StartsWith("seo_aces_vehicle_feed"));
+ IEnumerable files = directoryInfo.GetFiles().Where(f => f.Name.StartsWith("seo_aces_vehicle_feed"));
- foreach (FileInfo fileInfo in files)
- {
- try
- {
- string tableName = fileInfo.Name.Substring(0, fileInfo.Name.IndexOf('.'));
+ foreach (FileInfo fileInfo in files)
+ {
+ try
+ {
+ string tableName = fileInfo.Name.Substring(0, fileInfo.Name.IndexOf('.'));
- DataTable dataTable = GetDataTable(fileInfo.FullName);
+ DataTable dataTable = GetDataTable(fileInfo.FullName);
- _whiSeoService.BulkCopyVehicle(dataTable, tableName);
- _logger.LogInformation($"Copied {fileInfo.Name} to the database.");
+ _whiSeoService.BulkCopyVehicle(dataTable, tableName);
+ _logger.LogInformation($"Copied {fileInfo.Name} to the database.");
- File.Delete(fileInfo.FullName);
- }
+ File.Delete(fileInfo.FullName);
+ }
- catch (Exception ex)
- {
- _logger.LogError($"Failed to write {fileInfo.Name} to the database - {ex.Message}", ex);
- }
- }
+ catch (Exception ex)
+ {
+ _logger.LogError($"Failed to write {fileInfo.Name} to the database - {ex.Message}", ex);
+ }
+ }
- _whiSeoService.CreateVehicleTable();
+ _whiSeoService.CreateVehicleTable();
- _logger.LogInformation($"Created vehicle table.");
- }
+ _logger.LogInformation($"Created vehicle table.");
+ }
- private DataTable GetDataTable(string filename)
- {
- using DataTable dataTable = new DataTable();
- dataTable.Columns.Add("Year", typeof(int));
- dataTable.Columns.Add("MakeId", typeof(int));
- dataTable.Columns.Add("MakeName", typeof(string));
- dataTable.Columns.Add("ModelId", typeof(int));
- dataTable.Columns.Add("ModelName", typeof(string));
- dataTable.Columns.Add("RegionId", typeof(int));
- dataTable.Columns.Add("RegionName", typeof(string));
- dataTable.Columns.Add("VehicleTypeId", typeof(int));
- dataTable.Columns.Add("EngineConfigId", typeof(int));
- dataTable.Columns.Add("EngineDescription", typeof(string));
- dataTable.Columns.Add("BaseVehicleId", typeof(int));
- dataTable.Columns.Add("VehicleToEngineConfigId", typeof(int));
- dataTable.Columns.Add("SubmodelId", typeof(int));
- dataTable.Columns.Add("SubmodelName", typeof(string));
+ private DataTable GetDataTable(string filename)
+ {
+ using DataTable dataTable = new DataTable();
+ dataTable.Columns.Add("Year", typeof(int));
+ dataTable.Columns.Add("MakeId", typeof(int));
+ dataTable.Columns.Add("MakeName", typeof(string));
+ dataTable.Columns.Add("ModelId", typeof(int));
+ dataTable.Columns.Add("ModelName", typeof(string));
+ dataTable.Columns.Add("RegionId", typeof(int));
+ dataTable.Columns.Add("RegionName", typeof(string));
+ dataTable.Columns.Add("VehicleTypeId", typeof(int));
+ dataTable.Columns.Add("EngineConfigId", typeof(int));
+ dataTable.Columns.Add("EngineDescription", typeof(string));
+ dataTable.Columns.Add("BaseVehicleId", typeof(int));
+ dataTable.Columns.Add("VehicleToEngineConfigId", typeof(int));
+ dataTable.Columns.Add("SubmodelId", typeof(int));
+ dataTable.Columns.Add("SubmodelName", typeof(string));
- using StreamReader reader = new StreamReader(filename);
- string line = reader.ReadLine(); // Burn the header row
+ using StreamReader reader = new StreamReader(filename);
+ string line = reader.ReadLine(); // Burn the header row
- while (reader.Peek() > 0)
- {
- line = reader.ReadLine();
+ while (reader.Peek() > 0)
+ {
+ line = reader.ReadLine();
- string[] columns = line.Split("\",\"");
- for (int i = 0; i < columns.Length; i++)
- {
- columns[i] = columns[i].Replace("\"", string.Empty);
- }
+ string[] columns = line.Split("\",\"");
+ for (int i = 0; i < columns.Length; i++)
+ {
+ columns[i] = columns[i].Replace("\"", string.Empty);
+ }
- string makeName = columns[4].Trim();
- string modelName = columns[6].Trim();
- string regionName = columns[8].Trim();
- string submodelName = columns[34].Trim();
- string engineDescription = columns[51].Trim();
+ string makeName = columns[4].Trim();
+ string modelName = columns[6].Trim();
+ string regionName = columns[8].Trim();
+ string submodelName = columns[34].Trim();
+ string engineDescription = columns[51].Trim();
- if (!string.IsNullOrEmpty(makeName)
- && !string.IsNullOrEmpty(modelName)
- && !string.IsNullOrEmpty(regionName)
- && !string.IsNullOrEmpty(submodelName)
- && !string.IsNullOrEmpty(engineDescription)
- && int.TryParse(columns[0], out int baseVehicleId)
- && int.TryParse(columns[2], out int year)
- && int.TryParse(columns[3], out int makeId)
- && int.TryParse(columns[5], out int modelId)
- && int.TryParse(columns[7], out int regionId)
- && int.TryParse(columns[9], out int vehicleTypeId)
- && int.TryParse(columns[33], out int submodelId)
- && int.TryParse(columns[35], out int engineConfigId)
- && int.TryParse(columns[36], out int vehicleToEngineConfigId)
- && new[] { 5, 6, 7 }.Contains(vehicleTypeId))
- {
- dataTable.Rows.Add(new object[] { year, makeId, makeName, modelId, modelName, regionId, regionName, vehicleTypeId, engineConfigId, engineDescription, baseVehicleId, vehicleToEngineConfigId, submodelId, submodelName });
- }
- }
+ if (!string.IsNullOrEmpty(makeName)
+ && !string.IsNullOrEmpty(modelName)
+ && !string.IsNullOrEmpty(submodelName)
+ && !string.IsNullOrEmpty(engineDescription)
+ && int.TryParse(columns[0], out int baseVehicleId)
+ && int.TryParse(columns[2], out int year)
+ && int.TryParse(columns[3], out int makeId)
+ && int.TryParse(columns[5], out int modelId)
+ && int.TryParse(columns[7], out int regionId)
+ && int.TryParse(columns[9], out int vehicleTypeId)
+ && int.TryParse(columns[33], out int submodelId)
+ && int.TryParse(columns[35], out int engineConfigId)
+ && int.TryParse(columns[36], out int vehicleToEngineConfigId))
+ {
+ if (regionId == 2 && new[] { 5, 6, 7 }.Contains(vehicleTypeId))
+ {
+ dataTable.Rows.Add(new object[] { year, makeId, makeName, modelId, modelName, regionId, regionName, vehicleTypeId, engineConfigId, engineDescription, baseVehicleId, vehicleToEngineConfigId, submodelId, submodelName });
+ }
+ }
+ }
- return dataTable;
- }
- }
+ return dataTable;
+ }
+ }
}
\ No newline at end of file
diff --git a/PartSource.Automation/Jobs/UpdateFitment.cs b/PartSource.Automation/Jobs/UpdateFitment.cs
index adb8972..60efb30 100644
--- a/PartSource.Automation/Jobs/UpdateFitment.cs
+++ b/PartSource.Automation/Jobs/UpdateFitment.cs
@@ -1,23 +1,18 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using PartSource.Automation.Models;
-using PartSource.Data;
-using PartSource.Data.Contexts;
-using PartSource.Data.Models;
-using PartSource.Services;
-using Ratermania.Automation.Interfaces;
-using Ratermania.Shopify;
-using Ratermania.Shopify.Exceptions;
-using Ratermania.Shopify.Resources;
-using System;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
-using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using PartSource.Automation.Services;
+using PartSource.Data.Contexts;
+using PartSource.Data.Models;
+using Ratermania.Automation.Interfaces;
+using Ratermania.Shopify;
+using Ratermania.Shopify.Resources;
namespace PartSource.Automation.Jobs
{
@@ -27,19 +22,20 @@ namespace PartSource.Automation.Jobs
private readonly ShopifyClient _shopifyClient;
private readonly PartSourceContext _partSourceContext;
private readonly FitmentContext _fitmentContext;
- private readonly VehicleService _vehicleService;
+ private readonly VehicleFitmentService _vehicleFitmentService;
- public UpdateFitment(ILogger logger, PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleService vehicleService)
+ public UpdateFitment(ILogger logger, PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleFitmentService vehicleFitmentService)
{
_logger = logger;
_partSourceContext = partSourceContext;
_fitmentContext = fitmentContext;
_shopifyClient = shopifyClient;
- _vehicleService = vehicleService;
+ _vehicleFitmentService = vehicleFitmentService;
}
public async Task Run(CancellationToken token, params string[] arguments)
{
+
IEnumerable products = null;
try
@@ -59,61 +55,56 @@ namespace PartSource.Automation.Jobs
{
foreach (Product product in products)
{
- // Wiper blades are a separate fitment process.
- if (product.ProductType.Contains("CA172-SC231"))
- {
- continue;
- }
-
ImportData importData = null;
try
{
IEnumerable metafields = await _shopifyClient.Metafields.Get(new Dictionary { { "metafield[owner_id]", product.Id }, { "metafield[owner_resource]", "product" } });
-
- //importData = await _partSourceContext.ImportData.FirstOrDefaultAsync(parts => parts.ShopifyId == product.Id);
-
- //if (importData == null)
- //{
- // continue;
importData = new ImportData
{
LineCode = metafields.FirstOrDefault(m => m.Key == "custom_label_0").Value ?? string.Empty,
- PartNumber = product.Title.Split(' ')[0],
+ PartNumber = metafields.FirstOrDefault(m => m.Key == "custom_label_1").Value ?? string.Empty,
VariantSku = product.Variants[0].Sku // They know we can't do fitment for variants
};
- // }
bool isFitment = false;
- string bodyHtml = product.BodyHtml[..(product.BodyHtml.IndexOf("") + "".Length)];
+ string bodyHtml = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("") + "".Length);
- IList vehicles = _vehicleService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
+ IList vehicles = _vehicleFitmentService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
+ IList vehicleIdFitment = _vehicleFitmentService.GetVehicleIdFitment(vehicles);
- IList vehicleIdFitment = _vehicleService.GetVehicleIdFitment(vehicles);
-
- if (vehicleIdFitment.Any())
+ if (vehicleIdFitment.Count > 0)
{
- string vehicleIdString = string.Join('-', vehicleIdFitment.Select(j => $"v{j}"));
+ string vehicleIdString = string.Join(',', vehicleIdFitment.Select(j => $"v{j}"));
bodyHtml += $"{vehicleIdString}
";
isFitment = true;
string json = JsonConvert.SerializeObject(vehicleIdFitment);
- Metafield vehicleMetafield = new Metafield
+ if (json.Length < 100000)
{
- Namespace = "fitment",
- Key = "ids",
- Value = json,
- Type = "json",
- OwnerResource = "product",
- OwnerId = product.Id
- };
+ Metafield vehicleMetafield = new Metafield
+ {
+ Namespace = "fitment",
+ Key = "ids",
+ Value = json,
+ Type = "json_string",
+ OwnerResource = "product",
+ OwnerId = product.Id
+ };
- await _shopifyClient.Metafields.Add(vehicleMetafield);
+ await _shopifyClient.Metafields.Add(vehicleMetafield);
+ }
+
+ else
+ {
+ _logger.LogWarning($"Vehicle ID fitment data for SKU {importData.VariantSku} is too large for Shopify and cannot be added.");
+ continue;
+ }
}
- IList ymmFitment = _vehicleService.GetYmmFitment(vehicles);
+ IList ymmFitment = _vehicleFitmentService.GetYmmFitment(vehicles);
if (ymmFitment.Count > 0)
{
isFitment = true;
@@ -141,17 +132,26 @@ namespace PartSource.Automation.Jobs
bodyHtml += $"{stringBuilder.ToString()}
";
string json = JsonConvert.SerializeObject(ymmFitment);
- Metafield ymmMetafield = new Metafield
+ if (json.Length < 100000)
{
- Namespace = "fitment",
- Key = "seo",
- Value = json,
- Type = "single_line_text_field",
- OwnerResource = "product",
- OwnerId = product.Id
- };
+ Metafield ymmMetafield = new Metafield
+ {
+ Namespace = "fitment",
+ Key = "seo",
+ Value = json,
+ Type = "json_string",
+ OwnerResource = "product",
+ OwnerId = product.Id
+ };
- await _shopifyClient.Metafields.Add(ymmMetafield);
+ await _shopifyClient.Metafields.Add(ymmMetafield);
+ }
+
+ else
+ {
+ _logger.LogWarning($"Year/make/model fitment data for SKU {importData.VariantSku} is too large for Shopify and cannot be added.");
+ continue;
+ }
}
Metafield isFitmentMetafield = new Metafield
@@ -159,34 +159,34 @@ namespace PartSource.Automation.Jobs
Namespace = "Flags",
Key = "IsFitment",
Value = isFitment.ToString(),
- Type = "single_line_text_field",
+ Type = "string",
OwnerResource = "product",
OwnerId = product.Id
};
await _shopifyClient.Metafields.Add(isFitmentMetafield);
- Metafield lineCodeMetafield = new Metafield
- {
- Namespace = "google",
- Key = "custom_label_0",
- Value = importData.LineCode,
- Type = "single_line_text_field",
- OwnerResource = "product",
- OwnerId = product.Id
- };
+ //Metafield lineCodeMetafield = new Metafield
+ //{
+ // Namespace = "google",
+ // Key = "custom_label_0",
+ // Value = importData.LineCode,
+ // Type = "string",
+ // OwnerResource = "product",
+ // OwnerId = product.Id
+ //};
- // await _shopifyClient.Metafields.Add(lineCodeMetafield);
+ //await _shopifyClient.Metafields.Add(lineCodeMetafield);
- Metafield partNumberMetafield = new Metafield
- {
- Namespace = "google",
- Key = "custom_label_1",
- Value = importData.PartNumber,
- Type = "single_line_text_field",
- OwnerResource = "product",
- OwnerId = product.Id
- };
+ //Metafield partNumberMetafield = new Metafield
+ //{
+ // Namespace = "google",
+ // Key = "custom_label_1",
+ // Value = importData.PartNumber,
+ // Type = "string",
+ // OwnerResource = "product",
+ // OwnerId = product.Id
+ //};
//await _shopifyClient.Metafields.Add(partNumberMetafield);
@@ -212,7 +212,6 @@ namespace PartSource.Automation.Jobs
product.Tags = string.Join(',', tags);
product.BodyHtml = bodyHtml;
-
await _shopifyClient.Products.Update(product);
importData.IsFitment = isFitment;
@@ -224,8 +223,8 @@ namespace PartSource.Automation.Jobs
{
_logger.LogError($"Failed to updated fitment data for SKU {importData?.VariantSku} - {ex.Message}", ex);
}
- }
+ }
try
{
Console.WriteLine(i);
@@ -244,4 +243,4 @@ namespace PartSource.Automation.Jobs
}
}
}
-}
+}
\ No newline at end of file
diff --git a/PartSource.Automation/Jobs/UpdatePositioning.cs b/PartSource.Automation/Jobs/UpdatePositioning.cs
index 2099f99..e4cbcf6 100644
--- a/PartSource.Automation/Jobs/UpdatePositioning.cs
+++ b/PartSource.Automation/Jobs/UpdatePositioning.cs
@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using PartSource.Automation.Models;
+using PartSource.Automation.Services;
using PartSource.Data;
using PartSource.Data.Contexts;
using PartSource.Data.Models;
@@ -23,14 +24,14 @@ namespace PartSource.Automation.Jobs
private readonly ShopifyClient _shopifyClient;
private readonly PartSourceContext _partSourceContext;
private readonly FitmentContext _fitmentContext;
- private readonly VehicleService _vehicleService;
+ private readonly VehicleFitmentService _vehicleFitmentService;
- public UpdatePositioning(PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleService vehicleService)
+ public UpdatePositioning(PartSourceContext partSourceContext, FitmentContext fitmentContext, ShopifyClient shopifyClient, VehicleFitmentService vehicleFitmentService)
{
_partSourceContext = partSourceContext;
_fitmentContext = fitmentContext;
_shopifyClient = shopifyClient;
- _vehicleService = vehicleService;
+ _vehicleFitmentService = vehicleFitmentService;
}
public async Task Run(CancellationToken token, params string[] arguments)
@@ -42,8 +43,6 @@ namespace PartSource.Automation.Jobs
IEnumerable products = await _shopifyClient.Products.Get(parameters);
- int i = 1;
-
while (products != null && products.Any())
{
foreach (Product product in products)
@@ -65,7 +64,7 @@ namespace PartSource.Automation.Jobs
}
IList fitments = GetPositionOrderedFitments(importData?.PartNumber, importData?.LineCode);
- IList vehicles = _vehicleService.GetVehiclesForPart(importData?.PartNumber, importData?.LineCode);
+ IList vehicles = _vehicleFitmentService.GetVehiclesForPart(importData?.PartNumber, importData?.LineCode);
if (fitments.Count == 0 || vehicles.Count == 0)
{
@@ -97,51 +96,45 @@ namespace PartSource.Automation.Jobs
await SavePositionMetafield(product, vehicleIds, currentPosition);
- IList notes = fitments.Select(f => f.FitmentNoteHash)
- .Distinct()
- .ToList();
+ //IList notes = fitments.Select(f => f.NoteText)
- IList