This commit is contained in:
2020-09-02 20:53:34 -04:00
parent 85d99d2615
commit d06925204d
38 changed files with 913 additions and 679 deletions

View File

@@ -1,13 +0,0 @@
[*.cs]
# CA1307: Specify StringComparison
dotnet_diagnostic.CA1307.severity = suggestion
# CA1031: Do not catch general exception types
dotnet_diagnostic.CA1031.severity = none
# CA2007: Consider calling ConfigureAwait on the awaited task
dotnet_diagnostic.CA2007.severity = silent
# CA1303: Do not pass literals as localized parameters
dotnet_diagnostic.CA1303.severity = silent

View File

@@ -3,8 +3,8 @@ using PartSource.Automation.Jobs.Interfaces;
using PartSource.Automation.Models;
using PartSource.Data;
using PartSource.Data.Models;
using PartSource.Services.Integrations;
using Ratermania.Shopify.Entities;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -26,9 +26,11 @@ namespace PartSource.Automation.Jobs
public async Task<AutomationJobResult> Run()
{
//await SyncronizeIdsAndSkus();
//throw new Exception("You need to add a ProductVariant resource to the Shopify client");
await SyncronizeIdsAndSkus();
//await AddSkus();
await AddVariants();
// await AddVariants();
return new AutomationJobResult
{
@@ -49,7 +51,7 @@ namespace PartSource.Automation.Jobs
{
foreach (Product product in products)
{
foreach (ProductVariant variant in product.Variants)
foreach (Variant variant in product.Variants)
{
ImportData importData = _partSourceContext.ImportData.FirstOrDefault(i => i.VariantSku == variant.Sku);
@@ -119,20 +121,20 @@ namespace PartSource.Automation.Jobs
items[0].PartNumber,
};
List<ProductVariant> productVariants = new List<ProductVariant>();
//List<ProductVariant> productVariants = new List<ProductVariant>();
//foreach (ImportData itemVariant in items)
////foreach (ImportData itemVariant in items)
////{
//productVariants.Add(new ProductVariant
//{
productVariants.Add(new ProductVariant
{
InventoryPolicy = "Deny",
CompareAtPrice = importData.CompareAt,
Price = importData.Price,
Sku = importData.VariantSku,
Title = importData.VariantTitle ?? importData.Title,
Option1 = importData.VariantTitle,
RequiresShipping = false,
});
// InventoryPolicy = "Deny",
// CompareAtPrice = importData.CompareAt,
// Price = importData.Price,
// Sku = importData.VariantSku,
// Title = importData.VariantTitle ?? importData.Title,
// Option1 = importData.VariantTitle,
// RequiresShipping = false,
//});
//}
@@ -146,7 +148,7 @@ namespace PartSource.Automation.Jobs
Published = true,
//ProductType = importData.FINELINE_NM,
Images = productImages.ToArray(),
Variants = productVariants.ToArray(),
//Variants = productVariants.ToArray(),
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
};
@@ -234,21 +236,21 @@ namespace PartSource.Automation.Jobs
items[0].PartNumber,
};
List<ProductVariant> productVariants = new List<ProductVariant>();
//List<ProductVariant> productVariants = new List<ProductVariant>();
foreach (ImportData itemVariant in items)
{
productVariants.Add(new ProductVariant
{
InventoryPolicy = "Deny",
CompareAtPrice = itemVariant.CompareAt,
Price = itemVariant.Price,
Sku = itemVariant.VariantSku,
Title = itemVariant.VariantTitle,
Option1 = itemVariant.VariantTitle,
RequiresShipping = false,
});
}
//foreach (ImportData itemVariant in items)
//{
// productVariants.Add(new ProductVariant
// {
// InventoryPolicy = "Deny",
// CompareAtPrice = itemVariant.CompareAt,
// Price = itemVariant.Price,
// Sku = itemVariant.VariantSku,
// Title = itemVariant.VariantTitle,
// Option1 = itemVariant.VariantTitle,
// RequiresShipping = false,
// });
//}
Product requestData = new Product
@@ -260,7 +262,7 @@ namespace PartSource.Automation.Jobs
Published = true,
//ProductType = importData.FINELINE_NM,
Images = productImages.ToArray(),
Variants = productVariants.ToArray(),
//Variants = productVariants.ToArray(),
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
};

View File

@@ -1,8 +1,8 @@
using PartSource.Automation.Jobs.Interfaces;
using PartSource.Automation.Models;
using PartSource.Data;
using PartSource.Services.Integrations;
using Ratermania.Shopify.Entities;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@@ -7,7 +7,6 @@ using PartSource.Data;
using PartSource.Data.Models;
using PartSource.Data.Nexpart;
using PartSource.Services;
using PartSource.Services.Integrations;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -18,7 +17,8 @@ using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Ratermania.Shopify.Entities;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
namespace PartSource.Automation.Jobs
{
@@ -40,110 +40,128 @@ namespace PartSource.Automation.Jobs
public async Task<AutomationJobResult> Run()
{
IList<ImportData> parts = _partSourceContext.ImportData.Where(i => new[] { "Raybestos Brakes", "MotoMaster", "Pro Series OE Plus Brake Pads" }.Contains(i.Vendor)).ToList();
IList<ImportData> parts = _partSourceContext.ImportData
.Where(p => p.UpdatedAt < DateTime.Now.AddDays(-3))
.Take(50)
.ToList();
foreach (ImportData importData in parts)
while (parts != null && parts.Count > 0)
{
try
foreach (ImportData importData in parts)
{
Product product = await _shopifyClient.Products.GetById((long)importData.ShopifyId);
if (product == null)
try
{
continue;
}
bool isFitment = false;
IList<Vehicle> vehicles = _vehicleService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
IList<int> vehicleIdFitment = _vehicleService.GetVehicleIdFitment(vehicles);
if (vehicleIdFitment.Count > 0)
{
isFitment = true;
string json = JsonConvert.SerializeObject(vehicleIdFitment);
if (json.Length >= 100000)
Product product = await _shopifyClient.Products.GetById(importData.ShopifyId.GetValueOrDefault());
if (product == null)
{
continue;
}
Metafield vehicleMetafield = new Metafield
bool isFitment = false;
IList<Vehicle> vehicles = _vehicleService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
IList<int> vehicleIdFitment = _vehicleService.GetVehicleIdFitment(vehicles);
if (vehicleIdFitment.Count > 0)
{
Namespace = "fitment",
Key = "ids",
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
isFitment = true;
await _shopifyClient.Metafields.Add(vehicleMetafield);
}
string json = JsonConvert.SerializeObject(vehicleIdFitment);
if (json.Length >= 100000)
{
continue;
}
IList<string> ymmFitment = _vehicleService.GetYmmFitment(vehicles);
if (ymmFitment.Count > 0)
{
isFitment = true;
Metafield vehicleMetafield = new Metafield
{
Namespace = "fitment",
Key = "ids",
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
string json = JsonConvert.SerializeObject(ymmFitment);
if (json.Length >= 100000)
{
continue;
await _shopifyClient.Metafields.Add(vehicleMetafield);
}
Metafield ymmMetafield = new Metafield
IList<string> ymmFitment = _vehicleService.GetYmmFitment(vehicles);
if (ymmFitment.Count > 0)
{
Namespace = "fitment",
Key = "seo",
Value = json,
ValueType = "json_string",
isFitment = true;
string json = JsonConvert.SerializeObject(ymmFitment);
if (json.Length >= 100000)
{
continue;
}
Metafield ymmMetafield = new Metafield
{
Namespace = "fitment",
Key = "seo",
Value = json,
ValueType = "json_string",
OwnerResource = "product",
OwnerId = product.Id
};
await _shopifyClient.Metafields.Add(ymmMetafield);
}
Metafield isFitmentMetafield = new Metafield
{
Namespace = "Flags",
Key = "IsFitment",
Value = isFitment.ToString(),
ValueType = "string",
OwnerResource = "product",
OwnerId = product.Id
};
await _shopifyClient.Metafields.Add(ymmMetafield);
}
await _shopifyClient.Metafields.Add(isFitmentMetafield);
Metafield isFitmentMetafield = new Metafield
{
Namespace = "Flags",
Key = "IsFitment",
Value = isFitment.ToString(),
ValueType = "string",
OwnerResource = "product",
OwnerId = product.Id
};
await _shopifyClient.Metafields.Add(isFitmentMetafield);
List<string> tags = new List<string>
List<string> tags = new List<string>
{
importData.LineCode,
importData.PartNumber
};
for (int i = 0; i < vehicleIdFitment.Count; i += 25)
{
tags.Add(string.Join('-', vehicleIdFitment.Skip(i).Take(25).Select(i => $"v{i}")));
for (int j = 0; j < vehicleIdFitment.Count; j += 25)
{
tags.Add(string.Join('-', vehicleIdFitment.Skip(j).Take(25).Select(j => $"v{j}")));
}
tags.AddRange(ymmFitment);
if (tags.Count > 250)
{
tags = tags.Take(250).ToList();
}
product.Tags = string.Join(',', tags);
await _shopifyClient.Products.Update(product);
importData.UpdatedAt = DateTime.Now;
importData.UpdateType = "Fitment";
}
tags.AddRange(ymmFitment);
if (tags.Count > 250)
catch (Exception ex)
{
tags = tags.Take(250).ToList();
if (!ex.Message.Contains("response content", StringComparison.InvariantCultureIgnoreCase))
{
Console.WriteLine($"{importData.VariantSku}: {ex.Message}");
}
}
product.Tags = string.Join(',', tags);
await _shopifyClient.Products.Update(product);
}
catch (Exception ex)
{
Console.WriteLine($"{importData.VariantSku}: {ex.Message}");
}
await _partSourceContext.SaveChangesAsync();
parts = _partSourceContext.ImportData
.Where(p => p.UpdatedAt < DateTime.Now.AddDays(-3))
.Take(50)
.ToList();
}

View File

@@ -5,13 +5,12 @@ using PartSource.Automation.Models;
using PartSource.Data;
using PartSource.Data.Models;
using PartSource.Services;
using PartSource.Services.Integrations;
using Ratermania.Shopify.Entities;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;

View File

@@ -2,8 +2,9 @@
using PartSource.Automation.Models;
using PartSource.Data;
using PartSource.Data.Models;
using PartSource.Services.Integrations;
using Ratermania.Shopify.Entities;
using Ratermania.Shopify;
using Ratermania.Shopify.Resources;
using Ratermania.Shopify.Resources.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -49,7 +50,7 @@ namespace PartSource.Automation.Jobs
{
if (product.Variants.Length > 0)
{
ProductVariant variant = product.Variants[0];
Variant variant = product.Variants[0];
PartPrice partPrice = _partSourceContext.PartPrices.Where(p => p.SKU == variant.Sku).FirstOrDefault();
if (partPrice == null || !partPrice.Your_Price.HasValue || !partPrice.Compare_Price.HasValue)
@@ -64,6 +65,8 @@ namespace PartSource.Automation.Jobs
product.Variants[0].Price = partPrice.Your_Price.Value;
product.Variants[0].CompareAtPrice = partPrice.Compare_Price.Value;
product.PublishedAt = partPrice.Active.ToUpperInvariant() == "Y" ? DateTime.Now : default;
Metafield metafield = new Metafield
{
Namespace = "Pricing",
@@ -76,6 +79,7 @@ namespace PartSource.Automation.Jobs
try
{
await _shopifyClient.Metafields.Add(metafield);
await _shopifyClient.Products.Update(product);
updateCount++;

View File

@@ -3,11 +3,12 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms>
<Configurations>Debug;Release;Also Debug</Configurations>
</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">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -15,10 +16,10 @@
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="Ratermania.Shopify" Version="1.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\shopify\Shopify\Shopify.csproj" />
<ProjectReference Include="..\PartSource.Data\PartSource.Data.csproj" />
<ProjectReference Include="..\PartSource.Services\PartSource.Services.csproj" />
</ItemGroup>

View File

@@ -1,29 +1,23 @@
using PartSource.Services;
using PartSource.Automation.Factories;
using PartSource.Automation.Jobs.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.FileExtensions;
using Microsoft.Extensions.Configuration.Json;
using PartSource.Data;
using System.IO;
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using PartSource.Automation.Models.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PartSource.Automation.Factories;
using PartSource.Automation.Jobs;
using PartSource.Automation.Services;
using PartSource.Services.Integrations;
using Ratermania.Shopify.DependencyInjection;
using PartSource.Automation.Jobs.Interfaces;
using PartSource.Automation.Models;
using PartSource.Automation.Models.Configuration;
using PartSource.Automation.Services;
using PartSource.Data;
using PartSource.Data.AutoMapper;
using PartSource.Services;
using Ratermania.Shopify;
using Ratermania.Shopify.DependencyInjection;
using System;
using System.IO;
namespace PartSource.Automation
{
internal class Program
{ internal class Program
{
private static void Main(string[] args)
@@ -86,13 +80,15 @@ namespace PartSource.Automation
options.UseSqlServer(configuration.GetConnectionString("PartSourceDatabase"), opts => opts.EnableRetryOnFailure())
)
.AddShopify<ShopifyClient>(options => {
.AddShopify(options =>
{
options.ApiKey = configuration["Shopify:ApiKey"];
options.ApiSecret = configuration["Shopify:ApiSecret"];
options.ApiVersion = "2020-01";
options.ShopDomain = configuration["Shopify:ShopDomain"];
})
.AddAutoMapper(typeof(PartSourceProfile))
.AddSingleton(emailConfiguration)
.AddSingleton(ftpConfiguration)

View File

@@ -2,7 +2,7 @@
"profiles": {
"PartSource.Automation": {
"commandName": "Project",
"commandLineArgs": "UpdatePositioning",
"commandLineArgs": "AddAndUpdateProducts",
"environmentVariables": {
"PS_AUTOMATION_ENVIRONMENT": "development"
}

View File

@@ -1,7 +1,7 @@
{
"ConnectionStrings": {
"PartSourceDatabase": "Server=localhost;Database=ps-whi-stage;Integrated Security=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=True;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
//"PartSourceDatabase": "Server=localhost;Database=ps-whi-stage;Integrated Security=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=True;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
},
"emailConfiguration": {