soundpress/Partsource
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

State of OMG-LEGION prior to merge

Browse Source
This commit is contained in:
Tom Raterman
2022-10-30 10:54:20 -04:00
parent 9924880b51
commit 48844127d7
45 changed files with 1350 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
PartSource.Api/Controllers/PartsController.cs
View File

@@ -5,91 +5,128 @@ using PartSource.Data.Models;
using PartSource.Data.Nexpart;
using PartSource.Services;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Part = PartSource.Data.Models.Part;
namespace PartSource.Api.Controllers
{
[Route("[controller]")]
[Route("v2/[controller]")]
[ApiController]
[ApiExplorerSettings(GroupName = "v1")]
public class PartsController : BaseNexpartController
{
private readonly NexpartService _nexpartService;
private readonly PartService _partService;
private readonly VehicleService _vehicleService;
public PartsController(NexpartService nexpartService, PartService partService)
public PartsController(NexpartService nexpartService, PartService partService, VehicleService vehicleService)
{
this._nexpartService = nexpartService;
_nexpartService = nexpartService;
_partService = partService;
_vehicleService = vehicleService;
}
[HttpGet]
[Route("PartNumber/{partNumber}/LineCode/{lineCode}")]
public ActionResult GetPart(string partNumber, string lineCode)
[Route("positions")]
public async Task<ActionResult> GetPositions([FromQuery] string sku, [FromQuery] int vehicleId)
{
new SmartPageDataSearch().Items = new Item[1]
Part part = await _partService.GetPartBySku(sku);
Vehicle vehicle = await _vehicleService.GetVehicleById(vehicleId);
if (part == null)
{
new Item()
return BadRequest(new
{
PartNumber = partNumber.ToUpperInvariant(),
MfrCode = lineCode.ToUpperInvariant()
}
};
return (ActionResult)this.Ok();
Message = $"No part data is available for SKU {sku}. Confirm it is available in the database maintained by Sound Press.",
Reason = $"{nameof(_partService.GetPartBySku)} returned null"
});
}
[HttpGet]
[Route("search/basevehicleid/{baseVehicleId}")]
public async Task<ActionResult> Search(int baseVehicleId, [FromQuery] string query)
if (vehicle == null)
{
PartsController partsController = this;
PartTypeSearch requestContent = new PartTypeSearch()
return BadRequest(new
{
SearchString = query,
SearchType = "ALL",
SearchOptions = "PARTIAL_MATCH",
VehicleIdentifier = new VehicleIdentifier()
{
BaseVehicleId = baseVehicleId
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);
Item[] items = mappings.Select(m => new Item
{
PartNumber = part.PartNumber,
MfrCode = m.WhiCode
})
.ToArray();
SmartPageDataSearch smartPageDataSearch = new SmartPageDataSearch
{
Items = items
};
PartTypeSearchResponse response = await _nexpartService.SendRequest<PartTypeSearch, PartTypeSearchResponse>(requestContent);
return partsController.NexpartResponse<PartTypeSearchResponse, PartTypes>(response);
SmartPageDataSearchResponse smartPageResponse = await _nexpartService.SendRequest<SmartPageDataSearch, SmartPageDataSearchResponse>(smartPageDataSearch);
if (smartPageResponse.ResponseBody?.Item == null)
{
return NotFound(new
{
Message = $"No WHI data is available for SKU {sku}",
Reason = $"{nameof(SmartPageDataSearch)} returned null"
});
}
[HttpGet]
[Route("validate/partTypeId/{partTypeId}/baseVehicleId/{baseVehicleId}")]
public async Task<ActionResult> ValidatePartFitment(int partTypeId, int baseVehicleId)
PartType[] partTypes = smartPageResponse.ResponseBody.Item.Select(i => new PartType
{
PartsController partsController = this;
PartTypesValidateLookup typesValidateLookup = new PartTypesValidateLookup();
typesValidateLookup.PartTypes = new PartType[1]
Id = i.Part.PartType.Id
})
.ToArray();
ApplicationSearch applicationSearch = new ApplicationSearch
{
new PartType() { Id = partTypeId }
VehicleIdentifier = new VehicleIdentifier
{
BaseVehicleId = vehicle.BaseVehicleId
},
MfrCode = mappings.Select(m => m.WhiCode).ToArray(),
PartType = new[] { new PartType { Id = smartPageResponse.ResponseBody.Item[0].Part.PartType.Id } },
Criterion = new[]
{
new Criterion
{
Attribute = "REGION",
Id = 2
}
},
GroupBy = "PARTTYPE"
};
typesValidateLookup.VehicleIdentifier = new VehicleIdentifier()
ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
if (response.ResponseBody == null)
{
BaseVehicleId = baseVehicleId
};
PartTypesValidateLookup requestContent = typesValidateLookup;
PartTypesValidateLookupResponse response = await partsController._nexpartService.SendRequest<PartTypesValidateLookup, PartTypesValidateLookupResponse>(requestContent);
return partsController.NexpartResponse<PartTypesValidateLookupResponse, PartTypes>(response);
return NotFound(new
{
Message = $"No WHI data is available for SKU {sku}",
Reason = $"{nameof(ApplicationSearch)} returned null"
});
}
[HttpGet]
[Route("search/fitment")]
public async Task<ActionResult> FitmentSearch([FromQuery] FitmentSearchDto fitmentSearchDto)
IList<string> positions = new List<string>();
foreach (App app in response.ResponseBody?.App)
{
IList<Fitment> fitments = _partService.GetFitments(fitmentSearchDto);
if (fitments == null)
if (!string.IsNullOrEmpty(app.Position) && app.Part == part.PartNumber)
{
return NotFound();
positions.Add(app.Position);
}
}
return Ok(new { Data = fitments });
return Ok(new
{
VehicleId = vehicleId,
Sku = sku,
Positions = positions.Distinct()
});
}
}
}

63
PartSource.Api/Controllers/WipersController.cs Normal file
View File

@@ -0,0 +1,63 @@

using Microsoft.AspNetCore.Mvc;
using PartSource.Data.Dtos;
using PartSource.Data.Models;
using PartSource.Data.Nexpart;
using PartSource.Services;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace PartSource.Api.Controllers
{
[Route("[controller]")]
[ApiController]
[ApiExplorerSettings(GroupName = "v1")]
public class WipersController : BaseNexpartController
{
private readonly NexpartService _nexpartService;
public WipersController(NexpartService nexpartService)
{
_nexpartService = nexpartService;
}
[HttpGet]
[Route("{baseVehicleId}")]
public async Task<ActionResult> GetWipersForVehicle(int baseVehicleId)
{
ApplicationSearch applicationSearch = new ApplicationSearch
{
VehicleIdentifier = new VehicleIdentifier
{
BaseVehicleId = baseVehicleId
},
MfrCode = new[] { "BOS", "TRI" },
PartType = new[]
{
new PartType { Id = 8852 }
},
Criterion = new[]
{
new Criterion
{
Attribute = "REGION",
Id = 2
}
},
GroupBy = "PARTTYPE"
};
ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
if (response.ResponseBody != null)
{
return NexpartResponse<ApplicationSearchResponse, Apps>(response);
}
else
{
return NotFound();
}
}
}
}

12
PartSource.Api/PartSource.Api.csproj
View File

@@ -30,14 +30,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.15" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Ratermania.Shopify" Version="1.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.3.1" />
</ItemGroup>
<ItemGroup>

18
PartSource.Api/Startup.cs
View File

@@ -67,9 +67,9 @@ namespace PartSource.Api
services.AddDbContext<PartSourceContext>(options =>
options.UseSqlServer(Configuration.GetConnectionString("PartSourceDatabase"))
);
services.AddDbContext<FitmentContext>(options =>
options.UseSqlServer(Configuration.GetConnectionString("FitmentDatabase"))
);
//services.AddDbContext<FitmentContext>(options =>
// options.UseSqlServer(Configuration.GetConnectionString("FitmentDatabase"))
//);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -86,12 +86,12 @@ namespace PartSource.Api
app.UseCors("Default");
app.UseSwagger();
app.UseReDoc(c =>
{
c.SpecUrl = "/swagger/v2/swagger.json";
c.ExpandResponses(string.Empty);
});
//app.UseSwagger();
//app.UseReDoc(c =>
//{
// c.SpecUrl = "/swagger/v2/swagger.json";
// c.ExpandResponses(string.Empty);
//});
// app.UseExceptionHandler("/Error");
// app.UseHttpsRedirection();

2
PartSource.Api/appsettings.json
View File

@@ -1,7 +1,7 @@
{
"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;",
"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true"
//"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true"
},
"Logging": {
"LogLevel": {

8
PartSource.Automation/Jobs/GetNexpartMenuItems.cs
View File

@@ -27,7 +27,7 @@ namespace PartSource.Automation.Jobs
MenuNodesLookup menuNodesLookup = new MenuNodesLookup
{
MenuId = 1,
MenuId = 2,
NumberOfLevels = 1
};
@@ -39,7 +39,7 @@ namespace PartSource.Automation.Jobs
MenuNodesLookup subgroupLookup = new MenuNodesLookup
{
MenuId = 1,
MenuId = 2,
NumberOfLevels = 1,
ParentMenuNodeId = categoryNode.Id
};
@@ -52,7 +52,7 @@ namespace PartSource.Automation.Jobs
MenuNodesLookup thirdLookup = new MenuNodesLookup
{
MenuId = 1,
MenuId = 2,
NumberOfLevels = 1,
ParentMenuNodeId = subgroupNode.Id
};
@@ -67,7 +67,7 @@ namespace PartSource.Automation.Jobs
}
}
await File.WriteAllLinesAsync("C:\\users\\Tommy\\desktop\\Partsource Menu Items.csv", rows);
//await File.WriteAllLinesAsync("C:\\users\\Tommy\\desktop\\Partsource Menu Items.csv", rows);
;
}

191
PartSource.Automation/Jobs/POC/UpdateBulbFitment.cs Normal file
View File

@@ -0,0 +1,191 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
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 UpdateBulbFitment : IAutomationJob
{
private readonly FitmentContext _fitmentContext;
private readonly NexpartService _nexpartService;
private readonly ShopifyClient _shopifyClient;
public UpdateBulbFitment(FitmentContext fitmentContext, NexpartService nexpartService, ShopifyClient shopifyClient)
{
_fitmentContext = fitmentContext;
_nexpartService = nexpartService;
_shopifyClient = shopifyClient;
}
public async Task Run()
{
await BuildDatabase();
await UpdateShopify();
}
public async Task BuildDatabase()
{
IList<int> baseVehicles = await _fitmentContext.Vehicles
.Select(v => v.BaseVehicleId)
.Distinct()
.OrderBy(i => i)
.ToListAsync();
foreach (int baseVehicleId in baseVehicles)
{
ApplicationSearch applicationSearch = new ApplicationSearch
{
VehicleIdentifier = new VehicleIdentifier
{
BaseVehicleId = baseVehicleId
},
MfrCode = new[] { "C23", "CBX", "CCH", "CCJ", "CF1", "CHU", "GOO", "GPL", "OEB", "UTY", "TYC", "ILB", "SYL", "SYR", "PLP", "FOU", },
PartType = new[] { new PartType { Id = 11696 }, new PartType { Id = 11701 }, new PartType { Id = 13343 }, new PartType { Id = 13661 }, new PartType { Id = 13662 }, new PartType { Id = 13663 }, new PartType { Id = 13675 }, new PartType { Id = 13676 }, new PartType { Id = 13677 }, new PartType { Id = 13678 }, new PartType { Id = 13716 } },
Criterion = new[]
{
new Criterion
{
Attribute = "REGION",
Id = 2
}
},
GroupBy = "PARTTYPE"
};
ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
if (response.ResponseBody != null)
{
foreach (App app in response.ResponseBody.App)
{
try
{
if (string.IsNullOrEmpty(app.Position))
{
app.Position = "not provided by WHI";
}
await _fitmentContext.Database.ExecuteSqlRawAsync("INSERT INTO Wiper (BaseVehicleId, LineCode, PartNumber, Position, PartName) VALUES ({0}, {1}, {2}, {3}, {4});",
baseVehicleId, app.MfrCode, Regex.Replace(app.Part, "[^a-zA-Z0-9]", string.Empty), app.Position, app.MfrLabel);
}
catch (Exception ex)
{
Console.WriteLine($"Could not save {app.MfrCode}, {app.Part}, {app.Position}, {app.MfrLabel} for {baseVehicleId}: {ex.Message}");
}
}
}
Console.WriteLine(baseVehicleId);
}
}
private async Task UpdateShopify()
{
//foreach (string productType in new[] { "CA171-SC223-FL22302_Halogen Lighting - Certified", "CA171-SC223-FL22303_Halogen Lighting - Xtra Vision", "CA171-SC223-FL22304_Halogen Lighting - Silverstar", "CA171-SC223-FL22305_Halogen Lighting - Silverstar Ultra", "CA171-SC223-FL22306_Halogen Lighting - Silverstar Zxe", "CA171-SC223-FL22307_Sealed Beams - OPP", "CA171-SC223-FL22308_Headlight Assemblies", "CA171-SC223-FL22311_Halogen Lighting - Fog Vision", "CA171-SC223-FL22314_Halogen Lighting - Sylvania Standard", "CA171-SC223-FL22315_Forward Lighting - HID", "CA171-SC223-FL22317_Sealed Beams - Silverstar", "CA171-SC223-FL22318_Sealed Beams - Xtra Vision", "CA171-SC223-FL22319_Forward Lighting - LED", "CA171-SC239-FL23910_Minibulbs - Long Life", "CA171-SC239-FL23920_Minibulbs - Silver Star", "CA171-SC239-FL23940_Minibulbs - LED" })
//{
IEnumerable<Product> products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
while (products != null && products.Any())
{
foreach (Product product in products)
{
try
{
string partNumber = Regex.Replace(product.Title.Split(' ')[0], "[^a-zA-Z0-9]", string.Empty);
IList<Wiper> wipers = await _fitmentContext.Wipers
.Where(w => w.PartNumber == partNumber)
.OrderBy(w => w.Position)
.ToListAsync();
string currentPosition = wipers.FirstOrDefault()?.Position;
if (currentPosition == null)
{
continue;
}
List<int> vehicleIds = new List<int>();
foreach (Wiper wiper in wipers)
{
if (wiper.Position != currentPosition)
{
await SavePositionMetafield(product, vehicleIds, currentPosition);
currentPosition = wiper.Position;
vehicleIds = new List<int>();
}
IList<int> fitmentVehicleIds = _fitmentContext.Vehicles
.Where(v => v.BaseVehicleId == wiper.BaseVehicleId)
.Select(v => v.VehicleToEngineConfigId)
.Distinct()
.ToList();
vehicleIds.AddRange(fitmentVehicleIds);
}
await SavePositionMetafield(product, vehicleIds, currentPosition);
}
catch (Exception ex)
{
Console.WriteLine($"Could not update {product.Id}: {ex.Message}");
}
}
products = await _shopifyClient.Products.GetNext();
}
// }
}
//[SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "It's a Shopify metafield key")]
private async Task SavePositionMetafield(Product product, IList<int> vehicleIds, string position)
{
if (vehicleIds.Count == 0)
{
return;
}
string json = JsonConvert.SerializeObject(vehicleIds);
if (json.Length >= 100000)
{
// TODO: Logging
return;
}
string key = position.ToLowerInvariant().Replace(" ", "_");
if (key.Length > 20)
{
key = key.Substring(0, 20);
}
Metafield vehicleMetafield = new Metafield
{
Namespace = "position",
Key = key,
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
;
System.Diagnostics.Debug.WriteLine(json);
await _shopifyClient.Metafields.Add(vehicleMetafield);
}
}
}

182
PartSource.Automation/Jobs/POC/UpdateWiperFitment.cs Normal file
View File

@@ -0,0 +1,182 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
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 UpdateWiperFitment : IAutomationJob
{
private readonly FitmentContext _fitmentContext;
private readonly NexpartService _nexpartService;
private readonly ShopifyClient _shopifyClient;
public UpdateWiperFitment(FitmentContext fitmentContext, NexpartService nexpartService, ShopifyClient shopifyClient)
{
_fitmentContext = fitmentContext;
_nexpartService = nexpartService;
_shopifyClient = shopifyClient;
}
public async Task Run()
{
// await BuildDatabase();
await UpdateShopify();
}
public async Task BuildDatabase()
{
IList<int> baseVehicles = await _fitmentContext.Vehicles
.Select(v => v.BaseVehicleId)
.Distinct()
.OrderBy(i => i)
.ToListAsync();
foreach (int baseVehicleId in baseVehicles)
{
ApplicationSearch applicationSearch = new ApplicationSearch
{
VehicleIdentifier = new VehicleIdentifier
{
BaseVehicleId = baseVehicleId
},
MfrCode = new[] { "BOS", "TRI" },
PartType = new[] { new PartType { Id = 8852 } },
Criterion = new[]
{
new Criterion
{
Attribute = "REGION",
Id = 2
}
},
GroupBy = "PARTTYPE"
};
ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
if (response.ResponseBody != null)
{
foreach (App app in response.ResponseBody.App)
{
try
{
await _fitmentContext.Database.ExecuteSqlRawAsync("INSERT INTO Wiper (BaseVehicleId, LineCode, PartNumber, Position, PartName) VALUES ({0}, {1}, {2}, {3}, {4});",
baseVehicleId, app.MfrCode, Regex.Replace(app.Part, "[^a-zA-Z0-9]", string.Empty), app.Position, app.MfrLabel);
}
catch (Exception ex)
{
Console.WriteLine($"Could not save {app.MfrCode}, {app.Part}, {app.Position}, {app.MfrLabel} for {baseVehicleId}: {ex.Message}");
}
}
}
Console.WriteLine(baseVehicleId);
}
}
private async Task UpdateShopify()
{
foreach (string productType in new[] { "CA172-SC231-FL23107_(PS) Wipers - TRICO Neoform", "CA172-SC231-FL23109_(PS) Wipers - TRICO Tech/Exact Fit", "CA172-SC231-FL23110_Wiper Accessories", "CA172-SC231-FL23116_(PS) Wipers - Bosch Insight (Hybrid)", "CA172-SC231-FL23117_(PS) Wipers - Bosch Clear Advantage (Beam)" })
{
IEnumerable<Product> products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 }, { "product_type", productType } });
System.Diagnostics.Debug.WriteLine($"{productType}: Count: {products.Count()}");
while (products != null && products.Any())
{
foreach (Product product in products)
{
try
{
string partNumber = Regex.Replace(product.Title.Split(' ')[0], "[^a-zA-Z0-9]", string.Empty);
IList<Wiper> wipers = await _fitmentContext.Wipers
.Where(w => w.PartNumber == partNumber)
.OrderBy(w => w.Position)
.ToListAsync();
string currentPosition = wipers[0].Position;
List<int> vehicleIds = new List<int>();
foreach (Wiper wiper in wipers)
{
if (wiper.Position != currentPosition)
{
await SavePositionMetafield(product, vehicleIds, currentPosition);
currentPosition = wiper.Position;
vehicleIds = new List<int>();
}
IList<int> fitmentVehicleIds = _fitmentContext.Vehicles
.Where(v => v.BaseVehicleId == wiper.BaseVehicleId)
.Select(v => v.VehicleToEngineConfigId)
.Distinct()
.ToList();
vehicleIds.AddRange(fitmentVehicleIds);
}
await SavePositionMetafield(product, vehicleIds, currentPosition);
}
catch (Exception ex)
{
Console.WriteLine($"Could not update {product.Id}: {ex.Message}");
}
}
products = await _shopifyClient.Products.GetNext();
}
}
}
//[SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "It's a Shopify metafield key")]
private async Task SavePositionMetafield(Product product, IList<int> vehicleIds, string position)
{
if (vehicleIds.Count == 0)
{
return;
}
string json = JsonConvert.SerializeObject(vehicleIds);
if (json.Length >= 100000)
{
// TODO: Logging
return;
}
string key = position.ToLowerInvariant().Replace(" ", "_");
if (key.Length > 20)
{
key = key.Substring(0, 20);
}
Metafield vehicleMetafield = new Metafield
{
Namespace = "position",
Key = key,
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
System.Diagnostics.Debug.WriteLine(json);
await _shopifyClient.Metafields.Add(vehicleMetafield);
}
}
}

14
PartSource.Automation/Jobs/ProcessWhiVehicles.cs
View File

@@ -38,7 +38,7 @@ namespace PartSource.Automation.Jobs
public async Task Run()
{
_whiSeoService.TruncateVehicleTable();
_whiSeoService.TruncateVehicleTables();
_whiSeoService.GetFiles(_seoDataType);
string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
@@ -79,6 +79,9 @@ namespace PartSource.Automation.Jobs
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));
@@ -101,22 +104,27 @@ namespace PartSource.Automation.Jobs
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))
&& int.TryParse(columns[36], out int vehicleToEngineConfigId)
&& new[] { 5, 6, 7 }.Contains(vehicleTypeId))
{
dataTable.Rows.Add(new object[] { year, makeId, makeName, modelId, modelName, engineConfigId, engineDescription, baseVehicleId, vehicleToEngineConfigId, submodelId, submodelName });
dataTable.Rows.Add(new object[] { year, makeId, makeName, modelId, modelName, regionId, regionName, vehicleTypeId, engineConfigId, engineDescription, baseVehicleId, vehicleToEngineConfigId, submodelId, submodelName });
}
}

72
PartSource.Automation/Jobs/SyncronizeProducts.cs
View File

@@ -1,72 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PartSource.Data.Contexts;
using PartSource.Data.Models;
using Ratermania.Automation.Interfaces;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace PartSource.Automation.Jobs
{
/// <summary>
/// Ensures syncronization between Shopify IDs and Partsource SKUs
/// </summary>
public class SyncronizeProducts : IAutomationJob
{
private readonly PartSourceContext _partSourceContext;
private readonly ShopifyClient _shopifyClient;
private readonly ILogger<TestJob> _logger;
public SyncronizeProducts(ILogger<TestJob> logger, PartSourceContext partSourceContext, ShopifyClient shopifyClient)
{
_partSourceContext = partSourceContext;
_shopifyClient = shopifyClient;
_logger = logger;
}
public async Task Run()
{
IList<ImportData> importData = _partSourceContext.ImportData.FromSql<ImportData>($"SELECT * FROM ImportDataFilters").ToList();
IEnumerable<Product> products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
while (products?.Any() == true)
{
foreach (Product product in products)
{
foreach (Variant variant in product.Variants)
{
ImportData item = importData.FirstOrDefault(i => i.VariantSku == variant.Sku);
if (item != null)
{
_partSourceContext.Database.ExecuteSqlCommand($"UPDATE ImportDataFilters SET ShopifyId = {product.Id} WHERE VariantSku = {variant.Sku}");
}
}
}
try
{
_logger.LogInformation("Did 250");
//await _partSourceContext.SaveChangesAsync();
}
catch
{
Console.WriteLine("Failed to save a batch of products");
}
finally
{
products = await _shopifyClient.Products.GetNext();
}
}
}
}
}

56
PartSource.Automation/Jobs/UpdateFitment.cs
View File

@@ -38,19 +38,12 @@ namespace PartSource.Automation.Jobs
}
public async Task Run()
{
IList<string> productTypes = new List<string>
{
"CA108-SC349-FL34907_CV Shafts, New"
};
foreach (string type in productTypes)
{
IEnumerable<Product> products = null;
try
{
products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 }, { "product_type", "CA108-SC349-FL34907_CV Shafts, New" } });
products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
}
catch (Exception ex)
@@ -65,6 +58,12 @@ 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
@@ -84,24 +83,14 @@ namespace PartSource.Automation.Jobs
};
// }
//importData.PartNumber = product.Title.Split(' ')[0];
bool isFitment = false;
string bodyHtml = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("</ul>") + "</ul>".Length);
string bodyHtml = product.BodyHtml[..(product.BodyHtml.IndexOf("</ul>") + "</ul>".Length)];
IList<Vehicle> vehicles = _vehicleService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
//if (vehicles.Count > 250)
//{
// vehicles = vehicles.Take(250)
// .ToList();
// _logger.LogInformation($"SKU {importData.VariantSku} fits more than 250 vehicles. Only the first 250 will be used.");
//}
IList<int> vehicleIdFitment = _vehicleService.GetVehicleIdFitment(vehicles);
if (vehicleIdFitment.Count > 0)
if (vehicleIdFitment.Any())
{
string vehicleIdString = string.Join('-', vehicleIdFitment.Select(j => $"v{j}"));
@@ -110,8 +99,6 @@ namespace PartSource.Automation.Jobs
isFitment = true;
string json = JsonConvert.SerializeObject(vehicleIdFitment);
if (json.Length < 100000)
{
Metafield vehicleMetafield = new Metafield
{
Namespace = "fitment",
@@ -125,13 +112,6 @@ namespace PartSource.Automation.Jobs
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<string> ymmFitment = _vehicleService.GetYmmFitment(vehicles);
if (ymmFitment.Count > 0)
{
@@ -160,8 +140,6 @@ namespace PartSource.Automation.Jobs
bodyHtml += $"<div id=\"seoData\">{stringBuilder.ToString()}</div>";
string json = JsonConvert.SerializeObject(ymmFitment);
if (json.Length < 100000)
{
Metafield ymmMetafield = new Metafield
{
Namespace = "fitment",
@@ -175,13 +153,6 @@ namespace PartSource.Automation.Jobs
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
{
Namespace = "Flags",
@@ -204,7 +175,7 @@ namespace PartSource.Automation.Jobs
OwnerId = product.Id
};
//await _shopifyClient.Metafields.Add(lineCodeMetafield);
// await _shopifyClient.Metafields.Add(lineCodeMetafield);
Metafield partNumberMetafield = new Metafield
{
@@ -216,7 +187,7 @@ namespace PartSource.Automation.Jobs
OwnerId = product.Id
};
// await _shopifyClient.Metafields.Add(partNumberMetafield);
//await _shopifyClient.Metafields.Add(partNumberMetafield);
List<string> tags = new List<string>();
@@ -238,8 +209,9 @@ namespace PartSource.Automation.Jobs
tags.Add(zzzIsFitment);
//product.Tags = string.Join(',', tags);
product.Tags = string.Join(',', tags);
product.BodyHtml = bodyHtml;
await _shopifyClient.Products.Update(product);
importData.IsFitment = isFitment;
@@ -270,7 +242,5 @@ namespace PartSource.Automation.Jobs
}
}
}
;
}
}
}

67
PartSource.Automation/Jobs/UpdatePositioning.cs
View File

@@ -41,6 +41,8 @@ namespace PartSource.Automation.Jobs
IEnumerable<Product> products = await _shopifyClient.Products.Get(parameters);
int i = 1;
while (products != null && products.Any())
{
foreach (Product product in products)
@@ -94,41 +96,47 @@ namespace PartSource.Automation.Jobs
await SavePositionMetafield(product, vehicleIds, currentPosition);
//IList<string> notes = fitments.Select(f => f.NoteText)
IList<string> notes = fitments.Select(f => f.FitmentNoteHash)
.Distinct()
.ToList();
// .Distinct()
// .ToList();
IList<object> vehicleNotes = new List<object>();
//IList<object> vehicleNotes = new List<object>();
foreach (string noteHash in notes)
{
FitmentNote fitmentNote = await _fitmentContext.FitmentNotes.FirstOrDefaultAsync(f => f.Hash == noteHash);
//foreach (string noteText in notes)
//{
// vehicleIds = fitments.Where(f => f.NoteText == noteText)
// .Select(f => new { f.EngineConfigId, f.BaseVehicleId })
// .SelectMany(f => vehicles.Where(v => v.BaseVehicleId == f.BaseVehicleId && v.EngineConfigId == f.EngineConfigId))
// .Select(v => v.VehicleToEngineConfigId)
// .ToList();
if (fitmentNote == null)
{
continue;
}
// vehicleNotes.Add(new { noteText, vehicleIds });
//}
vehicleIds = fitments.Where(f => f.FitmentNoteHash == noteHash)
.Select(f => new { f.EngineConfigId, f.BaseVehicleId })
.SelectMany(f => vehicles.Where(v => v.BaseVehicleId == f.BaseVehicleId && v.EngineConfigId == f.EngineConfigId))
.Select(v => v.VehicleToEngineConfigId)
.ToList();
//string json = JsonConvert.SerializeObject(vehicleNotes);
//if (json.Length >= 100000)
//{
// continue;
//}
vehicleNotes.Add(new { fitmentNote.NoteText, vehicleIds });
}
//Metafield vehicleMetafield = new Metafield
//{
// Namespace = "fitment",
// Key = "note_text",
// Value = json,
// ValueType = "json_string",
// OwnerResource = "product",
// OwnerId = product.Id
//};
string json = JsonConvert.SerializeObject(vehicleNotes);
if (json.Length >= 100000)
{
continue;
}
//await _shopifyClient.Metafields.Add(vehicleMetafield);
Metafield vehicleMetafield = new Metafield
{
Namespace = "fitment",
Key = "note_text",
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
await _shopifyClient.Metafields.Add(vehicleMetafield);
//importData.UpdatedAt = DateTime.Now;
//importData.UpdateType = "Positioning";
@@ -142,6 +150,7 @@ namespace PartSource.Automation.Jobs
try
{
Console.WriteLine(i);
products = await _shopifyClient.Products.GetNext();
}
@@ -200,7 +209,7 @@ namespace PartSource.Automation.Jobs
OwnerId = product.Id
};
System.Diagnostics.Debug.WriteLine(json);
//System.Diagnostics.Debug.WriteLine(json);
await _shopifyClient.Metafields.Add(vehicleMetafield);
}

2
PartSource.Automation/Jobs/UpdatePricing.cs
View File

@@ -85,7 +85,7 @@ namespace PartSource.Automation.Jobs
product.Variants[i].Price = partPrice.Your_Price.Value;
product.Variants[i].CompareAtPrice = partPrice.Compare_Price.Value;
product.PublishedAt = partPrice.Active.Trim().ToUpperInvariant() == "Y" ? (DateTime?)DateTime.Now : null;
product.PublishedAt = partPrice.Active.Trim().ToUpperInvariant() == "Y" ? DateTime.Now : null;
product.PublishedScope = PublishedScope.Global;
//Metafield metafield = new Metafield

16
PartSource.Automation/PartSource.Automation.csproj
View File

@@ -7,17 +7,17 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.11" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.11" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.11" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.11" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.11" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Ratermania.Automation" Version="1.0.0" />
<PackageReference Include="Ratermania.Automation.Common" Version="1.0.0" />
<PackageReference Include="Ratermania.Shopify" Version="1.3.1" />

23
PartSource.Automation/Program.cs
View File

@@ -73,22 +73,28 @@ namespace PartSource.Automation
//options.ApiKey = "9a533dad460321c6ce8f30bf5b8691ed";
//options.ApiSecret = "dc9e28365d9858e544d57ac7af43fee7";
//options.ApiVersion = "2020-01";
//options.ApiVersion = "2021-01";
//options.ShopDomain = "dev-partsource.myshopify.com";
})
.AddAutomation(options =>
{
//options.HasBaseInterval(new TimeSpan(0, 15, 0))
// .HasMaxFailures(3)
// .HasJob<ExecuteSsisPackages>(options =>
// options.HasInterval(new TimeSpan(24, 0, 0))
// .StartsAt(DateTime.Today.AddHours(26))
// )
// .HasJob<UpdatePricing>(options =>
// options.HasInterval(new TimeSpan(24, 0, 0))
// .StartsAt(DateTime.Today.AddHours(27))
// .HasDependency<ExecuteSsisPackages>()
// );
options.HasBaseInterval(new TimeSpan(0, 15, 0))
.HasMaxFailures(3)
.HasJob<ExecuteSsisPackages>(options =>
.HasJob<UpdateWiperFitment>(options =>
options.HasInterval(new TimeSpan(24, 0, 0))
.StartsAt(DateTime.Today.AddHours(26))
)
.HasJob<UpdatePricing>(options =>
options.HasInterval(new TimeSpan(24, 0, 0))
.StartsAt(DateTime.Today.AddHours(27))
.HasDependency<ExecuteSsisPackages>()
);
//.AddApiServer();
})
@@ -101,7 +107,6 @@ namespace PartSource.Automation
.AddSingleton<VehicleService>()
.AddSingleton<NexpartService>()
.AddAutoMapper(typeof(PartSourceProfile));
})
.ConfigureLogging((builder, logging) =>

19
PartSource.Automation/Services/WhiSeoService.cs
View File

@@ -1,14 +1,13 @@
#pragma warning disable CA2100 // Review SQL queries for security vulnerabilities
using System;
using System.Collections.Generic;
using System.Data;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using PartSource.Automation.Models.Configuration;
using PartSource.Automation.Models.Enums;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Text;
namespace PartSource.Automation.Services
{
@@ -53,12 +52,12 @@ namespace PartSource.Automation.Services
}
}
public void TruncateVehicleTable()
public void TruncateVehicleTables()
{
using SqlConnection connection = new SqlConnection(_connectionString);
connection.Open();
using SqlCommand command = new SqlCommand($"truncate table dbo.Vehicle", connection);
using SqlCommand command = new SqlCommand($"exec DropVehicleTables", connection);
command.ExecuteNonQuery();
}
@@ -151,16 +150,10 @@ namespace PartSource.Automation.Services
using SqlCommand command = new SqlCommand($"exec CreateFitmentView", connection);
command.CommandTimeout = 1800;
command.ExecuteNonQuery();
using SqlCommand command2 = new SqlCommand($"exec CreateFitmentIndexes", connection);
command.CommandTimeout = 1800;
command2.ExecuteNonQuery();
}
public void CreateVehicleTable()
{
return;
using SqlConnection connection = new SqlConnection(_connectionString);
connection.Open();

7
PartSource.Data/Contexts/FitmentContext.cs
View File

@@ -15,18 +15,23 @@ namespace PartSource.Data.Contexts
public DbSet<Fitment> Fitments { get; set; }
public DbSet<FitmentNote> FitmentNotes { get; set; }
public DbSet<Vehicle> Vehicles { get; set; }
public DbSet<Wiper> Wipers { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
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<Wiper>().HasKey(f => new { f.BaseVehicleId, f.PartNumber, f.LineCode, f.Position});
foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
{
entityType.Relational().TableName = entityType.ClrType.Name;
entityType.SetTableName(entityType.ClrType.Name);
}
}
}

23
PartSource.Data/Contexts/PartSourceContext.cs
View File

@@ -14,9 +14,7 @@ namespace PartSource.Data.Contexts
public DbSet<ApiClient> ApiClients { get; set; }
public DbSet<ProductBackup> ProductBackups { get; set; }
public DbSet<Manufacturer> Manufacturers { get; set; }
public DbSet<DcfMapping> DcfMappings { get; set; }
public DbSet<ImportData> ImportData { get; set; }
@@ -36,27 +34,22 @@ namespace PartSource.Data.Contexts
public DbSet<PartsAvailability> PartAvailabilities { get; set; }
public DbQuery<BaseVehicle> BaseVehicles { get; set; }
public DbSet<BaseVehicle> BaseVehicles { get; set; }
public DbQuery<Engine> Engines { get; set; }
public DbSet<Engine> Engines { get; set; }
public DbQuery<Submodel> Submodels { get; set; }
public DbSet<Submodel> Submodels { get; set; }
public DbQuery<VehicleMake> VehicleMakes { get; set; }
public DbSet<VehicleMake> VehicleMakes { get; set; }
public DbQuery<VehicleModel> VehicleModels { get; set; }
public DbSet<VehicleModel> VehicleModels { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.Query<BaseVehicle>().ToView(nameof(BaseVehicle));
modelBuilder.Query<Engine>().ToView(nameof(Engine));
modelBuilder.Query<Submodel>().ToView(nameof(Submodel));
modelBuilder.Query<VehicleMake>().ToView(nameof(VehicleMake));
modelBuilder.Query<VehicleModel>().ToView(nameof(VehicleModel));
modelBuilder.Entity<PartsAvailability>().HasKey(p => new { p.Store, p.SKU });
modelBuilder.Entity<DcfMapping>().HasKey(d => new { d.LineCode, d.WhiCode });
modelBuilder.Entity<ShopifyChangelog>()
.Property(s => s.ResourceType)
@@ -68,7 +61,7 @@ namespace PartSource.Data.Contexts
foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
{
entityType.Relational().TableName = entityType.ClrType.Name;
entityType.SetTableName(entityType.ClrType.Name);
}
}

2
PartSource.Data/Models/BaseVehicle.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
@@ -7,6 +8,7 @@ namespace PartSource.Data.Models
{
public class BaseVehicle
{
[Key]
public int BaseVehicleId { get; set; }
public string Make { get; set; }

3
PartSource.Data/Models/Engine.cs
View File

@@ -1,13 +1,16 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Security.Cryptography;
using System.Text;
namespace PartSource.Data.Models
{
public class Engine
{
[Key]
public int EngineConfigId { get; set; }
public string Description { get; set; }

17
PartSource.Data/Models/FitmentNote.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PartSource.Data.Models
{
public class FitmentNote
{
public string NoteText { get; set; }
[Key]
public string Hash { get; set; }
}
}

21
PartSource.Data/Models/Part.cs
View File

@@ -1,27 +1,14 @@
// Decompiled with JetBrains decompiler
// Type: PartSource.Data.Models.Part
// Assembly: PartSource.Data, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
// MVID: 3EDAB3F5-83E7-4F65-906E-B40192014C57
// Assembly location: C:\Users\Tommy\Desktop\PS temp\PartSource.Data.dll
using System.ComponentModel.DataAnnotations;
namespace PartSource.Data.Models
{
public class Part
{
public int Id { get; set; }
[Key]
public string Sku { get; set; }
public int ManufacturerId { get; set; }
public long? ShopifyId { get; set; }
public int Sku { get; set; }
public string LineCode { get; set; }
public string PartNumber { get; set; }
public string Name { get; set; }
public string Description { get; set; }
public Manufacturer Manufacturer { get; set; }
}
}

1
PartSource.Data/Models/Submodel.cs
View File

@@ -9,6 +9,7 @@ namespace PartSource.Data.Models
{
public class Submodel
{
[Key]
public int SubmodelId { get; set; }
public string Name { get; set; }

2
PartSource.Data/Models/VehicleMake.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
@@ -8,6 +9,7 @@ namespace PartSource.Data.Models
public class VehicleMake
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
[Key]
public int MakeId { get; set; }
public string Name { get; set; }

2
PartSource.Data/Models/VehicleModel.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
@@ -9,6 +10,7 @@ namespace PartSource.Data.Models
public class VehicleModel
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
[Key]
public int ModelId { get; set; }
public int Year { get; set; }

21
PartSource.Data/Models/Wiper.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PartSource.Data.Models
{
public class Wiper
{
public int BaseVehicleId { get; set; }
public string LineCode { get; set; }
public string PartNumber { get; set; }
public string Position { get; set; }
public string PartName { get; set; }
}
}

30
PartSource.Data/Nexpart/App.cs Normal file
View File

@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;
using Newtonsoft.Json;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class App
{
[XmlElement]
[JsonProperty("lineCode")]
public string MfrCode { get; set; }
[XmlElement]
[JsonProperty("description")]
public string MfrLabel { get; set; }
[XmlElement]
[JsonProperty("position")]
public string Position { get; set; }
[XmlElement]
[JsonProperty("partNumber")]
public string Part { get; set; }
}
}

39
PartSource.Data/Nexpart/ApplicationSearch.cs Normal file
View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
public class ApplicationSearch
{
public ApplicationSearch()
{
PSRequestHeader = new PSRequestHeader();
}
[XmlElement(Order = 1)]
public PSRequestHeader PSRequestHeader { get; set; }
[XmlElement(Order = 2)]
public VehicleIdentifier VehicleIdentifier { get; set; }
[XmlElement(Order = 3)]
public string[] MfrCode { get; set; }
[XmlElement(Order = 4)]
public PartType[] PartType { get; set; }
[XmlElement(Order = 5)]
public bool SecondaryDCF => true;
[XmlElement(Order = 6)]
public Criterion[] Criterion { get; set; }
[XmlElement(Order = 7)]
public string GroupBy { get; set; }
}
}

13
PartSource.Data/Nexpart/BuyersGuideSearchResponse.cs → PartSource.Data/Nexpart/ApplicationSearchResponse.cs
View File

@@ -1,18 +1,21 @@
using PartSource.Data.Nexpart.Interfaces;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;
using PartSource.Data.Nexpart.Interfaces;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
public class BuyersGuideSearchResponse : IResponseElement<BuyersGuideData>
public class ApplicationSearchResponse : IResponseElement<Apps>
{
[XmlElement]
public PSResponseHeader PSResponseHeader { get; set; }
[XmlElement(ElementName = "BuyersGuideData")]
public BuyersGuideData ResponseBody { get; set; }
[XmlElement(ElementName = nameof(Apps))]
public Apps ResponseBody { get; set; }
}
}

11
PartSource.Data/Nexpart/Apps.cs
View File

@@ -1,14 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
using System.Xml.Serialization;
using Newtonsoft.Json;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class Apps
{
[XmlElement]
public BuyersGuideMake[] Make { get; set; }
[XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
[JsonProperty("wipers")]
public App[] App { get; set; }
}
}

4
PartSource.Data/Nexpart/Body.cs
View File

@@ -11,12 +11,12 @@ namespace PartSource.Data.Nexpart
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
public class Body
{
[XmlElement(ElementName = "ApplicationSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearch))]
[XmlElement(ElementName = "ApplicationSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearchResponse))]
[XmlElement(ElementName = "BaseVehicleDetailLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookup))]
[XmlElement(ElementName = "BaseVehicleDetailLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookupResponse))]
[XmlElement(ElementName = "BaseVehicleSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearch))]
[XmlElement(ElementName = "BaseVehicleSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearchResponse))]
[XmlElement(ElementName = "BuyersGuideSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BuyersGuideSearch))]
[XmlElement(ElementName = "BuyersGuideSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BuyersGuideSearchResponse))]
[XmlElement(ElementName = "EngineSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearch))]
[XmlElement(ElementName = "EngineSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearchResponse))]
[XmlElement(ElementName = "MakeSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MakeSearch))]

14
PartSource.Data/Nexpart/BuyersGuideData.cs
View File

@@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
public class BuyersGuideData
{
[XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public Apps Apps { get; set; }
}
}

20
PartSource.Data/Nexpart/BuyersGuideEngine.cs
View File

@@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class BuyersGuideEngine
{
[XmlAttribute]
public string Desc { get; set; }
[XmlAttribute]
public int PerVehicle { get; set; }
[XmlAttribute]
public int Year { get; set; }
}
}

26
PartSource.Data/Nexpart/BuyersGuideMake.cs
View File

@@ -1,26 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class BuyersGuideMake
{
[XmlAttribute]
public string Name { get; set; }
[XmlAttribute]
public int FromYear { get; set; }
[XmlAttribute]
public int ToYear { get; set; }
[XmlAttribute]
public int MakeCount { get; set; }
[XmlElement]
public BuyersGuideModel[] Model { get; set; }
}
}

26
PartSource.Data/Nexpart/BuyersGuideModel.cs
View File

@@ -1,26 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class BuyersGuideModel
{
[XmlAttribute]
public string Name { get; set; }
[XmlAttribute]
public int FromYear { get; set; }
[XmlAttribute]
public int ToYear { get; set; }
[XmlAttribute]
public int ModelCount { get; set; }
[XmlElement]
public BuyersGuideEngine[] Engine { get; set; }
}
}

17
PartSource.Data/Nexpart/BuyersGuidePart.cs
View File

@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
public class BuyersGuidePart
{
[XmlAttribute]
public string PartNumber { get; set; }
[XmlAttribute]
public string MfrCode { get; set; }
}
}

22
PartSource.Data/Nexpart/BuyersGuideSearch.cs
View File

@@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Serialization;
namespace PartSource.Data.Nexpart
{
[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
public class BuyersGuideSearch
{
public BuyersGuideSearch()
{
PSRequestHeader = new PSRequestHeader();
}
[XmlElement(Order = 1)]
public PSRequestHeader PSRequestHeader { get; set; }
[XmlElement(Order = 2)]
public BuyersGuidePart Part { get; set; }
}
}

6
PartSource.Data/Nexpart/PartType.cs
View File

@@ -13,11 +13,5 @@ namespace PartSource.Data.Nexpart
{
[XmlAttribute]
public int Id { get; set; }
[XmlAttribute]
public int PositionGroupId { get; set; }
[XmlAttribute]
public string Description { get; set; }
}
}

11
PartSource.Data/PartSource.Data.csproj
View File

@@ -17,10 +17,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

159
PartSource.Services/FitmentService.cs Normal file
View File

@@ -0,0 +1,159 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using PartSource.Data.Contexts;
using PartSource.Data.Dtos;
using PartSource.Data.Models;
namespace PartSource.Services
{
public class FitmentService
{
private readonly FitmentContext _fitmentContext;
public FitmentService(FitmentContext fitmentContext)
{
_fitmentContext = fitmentContext;
}
public IList<string> GetYmmFitment(IList<Vehicle> vehicles)
{
if (vehicles.Count == 0)
{
return new string[0];
}
IList<string> fitmentTags = new List<string>();
IList<string> makeModels = vehicles.OrderBy(v => v.MakeName).ThenBy(v => v.ModelName).Select(v => $"{v.MakeName},{v.ModelName}").Distinct().ToList();
foreach (string makeModel in makeModels)
{
string make = makeModel.Split(',')[0];
string model = makeModel.Split(',')[1];
List<string> years = vehicles
.Where(v => v.MakeName == make && v.ModelName == model)
.OrderBy(v => v.Year)
.Select(v => v.Year.ToString().Trim())
.Distinct()
.ToList();
string tag = $"{string.Join('-', years)} {make.Trim()} {model.Trim()}";
System.Diagnostics.Debug.WriteLine(tag);
fitmentTags.Add(tag);
}
return fitmentTags;
}
public IList<string> GetYmmFitmentRange(IList<Vehicle> vehicles)
{
if (vehicles.Count == 0)
{
return new string[0];
}
IList<string> fitmentTags = new List<string>();
IList<string> makeModels = vehicles.Select(v => $"{v.MakeName},{v.ModelName}").Distinct().ToList();
foreach (string makeModel in makeModels)
{
string make = makeModel.Split(',')[0];
string model = makeModel.Split(',')[1];
int minYear = vehicles
.Where(v => v.MakeName == make && v.ModelName == model)
.Min(v => v.Year);
int maxYear = vehicles
.Where(v => v.MakeName == make && v.ModelName == model)
.Max(v => v.Year);
string tag = minYear == maxYear
? $"{minYear} {make.Trim()} {model.Trim()}"
: $"{minYear}-{maxYear} {make.Trim()} {model.Trim()}";
System.Diagnostics.Debug.WriteLine(tag);
fitmentTags.Add(tag);
}
return fitmentTags;
}
public IList<int> GetVehicleIdFitment(IList<Vehicle> vehicles)
{
return vehicles.Select(v => v.VehicleToEngineConfigId).Distinct().ToList();
}
public IList<Vehicle> GetVehiclesForPart(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<Vehicle> 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) => v)
.Distinct()
.OrderByDescending(x => x.Year);
if (maxVehicles > 0)
{
vehicles = vehicles.Take(maxVehicles);
}
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();
}
}
}

4
PartSource.Services/NexpartService.cs
View File

@@ -19,8 +19,6 @@ namespace PartSource.Services
XmlSerializer serializer = new XmlSerializer(typeof(Envelope));
StringBuilder sb = new StringBuilder();
using (TextWriter textWriter = new StringWriter(sb))
{
serializer.Serialize(textWriter, (object)envelope);
@@ -37,7 +35,9 @@ namespace PartSource.Services
HttpResponseMessage response = await client.PostAsync("http://acespssprod.nexpart.com:8081/partselect/1.0/services/PartSelectService.PartSelectHttpSoap11Endpoint/", new StringContent(textWriter.ToString(), Encoding.UTF8));
Stream result = await response.Content.ReadAsStreamAsync();
string str = await response.Content.ReadAsStringAsync();
content = (U)((Envelope)serializer.Deserialize(result)).Body.Content;
;
}
catch (Exception ex)
{

27
PartSource.Services/PartService.cs
View File

@@ -10,7 +10,6 @@ using System.Threading.Tasks;
namespace PartSource.Services
{
[Obsolete]
public class PartService
{
private readonly PartSourceContext _context;
@@ -20,31 +19,21 @@ namespace PartSource.Services
_context = context;
}
public Part GetPart(string partNumber, string lineCode)
{
return _context.Parts.FirstOrDefault(p => p.PartNumber == partNumber && p.Manufacturer.LineCode == lineCode);
}
public Part GetPart(int sku)
{
return _context.Parts.FirstOrDefault(p => p.Sku == sku);
}
public async Task<PartsAvailability> GetInventory(int sku, int storeNumber)
{
return await _context.PartAvailabilities.FirstOrDefaultAsync(s => s.Store == storeNumber && s.SKU == sku);
}
public IList<Fitment> GetFitments(FitmentSearchDto fitmentSearchDto)
public async Task<Part> GetPartBySku(string sku)
{
return null;
return await _context.Parts.SingleOrDefaultAsync(p => p.Sku == sku);
}
//return _context.Fitments.Where(f =>
// f.ManufacturerCode == fitmentSearchDto.ManufacturerCode &&
// f.PartNumber == fitmentSearchDto.PartNumber &&
// f.BaseVehicleId == fitmentSearchDto.BaseVehicleId &&
// f.EngineConfigId == fitmentSearchDto.EngineConfigId
//).ToList();
public async Task<IList<DcfMapping>> GetDcfMapping(string partsourceLineCode)
{
return await _context.DcfMappings
.Where(dcf => dcf.LineCode == partsourceLineCode)
.ToListAsync();
}
}
}

10
PartSource.Services/PartSource.Services.csproj
View File

@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Ratermania.Shopify" Version="1.3.1" />
</ItemGroup>
@@ -21,10 +21,4 @@
<ProjectReference Include="..\PartSource.Data\PartSource.Data.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

22
PartSource.Services/appsettings.json
View File

@@ -1,22 +0,0 @@
{
"ConnectionStrings": {
//"PartSourceDatabase": "Server=(localdb)\\mssqllocaldb;Database=PartSource;Trusted_Connection=True;"
"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;"
},
"emailConfiguration": {
"From": "alerts@ps-shopify.canadaeast.cloudapp.azure.com",
// "To": "tom@soundpress.com,Anas.Bajwa@Partsource.ca",
"To": "tommy@localhost",
"SmtpHost": "localhost"
},
"ftpConfiguration": {
"Username": "ps-ftp\\$ps-ftp",
"Password": "ycvXptffBxqkBXW4vuRYqn4Zi1soCvnvMMolTe5HNSeAlcl3bAyJYtNhG579",
"Url": "ftp://waws-prod-yq1-007.ftp.azurewebsites.windows.net/site/wwwroot",
"Destination": "C:\\Users\\soundpress\\Desktop"
},
"ssisConfiguration": {
"Directory": "c:\\users\\soundpress\\desktop"
}
}