.
This commit is contained in:
@@ -19,12 +19,29 @@ namespace PartSource.Api.Controllers
|
|||||||
private readonly NexpartService _nexpartService;
|
private readonly NexpartService _nexpartService;
|
||||||
private readonly PartService _partService;
|
private readonly PartService _partService;
|
||||||
private readonly VehicleService _vehicleService;
|
private readonly VehicleService _vehicleService;
|
||||||
|
private readonly FitmentService _fitmentService;
|
||||||
|
|
||||||
public PartsController(NexpartService nexpartService, PartService partService, VehicleService vehicleService)
|
public PartsController(NexpartService nexpartService, PartService partService, VehicleService vehicleService, FitmentService fitmentService)
|
||||||
{
|
{
|
||||||
_nexpartService = nexpartService;
|
_nexpartService = nexpartService;
|
||||||
_partService = partService;
|
_partService = partService;
|
||||||
_vehicleService = vehicleService;
|
_vehicleService = vehicleService;
|
||||||
|
_fitmentService = fitmentService;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet]
|
||||||
|
[Route("fitment")]
|
||||||
|
[Route("fitmentnote")]
|
||||||
|
public async Task<ActionResult> GetFitment([FromQuery] string sku, [FromQuery] int vehicleId)
|
||||||
|
{
|
||||||
|
VehicleFitmentDto vehicleFitment = await _fitmentService.GetFitmentNotes(sku, vehicleId);
|
||||||
|
|
||||||
|
if (vehicleFitment == null)
|
||||||
|
{
|
||||||
|
return NotFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(vehicleFitment);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
@@ -34,24 +51,15 @@ namespace PartSource.Api.Controllers
|
|||||||
Part part = await _partService.GetPartBySku(sku);
|
Part part = await _partService.GetPartBySku(sku);
|
||||||
Vehicle vehicle = await _vehicleService.GetVehicleById(vehicleId);
|
Vehicle vehicle = await _vehicleService.GetVehicleById(vehicleId);
|
||||||
|
|
||||||
if (part == null)
|
if (part == null || vehicle == null)
|
||||||
{
|
{
|
||||||
return BadRequest(new
|
return BadRequest(new
|
||||||
{
|
{
|
||||||
Message = $"No part data is available for SKU {sku}. Confirm it is available in the database maintained by Sound Press.",
|
Message = $"No data is available for SKU {sku}. Confirm it is available in the database maintained by Sound Press.",
|
||||||
Reason = $"{nameof(_partService.GetPartBySku)} returned null"
|
Reason = $"{nameof(_partService.GetPartBySku)} returned null"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vehicle == null)
|
|
||||||
{
|
|
||||||
return BadRequest(new
|
|
||||||
{
|
|
||||||
Message = $"No vehicle data is available for SKU {sku}. Confirm it is available in the database maintained by Sound Press.",
|
|
||||||
Reason = $"{nameof(_vehicleService.GetVehicleById)} returned null"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
IList<DcfMapping> mappings = await _partService.GetDcfMapping(part.LineCode);
|
IList<DcfMapping> mappings = await _partService.GetDcfMapping(part.LineCode);
|
||||||
Item[] items = mappings.Select(m => new Item
|
Item[] items = mappings.Select(m => new Item
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\.editorconfig" Link=".editorconfig" />
|
|
||||||
<None Include="appsettings.development.json">
|
<None Include="appsettings.development.json">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
|||||||
@@ -52,13 +52,12 @@ namespace PartSource.Api
|
|||||||
services.AddAutoMapper(typeof(PartSourceProfile));
|
services.AddAutoMapper(typeof(PartSourceProfile));
|
||||||
|
|
||||||
services.AddTransient<PartService>();
|
services.AddTransient<PartService>();
|
||||||
|
services.AddTransient<FitmentService>();
|
||||||
services.AddTransient<NexpartService>();
|
services.AddTransient<NexpartService>();
|
||||||
services.AddTransient<SecurityService>();
|
services.AddTransient<SecurityService>();
|
||||||
services.AddTransient<VehicleService>();
|
services.AddTransient<VehicleService>();
|
||||||
services.AddTransient<ShopifyChangelogService>();
|
services.AddTransient<ShopifyChangelogService>();
|
||||||
|
|
||||||
services.AddTransient<FitmentContext>();
|
|
||||||
|
|
||||||
services.AddCors(o => o.AddPolicy("Default", builder =>
|
services.AddCors(o => o.AddPolicy("Default", builder =>
|
||||||
{
|
{
|
||||||
builder.AllowAnyOrigin()
|
builder.AllowAnyOrigin()
|
||||||
@@ -69,9 +68,9 @@ namespace PartSource.Api
|
|||||||
services.AddDbContext<PartSourceContext>(options =>
|
services.AddDbContext<PartSourceContext>(options =>
|
||||||
options.UseSqlServer(Configuration.GetConnectionString("PartSourceDatabase"))
|
options.UseSqlServer(Configuration.GetConnectionString("PartSourceDatabase"))
|
||||||
);
|
);
|
||||||
//services.AddDbContext<FitmentContext>(options =>
|
services.AddDbContext<FitmentContext>(options =>
|
||||||
// options.UseSqlServer(Configuration.GetConnectionString("FitmentDatabase"))
|
options.UseSqlServer(Configuration.GetConnectionString("FitmentDatabase"))
|
||||||
//);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
|
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"PartSourceDatabase": "Server=tcp:ps-whi.database.windows.net,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=ps-whi;Password=9-^*N5dw!6:|.5Q;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
|
"PartSourceDatabase": "Server=tcp:ps-whi.database.windows.net,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=ps-whi;Password=9-^*N5dw!6:|.5Q;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
|
||||||
|
"FitmentDatabase": "Server=tcp:ps-automation.eastus2.cloudapp.azure.com,1433;Initial Catalog=WhiFitment;User ID=automation;Password=)6L)XP%m(x-UU#M;Encrypt=True;TrustServerCertificate=True;Connection Timeout=300"
|
||||||
//"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true"
|
//"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true"
|
||||||
},
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
|
|||||||
23
PartSource.Automation/Extensions/FileInfoExtensions.cs
Normal file
23
PartSource.Automation/Extensions/FileInfoExtensions.cs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace PartSource.Automation.Extensions
|
||||||
|
{
|
||||||
|
public static class FileInfoExtensions
|
||||||
|
{
|
||||||
|
public static DateTime GetWhiTimestamp(this FileInfo fileInfo)
|
||||||
|
{
|
||||||
|
Match match = Regex.Match(fileInfo.Name, "[0-9]{8}");
|
||||||
|
|
||||||
|
return match.Success && DateTime.TryParseExact(match.Value, "MMddyyyy", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime timestamp)
|
||||||
|
? timestamp
|
||||||
|
: DateTime.MinValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,7 +17,7 @@ namespace PartSource.Automation.Jobs
|
|||||||
private readonly ILogger<ExecuteSsisPackages> _logger;
|
private readonly ILogger<ExecuteSsisPackages> _logger;
|
||||||
|
|
||||||
// TODO: set from config
|
// TODO: set from config
|
||||||
private readonly string[] _ssisPackages = {"Parts Price", "Parts Availability" };
|
private readonly string[] _ssisPackages = { "Parts Availability" };
|
||||||
|
|
||||||
public ExecuteSsisPackages(EmailService emailService, IConfiguration configuration, SsisService ssisService, ILogger<ExecuteSsisPackages> logger)
|
public ExecuteSsisPackages(EmailService emailService, IConfiguration configuration, SsisService ssisService, ILogger<ExecuteSsisPackages> logger)
|
||||||
{
|
{
|
||||||
|
|||||||
85
PartSource.Automation/Jobs/POC/BulkUpdateInventory.cs
Normal file
85
PartSource.Automation/Jobs/POC/BulkUpdateInventory.cs
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.Data.SqlClient;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
|
using PartSource.Automation.Models.Configuration;
|
||||||
|
using PartSource.Automation.Models.Ftp;
|
||||||
|
using PartSource.Automation.Services;
|
||||||
|
using Ratermania.Automation.Interfaces;
|
||||||
|
|
||||||
|
namespace PartSource.Automation.Jobs.POC
|
||||||
|
{
|
||||||
|
public class BulkUpdateInventory : IAutomationJob
|
||||||
|
{
|
||||||
|
private readonly FtpService _ftpService;
|
||||||
|
|
||||||
|
public BulkUpdateInventory(IConfiguration configuration)
|
||||||
|
{
|
||||||
|
FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AzureConfiguration").Get<FtpConfiguration>();
|
||||||
|
_ftpService = new FtpService(ftpConfiguration);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Run(CancellationToken token, params string[] arguments)
|
||||||
|
{
|
||||||
|
FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended()
|
||||||
|
.Where(f => f.FileType == FtpFileType.File && f.Filename.IndexOf("Availability") > -1)
|
||||||
|
.OrderByDescending(f => f.Modified)
|
||||||
|
.First();
|
||||||
|
|
||||||
|
string file = _ftpService.Download(lastUploadedFile.Filename, Path.GetTempPath());
|
||||||
|
|
||||||
|
DataTable dataTable = GetDataTable(file);
|
||||||
|
|
||||||
|
using SqlConnection connection = new SqlConnection("Server=tcp:ps-automation-stage.eastus2.cloudapp.azure.com,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=stageuser;Password=]FXepK^cFYS|[H<;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;");
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using SqlBulkCopy bulk = new SqlBulkCopy(connection)
|
||||||
|
{
|
||||||
|
DestinationTableName = $"PartAvailability",
|
||||||
|
BulkCopyTimeout = 14400
|
||||||
|
};
|
||||||
|
|
||||||
|
bulk.WriteToServer(dataTable);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
private DataTable GetDataTable(string filename)
|
||||||
|
{
|
||||||
|
using DataTable dataTable = new DataTable();
|
||||||
|
dataTable.Columns.Add("Store", typeof(int));
|
||||||
|
dataTable.Columns.Add("SKU", typeof(string));
|
||||||
|
dataTable.Columns.Add("QTY", typeof(int));
|
||||||
|
|
||||||
|
using StreamReader reader = new StreamReader(filename);
|
||||||
|
string line = reader.ReadLine(); // Burn the header row
|
||||||
|
|
||||||
|
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 sku = columns[1].Trim();
|
||||||
|
if (int.TryParse(columns[0], out int store)
|
||||||
|
&& !string.IsNullOrEmpty(sku)
|
||||||
|
&& int.TryParse(columns[2], out int quantity))
|
||||||
|
{
|
||||||
|
dataTable.Rows.Add(new object[] { store, sku, quantity });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return dataTable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
119
PartSource.Automation/Jobs/POC/GetImageUrls.cs
Normal file
119
PartSource.Automation/Jobs/POC/GetImageUrls.cs
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
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 FitmentContext _fitmentContext;
|
||||||
|
private readonly PartService _partService;
|
||||||
|
private readonly ShopifyClient _shopifyClient;
|
||||||
|
|
||||||
|
public GetImageUrls(NexpartService nexpartService, PartService partService, FitmentContext fitmentContext, ShopifyClient shopifyClient)
|
||||||
|
{
|
||||||
|
_nexpartService = nexpartService;
|
||||||
|
_fitmentContext = fitmentContext;
|
||||||
|
_partService = partService;
|
||||||
|
_shopifyClient = shopifyClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Run(CancellationToken token, params string[] arguments)
|
||||||
|
{
|
||||||
|
IList<string> rows = new List<string> {
|
||||||
|
"\"Line Code\", \"Part Number\", \"Image URL(s)\""
|
||||||
|
};
|
||||||
|
|
||||||
|
using StreamReader reader = new StreamReader("C:\\Users\\Tom\\Desktop\\image parts.csv");
|
||||||
|
string line = reader.ReadLine(); // Burn the header row
|
||||||
|
|
||||||
|
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 partsourceCode = columns[0].Trim();
|
||||||
|
string partNumber = columns[1].Trim();
|
||||||
|
|
||||||
|
|
||||||
|
IList<DcfMapping> dcfMappings = await _partService.GetDcfMapping(partsourceCode);
|
||||||
|
if (dcfMappings.Count == 0)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"No images for {partsourceCode} {partNumber}");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool hasImage = false;
|
||||||
|
foreach (DcfMapping mapping in dcfMappings)
|
||||||
|
{
|
||||||
|
if (hasImage)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
SmartPageDataSearch dataSearch = new SmartPageDataSearch
|
||||||
|
{
|
||||||
|
Items = new Item[]
|
||||||
|
{
|
||||||
|
new Item
|
||||||
|
{
|
||||||
|
MfrCode = mapping.WhiCode,
|
||||||
|
PartNumber = partNumber
|
||||||
|
}
|
||||||
|
},
|
||||||
|
DataOption = new[] { "ALL" }
|
||||||
|
};
|
||||||
|
|
||||||
|
SmartPageDataSearchResponse response = await _nexpartService.SendRequest<SmartPageDataSearch, SmartPageDataSearchResponse>(dataSearch);
|
||||||
|
|
||||||
|
if (response.ResponseBody.Item?.Length > 0)
|
||||||
|
{
|
||||||
|
List<string> urls = new List<string>();
|
||||||
|
|
||||||
|
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($"\"{partsourceCode}\", \"{partNumber}\", \"{string.Join(";", urls)}\"");
|
||||||
|
hasImage = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasImage)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"No images for {partsourceCode} {partNumber}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await File.WriteAllLinesAsync($"C:\\users\\Tom\\desktop\\WHI Images {DateTime.Now:yyyyMMdd}.csv", rows);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
106
PartSource.Automation/Jobs/POC/GetImageUrlsTemp.cs
Normal file
106
PartSource.Automation/Jobs/POC/GetImageUrlsTemp.cs
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
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 GetImageUrlsTemp : IAutomationJob
|
||||||
|
{
|
||||||
|
private readonly NexpartService _nexpartService;
|
||||||
|
private readonly FitmentContext _fitmentContext;
|
||||||
|
private readonly PartService _partService;
|
||||||
|
private readonly ShopifyClient _shopifyClient;
|
||||||
|
|
||||||
|
private readonly string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||||
|
|
||||||
|
public GetImageUrlsTemp(NexpartService nexpartService, PartService partService, FitmentContext fitmentContext, ShopifyClient shopifyClient)
|
||||||
|
{
|
||||||
|
_nexpartService = nexpartService;
|
||||||
|
_fitmentContext = fitmentContext;
|
||||||
|
_partService = partService;
|
||||||
|
_shopifyClient = shopifyClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Run(CancellationToken token, params string[] arguments)
|
||||||
|
{
|
||||||
|
IList<KeyValuePair<string, string>> parts = new List<KeyValuePair<string, string>>();
|
||||||
|
parts.Add(new KeyValuePair<string, string>("DAY", "89310"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("CNI", "141.40113"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("PRF", "MU19631"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("TRK", "SB8100"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("MON", "906970"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("FEL", "70804"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("FEL", "SS71198"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("CFP", "STS314"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("NGK", "21517"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("NGK", "RC-XX89"));
|
||||||
|
parts.Add(new KeyValuePair<string, string>("FRA", "CA176"));
|
||||||
|
|
||||||
|
for (int i = 0; i < chars.Length; i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j < chars.Length; j++)
|
||||||
|
{
|
||||||
|
for (int k = 0; k < chars.Length; k++)
|
||||||
|
{
|
||||||
|
string actualLineCode = $"{chars[i]}{chars[j]}{chars[k]}";
|
||||||
|
System.Diagnostics.Debug.WriteLine(actualLineCode);
|
||||||
|
|
||||||
|
foreach (KeyValuePair<string, string> part in parts)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
SmartPageDataSearch dataSearch = new SmartPageDataSearch
|
||||||
|
{
|
||||||
|
Items = new Item[]
|
||||||
|
{
|
||||||
|
new Item
|
||||||
|
{
|
||||||
|
MfrCode = actualLineCode,
|
||||||
|
PartNumber = part.Value
|
||||||
|
}
|
||||||
|
},
|
||||||
|
DataOption = new[] { "DIST_LINE", "ALL" }
|
||||||
|
};
|
||||||
|
|
||||||
|
SmartPageDataSearchResponse response = await _nexpartService.SendRequest<SmartPageDataSearch, SmartPageDataSearchResponse>(dataSearch);
|
||||||
|
|
||||||
|
if (response.ResponseBody.Item?.Length > 0)
|
||||||
|
{
|
||||||
|
List<string> urls = new List<string>();
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Image {urls[0]} found for {part.Value}. Expected: {part.Key}, Actual: {actualLineCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
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<string> rows = new List<string> {
|
|
||||||
"\"Line Code\", \"Part Number\", \"Image URL(s)\""
|
|
||||||
};
|
|
||||||
|
|
||||||
IList<ImportData> 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<SmartPageDataSearch, SmartPageDataSearchResponse>(dataSearch);
|
|
||||||
|
|
||||||
if (response.ResponseBody.Item?.Length > 0)
|
|
||||||
{
|
|
||||||
List<string> urls = new List<string>();
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,6 +8,7 @@ using System.Threading;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.Data.SqlClient;
|
using Microsoft.Data.SqlClient;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using PartSource.Automation.Models.Configuration;
|
using PartSource.Automation.Models.Configuration;
|
||||||
using PartSource.Automation.Models.Ftp;
|
using PartSource.Automation.Models.Ftp;
|
||||||
using PartSource.Automation.Services;
|
using PartSource.Automation.Services;
|
||||||
@@ -18,67 +19,62 @@ namespace PartSource.Automation.Jobs.POC
|
|||||||
public class PartialInventoryUpdate : IAutomationJob
|
public class PartialInventoryUpdate : IAutomationJob
|
||||||
{
|
{
|
||||||
private readonly FtpService _ftpService;
|
private readonly FtpService _ftpService;
|
||||||
|
private readonly ILogger<PartialInventoryUpdate> _logger;
|
||||||
|
|
||||||
public PartialInventoryUpdate(IConfiguration configuration)
|
public PartialInventoryUpdate(IConfiguration configuration, ILogger<PartialInventoryUpdate> logger)
|
||||||
{
|
{
|
||||||
FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AzureConfiguration").Get<FtpConfiguration>();
|
FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
|
||||||
_ftpService = new FtpService(ftpConfiguration);
|
_ftpService = new FtpService(ftpConfiguration);
|
||||||
|
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task Run(CancellationToken token, params string[] arguments)
|
public async Task Run(CancellationToken token, params string[] arguments)
|
||||||
{
|
{
|
||||||
FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended("")
|
FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended()
|
||||||
.Where(f => f.FileType == FtpFileType.File && f.Filename.IndexOf("Availability") > -1)
|
.Where(f => f.FileType == FtpFileType.File && f.Modified >= DateTime.Now.AddHours(-24) && f.Filename.IndexOf("Availability Partial") > -1)
|
||||||
.OrderByDescending(f => f.Modified)
|
.OrderByDescending(f => f.Modified)
|
||||||
.First();
|
.FirstOrDefault();
|
||||||
|
|
||||||
string file = _ftpService.Download(lastUploadedFile.Filename, Path.GetTempPath());
|
if (lastUploadedFile == null)
|
||||||
|
{
|
||||||
|
_logger.LogInformation($"No partial inventory file available for the time period {DateTime.Now.AddHours(-24)} - {DateTime.Now}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
string file = _ftpService.Download($"{lastUploadedFile.Filename}", "C:\\Users\\Tom\\Desktop");
|
||||||
|
|
||||||
DataTable dataTable = GetDataTable(file);
|
|
||||||
|
|
||||||
using SqlConnection connection = new SqlConnection("Server=tcp:ps-automation-stage.eastus2.cloudapp.azure.com,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=stageuser;Password=]FXepK^cFYS|[H<;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;");
|
using SqlConnection connection = new SqlConnection("Server=tcp:ps-automation-stage.eastus2.cloudapp.azure.com,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=stageuser;Password=]FXepK^cFYS|[H<;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;");
|
||||||
connection.Open();
|
connection.Open();
|
||||||
|
|
||||||
using SqlBulkCopy bulk = new SqlBulkCopy(connection)
|
using StreamReader reader = new StreamReader(file);
|
||||||
{
|
|
||||||
DestinationTableName = $"PartAvailability",
|
|
||||||
BulkCopyTimeout = 14400
|
|
||||||
};
|
|
||||||
|
|
||||||
bulk.WriteToServer(dataTable);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
private DataTable GetDataTable(string filename)
|
|
||||||
{
|
|
||||||
using DataTable dataTable = new DataTable();
|
|
||||||
dataTable.Columns.Add("Store", typeof(int));
|
|
||||||
dataTable.Columns.Add("SKU", typeof(int));
|
|
||||||
dataTable.Columns.Add("QTY", typeof(int));
|
|
||||||
|
|
||||||
using StreamReader reader = new StreamReader(filename);
|
|
||||||
string line = reader.ReadLine(); // Burn the header row
|
string line = reader.ReadLine(); // Burn the header row
|
||||||
|
|
||||||
while (reader.Peek() > 0)
|
while (reader.Peek() > 0)
|
||||||
{
|
{
|
||||||
line = reader.ReadLine();
|
line = reader.ReadLine();
|
||||||
|
|
||||||
string[] columns = line.Split("|");
|
string[] columns = line.Split(",");
|
||||||
for (int i = 0; i < columns.Length; i++)
|
for (int i = 0; i < columns.Length; i++)
|
||||||
{
|
{
|
||||||
columns[i] = columns[i].Replace("\"", string.Empty);
|
columns[i] = columns[i].Replace("\"", string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (int.TryParse(columns[0], out int store)
|
if (int.TryParse(columns[0], out int store)
|
||||||
&& int.TryParse(columns[1], out int sku)
|
&& int.TryParse(columns[1], out int quantity)
|
||||||
&& int.TryParse(columns[2], out int quantity))
|
&& int.TryParse(columns[2], out int sku))
|
||||||
{
|
{
|
||||||
dataTable.Rows.Add(new object[] { store, sku, quantity });
|
using SqlCommand sqlCommand = new SqlCommand("UPDATE Inventory SET QTY = @qty WHERE SKU = @sku AND Store = @store", connection);
|
||||||
|
sqlCommand.Parameters.Add(new SqlParameter("qty", quantity));
|
||||||
|
sqlCommand.Parameters.Add(new SqlParameter("sku", sku));
|
||||||
|
sqlCommand.Parameters.Add(new SqlParameter("store", store));
|
||||||
|
|
||||||
|
await sqlCommand.ExecuteNonQueryAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return dataTable;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,9 +96,8 @@ namespace PartSource.Automation.Jobs
|
|||||||
|
|
||||||
Task.WaitAll(taskArray);
|
Task.WaitAll(taskArray);
|
||||||
|
|
||||||
// _whiSeoService.CreateFitmentView();
|
_whiSeoService.SaveNotes(_noteDictionary);
|
||||||
|
//_whiSeoService.CreateFitmentView();
|
||||||
//_whiSeoService.SaveNotes(_noteDictionary);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Decompress(FileInfo fileInfo)
|
public string Decompress(FileInfo fileInfo)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using PartSource.Automation.Extensions;
|
||||||
using PartSource.Automation.Models.Configuration;
|
using PartSource.Automation.Models.Configuration;
|
||||||
using PartSource.Automation.Models.Enums;
|
using PartSource.Automation.Models.Enums;
|
||||||
using PartSource.Automation.Services;
|
using PartSource.Automation.Services;
|
||||||
@@ -45,7 +46,9 @@ namespace PartSource.Automation.Jobs
|
|||||||
string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
|
string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
|
||||||
DirectoryInfo directoryInfo = new DirectoryInfo(directory);
|
DirectoryInfo directoryInfo = new DirectoryInfo(directory);
|
||||||
|
|
||||||
IEnumerable<FileInfo> files = directoryInfo.GetFiles().Where(f => f.Name.StartsWith("seo_aces_vehicle_feed"));
|
IEnumerable<FileInfo> files = directoryInfo.GetFiles()
|
||||||
|
.Where(f => f.Name.StartsWith("seo_aces_vehicle_feed"))
|
||||||
|
.OrderByDescending(f => f.GetWhiTimestamp());
|
||||||
|
|
||||||
foreach (FileInfo fileInfo in files)
|
foreach (FileInfo fileInfo in files)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,11 +40,11 @@ namespace PartSource.Automation.Jobs
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
|
//products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
|
||||||
//products = new List<Product>
|
products = new List<Product>
|
||||||
//{
|
{
|
||||||
// await _shopifyClient.Products.GetById(4388919574575)
|
await _shopifyClient.Products.GetById(7285013446703)
|
||||||
//};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -72,13 +72,17 @@ namespace PartSource.Automation.Jobs
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool isFitment = false;
|
bool isFitment = false;
|
||||||
string bodyHtml = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("</ul>") + "</ul>".Length);
|
string bodyHtml = string.IsNullOrEmpty(product.BodyHtml)
|
||||||
|
? "<ul></ul>"
|
||||||
|
: 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);
|
IList<int> vehicleIdFitment = _vehicleFitmentService.GetVehicleIdFitment(vehicles);
|
||||||
|
|
||||||
if (vehicleIdFitment.Count > 0)
|
if (vehicleIdFitment.Count == 0)
|
||||||
{
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
string vehicleIdString = string.Join(',', vehicleIdFitment.Select(j => $"v{j}"));
|
string vehicleIdString = string.Join(',', vehicleIdFitment.Select(j => $"v{j}"));
|
||||||
|
|
||||||
bodyHtml += $"<div id=\"vehicleIDs\" style=\"display:none;\">{vehicleIdString}</div>";
|
bodyHtml += $"<div id=\"vehicleIDs\" style=\"display:none;\">{vehicleIdString}</div>";
|
||||||
@@ -106,7 +110,6 @@ namespace PartSource.Automation.Jobs
|
|||||||
_logger.LogWarning($"Vehicle ID fitment data for SKU {importData.VariantSku} is too large for Shopify and cannot be added.");
|
_logger.LogWarning($"Vehicle ID fitment data for SKU {importData.VariantSku} is too large for Shopify and cannot be added.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
IList<string> ymmFitment = _vehicleFitmentService.GetYmmFitment(vehicles);
|
IList<string> ymmFitment = _vehicleFitmentService.GetYmmFitment(vehicles);
|
||||||
if (ymmFitment.Count > 0)
|
if (ymmFitment.Count > 0)
|
||||||
@@ -135,7 +138,7 @@ namespace PartSource.Automation.Jobs
|
|||||||
|
|
||||||
bodyHtml += $"<div id=\"seoData\">{stringBuilder.ToString()}</div>";
|
bodyHtml += $"<div id=\"seoData\">{stringBuilder.ToString()}</div>";
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(ymmFitment);
|
json = JsonConvert.SerializeObject(ymmFitment);
|
||||||
if (json.Length < 100000)
|
if (json.Length < 100000)
|
||||||
{
|
{
|
||||||
Metafield ymmMetafield = new Metafield
|
Metafield ymmMetafield = new Metafield
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ namespace PartSource.Automation.Jobs
|
|||||||
}
|
}
|
||||||
|
|
||||||
IList<Fitment> fitments = GetPositionOrderedFitments(importData?.PartNumber, importData?.LineCode);
|
IList<Fitment> fitments = GetPositionOrderedFitments(importData?.PartNumber, importData?.LineCode);
|
||||||
IList<Vehicle> vehicles = _vehicleFitmentService.GetVehiclesForPart(importData?.PartNumber, importData?.LineCode);
|
IList<Vehicle> vehicles = await _vehicleFitmentService.GetVehiclesForPart(importData?.PartNumber, importData?.LineCode);
|
||||||
|
|
||||||
if (fitments.Count == 0 || vehicles.Count == 0)
|
if (fitments.Count == 0 || vehicles.Count == 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,9 +100,9 @@ namespace PartSource.Automation
|
|||||||
// //.StartsAt(DateTime.Today.AddHours(25))
|
// //.StartsAt(DateTime.Today.AddHours(25))
|
||||||
// )
|
// )
|
||||||
|
|
||||||
.HasJob<ProcessWhiVehicles>(options => options.HasInterval(new TimeSpan(24, 0, 0))
|
.HasJob<PartialInventoryUpdate>(options => options.HasInterval(new TimeSpan(1, 0, 0))
|
||||||
//.HasDependency<ExecuteSsisPackages>()
|
//.HasDependency<ExecuteSsisPackages>()
|
||||||
// .StartsAt(DateTime.Today.AddHours(28))
|
.StartsAt(new DateTime(2023, 01, 01, 01, 0, 0))
|
||||||
);
|
);
|
||||||
//);
|
//);
|
||||||
//.AddApiServer();
|
//.AddApiServer();
|
||||||
@@ -114,6 +114,7 @@ namespace PartSource.Automation
|
|||||||
.AddSingleton<VehicleService>()
|
.AddSingleton<VehicleService>()
|
||||||
.AddSingleton<VehicleFitmentService>()
|
.AddSingleton<VehicleFitmentService>()
|
||||||
.AddSingleton<NexpartService>()
|
.AddSingleton<NexpartService>()
|
||||||
|
.AddSingleton<PartService>()
|
||||||
|
|
||||||
.AddAutoMapper(typeof(PartSourceProfile));
|
.AddAutoMapper(typeof(PartSourceProfile));
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace PartSource.Automation.Services
|
|||||||
_ftpConfiguration = ftpConfiguration;
|
_ftpConfiguration = ftpConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<FtpFileInfo> ListFilesExtended(string directory)
|
public IList<FtpFileInfo> ListFilesExtended(string directory = "")
|
||||||
{
|
{
|
||||||
FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{directory}"));
|
FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{directory}"));
|
||||||
request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
|
request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
|
||||||
@@ -67,7 +67,7 @@ namespace PartSource.Automation.Services
|
|||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string[] ListFiles(string directory)
|
public string[] ListFiles(string directory = "")
|
||||||
{
|
{
|
||||||
FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{directory}"));
|
FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{directory}"));
|
||||||
request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
|
request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
|
||||||
@@ -102,6 +102,11 @@ namespace PartSource.Automation.Services
|
|||||||
}
|
}
|
||||||
|
|
||||||
destination = Path.Combine(destination, filename);
|
destination = Path.Combine(destination, filename);
|
||||||
|
string destinationDirectory = Path.GetDirectoryName(destination);
|
||||||
|
if (!Directory.Exists(destinationDirectory))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(destinationDirectory);
|
||||||
|
}
|
||||||
|
|
||||||
using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
|
using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
|
||||||
using Stream responseStream = response.GetResponseStream();
|
using Stream responseStream = response.GetResponseStream();
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace PartSource.Automation.Services
|
|||||||
{
|
{
|
||||||
StartInfo = new ProcessStartInfo
|
StartInfo = new ProcessStartInfo
|
||||||
{
|
{
|
||||||
FileName = "dtexec",
|
FileName = "C:\\Program Files\\Microsoft SQL Server\\150\\DTS\\Binn\\dtexec.exe",
|
||||||
Arguments = $"/file \"{_ssisConfiguration.Directory}\\{packageName}\"",
|
Arguments = $"/file \"{_ssisConfiguration.Directory}\\{packageName}\"",
|
||||||
UseShellExecute = false,
|
UseShellExecute = false,
|
||||||
CreateNoWindow = false,
|
CreateNoWindow = false,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using PartSource.Data.Contexts;
|
using PartSource.Data.Contexts;
|
||||||
using PartSource.Data.Dtos;
|
using PartSource.Data.Dtos;
|
||||||
using PartSource.Data.Models;
|
using PartSource.Data.Models;
|
||||||
@@ -93,18 +94,19 @@ namespace PartSource.Automation.Services
|
|||||||
return vehicles.Select(v => v.VehicleToEngineConfigId).Distinct().ToArray();
|
return vehicles.Select(v => v.VehicleToEngineConfigId).Distinct().ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<Vehicle> GetVehiclesForPart(string partNumber, string lineCode, int maxVehicles = 0)
|
public async Task<IList<Vehicle>> GetVehiclesForPart(string partNumber, string lineCode, int maxVehicles = 0)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(partNumber) || string.IsNullOrEmpty(lineCode))
|
if (string.IsNullOrEmpty(partNumber) || string.IsNullOrEmpty(lineCode))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
partNumber = Regex.Replace(partNumber, "[^a-zA-Z0-9\\-]", string.Empty);
|
partNumber = Regex.Replace(partNumber, "[^a-zA-Z0-9]", string.Empty);
|
||||||
|
|
||||||
IQueryable<string> whiCodes = _fitmentContext.DcfMappings
|
IList<string> whiCodes = await _fitmentContext.DcfMappings
|
||||||
.Where(d => d.LineCode == lineCode)
|
.Where(dcf => dcf.LineCode == lineCode)
|
||||||
.Select(d => d.WhiCode);
|
.Select(dcf => dcf.WhiCode)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
IQueryable<Vehicle> vehicles = _fitmentContext.Fitments
|
IQueryable<Vehicle> vehicles = _fitmentContext.Fitments
|
||||||
.Where(f => f.PartNumber == partNumber && whiCodes.Contains(f.LineCode))
|
.Where(f => f.PartNumber == partNumber && whiCodes.Contains(f.LineCode))
|
||||||
@@ -122,38 +124,5 @@ namespace PartSource.Automation.Services
|
|||||||
|
|
||||||
return vehicles.ToList();
|
return vehicles.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<VehicleFitmentDto> GetVehicleFitmentForPart(string partNumber, string lineCode, int maxVehicles = 0)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(partNumber) || string.IsNullOrEmpty(lineCode))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
partNumber = Regex.Replace(partNumber, "[^a-zA-Z0-9\\-]", string.Empty);
|
|
||||||
|
|
||||||
IQueryable<string> whiCodes = _fitmentContext.DcfMappings
|
|
||||||
.Where(d => d.LineCode == lineCode)
|
|
||||||
.Select(d => d.WhiCode);
|
|
||||||
|
|
||||||
IQueryable<VehicleFitmentDto> vehicles = _fitmentContext.Fitments
|
|
||||||
.Where(f => f.PartNumber == partNumber && whiCodes.Contains(f.LineCode))
|
|
||||||
.Join(_fitmentContext.Vehicles,
|
|
||||||
f => new { f.BaseVehicleId, f.EngineConfigId },
|
|
||||||
v => new { v.BaseVehicleId, v.EngineConfigId },
|
|
||||||
(f, v) => new VehicleFitmentDto
|
|
||||||
{
|
|
||||||
Fitment = f,
|
|
||||||
Vehicle = v
|
|
||||||
})
|
|
||||||
.Distinct();
|
|
||||||
|
|
||||||
if (maxVehicles > 0)
|
|
||||||
{
|
|
||||||
vehicles = vehicles.Take(maxVehicles);
|
|
||||||
}
|
|
||||||
|
|
||||||
return vehicles.ToList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,12 @@
|
|||||||
"Url": "ftp://waws-prod-yq1-007.ftp.azurewebsites.windows.net/site/wwwroot",
|
"Url": "ftp://waws-prod-yq1-007.ftp.azurewebsites.windows.net/site/wwwroot",
|
||||||
"Destination": "C:\\Partsource.Automation\\Downloads"
|
"Destination": "C:\\Partsource.Automation\\Downloads"
|
||||||
},
|
},
|
||||||
|
"AutomationConfiguration": {
|
||||||
|
"Username": "stageuser",
|
||||||
|
"Password": "FXepK^cFYS|[H<",
|
||||||
|
"Url": "ftp://ps-automation-stage.eastus2.cloudapp.azure.com",
|
||||||
|
"Destination": "C:\\Partsource.Automation\\Downloads\\Stage"
|
||||||
|
},
|
||||||
"WhiConfiguration": {
|
"WhiConfiguration": {
|
||||||
"Username": "ctc_seo",
|
"Username": "ctc_seo",
|
||||||
"Password": "be34hz64e4",
|
"Password": "be34hz64e4",
|
||||||
@@ -35,7 +41,7 @@
|
|||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
"Microsoft": "Warning",
|
"Microsoft": "Warning",
|
||||||
"Microsoft.Hosting.Lifetime": "Information",
|
"Microsoft.Hosting.Lifetime": "Information"
|
||||||
// "Microsoft.EntityFrameworkCore.Database.Command": "Information"
|
// "Microsoft.EntityFrameworkCore.Database.Command": "Information"
|
||||||
},
|
},
|
||||||
"EventLog": {
|
"EventLog": {
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ namespace PartSource.Data.Contexts
|
|||||||
|
|
||||||
public DbSet<Vehicle> Vehicles { get; set; }
|
public DbSet<Vehicle> Vehicles { get; set; }
|
||||||
|
|
||||||
|
public DbSet<VehicleFitment> VehicleFitments { get; set; }
|
||||||
|
|
||||||
public DbSet<Wiper> Wipers { get; set; }
|
public DbSet<Wiper> Wipers { get; set; }
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
@@ -28,6 +30,7 @@ namespace PartSource.Data.Contexts
|
|||||||
modelBuilder.Entity<DcfMapping>().HasKey(d => new { d.LineCode, d.WhiCode });
|
modelBuilder.Entity<DcfMapping>().HasKey(d => new { d.LineCode, d.WhiCode });
|
||||||
modelBuilder.Entity<Fitment>().HasKey(f => new { f.BaseVehicleId, f.EngineConfigId, f.LineCode, f.PartNumber });
|
modelBuilder.Entity<Fitment>().HasKey(f => new { f.BaseVehicleId, f.EngineConfigId, f.LineCode, f.PartNumber });
|
||||||
modelBuilder.Entity<Wiper>().HasKey(f => new { f.BaseVehicleId, f.PartNumber, f.LineCode, f.Position});
|
modelBuilder.Entity<Wiper>().HasKey(f => new { f.BaseVehicleId, f.PartNumber, f.LineCode, f.Position});
|
||||||
|
modelBuilder.Entity<VehicleFitment>().HasNoKey();
|
||||||
|
|
||||||
foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
|
foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,10 +5,8 @@ using System.Text;
|
|||||||
|
|
||||||
namespace PartSource.Data.Dtos
|
namespace PartSource.Data.Dtos
|
||||||
{
|
{
|
||||||
public class VehicleFitmentDto
|
public class VehicleFitmentDto : VehicleFitment
|
||||||
{
|
{
|
||||||
public Fitment Fitment { get; set; }
|
public IList<string> SubmodelNames { get; set; }
|
||||||
|
|
||||||
public Vehicle Vehicle { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
27
PartSource.Data/Models/VehicleFitment.cs
Normal file
27
PartSource.Data/Models/VehicleFitment.cs
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
namespace PartSource.Data.Models
|
||||||
|
{
|
||||||
|
public class VehicleFitment
|
||||||
|
{
|
||||||
|
public string Sku { get; set; }
|
||||||
|
|
||||||
|
public string LineCode { get; set; }
|
||||||
|
|
||||||
|
public string PartNumber { get; set; }
|
||||||
|
|
||||||
|
public string NoteText { get; set; }
|
||||||
|
|
||||||
|
public int Year { get; set; }
|
||||||
|
|
||||||
|
public string MakeName { get; set; }
|
||||||
|
|
||||||
|
public string ModelName { get; set; }
|
||||||
|
|
||||||
|
public string SubmodelName { get; set; }
|
||||||
|
|
||||||
|
public int BaseVehicleId { get; set; }
|
||||||
|
|
||||||
|
public int EngineConfigId { get; set; }
|
||||||
|
|
||||||
|
public int VehicleToEngineConfigId { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using PartSource.Data.Contexts;
|
using PartSource.Data.Contexts;
|
||||||
using PartSource.Data.Dtos;
|
using PartSource.Data.Dtos;
|
||||||
using PartSource.Data.Models;
|
using PartSource.Data.Models;
|
||||||
|
using PartSource.Data.Nexpart;
|
||||||
|
|
||||||
namespace PartSource.Services
|
namespace PartSource.Services
|
||||||
{
|
{
|
||||||
@@ -19,6 +20,39 @@ namespace PartSource.Services
|
|||||||
_fitmentContext = fitmentContext;
|
_fitmentContext = fitmentContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<VehicleFitmentDto> GetFitmentNotes(string sku, int vehicleId)
|
||||||
|
{
|
||||||
|
VehicleFitmentDto vehicleFitment = await _fitmentContext.VehicleFitments
|
||||||
|
.Where(vf => vf.VehicleToEngineConfigId == vehicleId && vf.Sku == sku)
|
||||||
|
.Select(vf => new VehicleFitmentDto
|
||||||
|
{
|
||||||
|
Sku = vf.Sku,
|
||||||
|
LineCode = vf.LineCode,
|
||||||
|
PartNumber = vf.PartNumber,
|
||||||
|
NoteText = vf.NoteText,
|
||||||
|
Year = vf.Year,
|
||||||
|
MakeName = vf.MakeName,
|
||||||
|
ModelName = vf.ModelName,
|
||||||
|
BaseVehicleId = vf.BaseVehicleId,
|
||||||
|
EngineConfigId = vf.EngineConfigId,
|
||||||
|
VehicleToEngineConfigId = vf.VehicleToEngineConfigId
|
||||||
|
})
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
if (vehicleFitment == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
vehicleFitment.SubmodelNames = await _fitmentContext.VehicleFitments
|
||||||
|
.Where(vf => vf.BaseVehicleId == vehicleFitment.BaseVehicleId && vf.Sku == sku)
|
||||||
|
.Select(vf => vf.SubmodelName)
|
||||||
|
.Distinct()
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
return vehicleFitment;
|
||||||
|
}
|
||||||
|
|
||||||
public IList<string> GetYmmFitment(IList<Vehicle> vehicles)
|
public IList<string> GetYmmFitment(IList<Vehicle> vehicles)
|
||||||
{
|
{
|
||||||
if (vehicles.Count == 0)
|
if (vehicles.Count == 0)
|
||||||
@@ -122,38 +156,5 @@ namespace PartSource.Services
|
|||||||
|
|
||||||
return vehicles.ToList();
|
return vehicles.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<VehicleFitmentDto> GetVehicleFitmentForPart(string partNumber, string lineCode, int maxVehicles = 0)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(partNumber) || string.IsNullOrEmpty(lineCode))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
partNumber = Regex.Replace(partNumber, "[^a-zA-Z0-9\\-]", string.Empty);
|
|
||||||
|
|
||||||
IQueryable<string> whiCodes = _fitmentContext.DcfMappings
|
|
||||||
.Where(d => d.LineCode == lineCode)
|
|
||||||
.Select(d => d.WhiCode);
|
|
||||||
|
|
||||||
IQueryable<VehicleFitmentDto> vehicles = _fitmentContext.Fitments
|
|
||||||
.Where(f => f.PartNumber == partNumber && whiCodes.Contains(f.LineCode))
|
|
||||||
.Join(_fitmentContext.Vehicles,
|
|
||||||
f => new { f.BaseVehicleId, f.EngineConfigId },
|
|
||||||
v => new { v.BaseVehicleId, v.EngineConfigId },
|
|
||||||
(f, v) => new VehicleFitmentDto
|
|
||||||
{
|
|
||||||
Fitment = f,
|
|
||||||
Vehicle = v
|
|
||||||
})
|
|
||||||
.Distinct();
|
|
||||||
|
|
||||||
if (maxVehicles > 0)
|
|
||||||
{
|
|
||||||
vehicles = vehicles.Take(maxVehicles);
|
|
||||||
}
|
|
||||||
|
|
||||||
return vehicles.ToList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user