Pricing updates

Reviewed-on: #2

PartSource.Api/Controllers/InventoryController.cs

@@ -1,8 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using PartSource.Data.Models;
 using PartSource.Services;
-using System.Net;
-using System.Threading.Tasks;
 
 namespace PartSource.Api.Controllers
 {
@@ -23,7 +22,7 @@ namespace PartSource.Api.Controllers
         [Route("sku/{sku}/storeNumber/{storeNumber}")]
         public async Task<ActionResult> GetInventory(int sku, int storeNumber)
         {
-            PartsAvailability inventory = await _inventoryService.GetInventory(sku, storeNumber);
+            PartAvailability inventory = await _inventoryService.GetInventory(sku, storeNumber);
 
             if (inventory == null)
             {
@@ -36,7 +35,8 @@ namespace PartSource.Api.Controllers
                 {
                     StoreNumber = inventory.Store,
                     Sku = sku,
-                    Quantity = inventory.QTY
+                    Quantity = inventory.QTY,
+                    Updated = inventory.Updated
                 }
             });
         }

PartSource.Api/Controllers/PartsController.cs

@@ -4,6 +4,7 @@ using PartSource.Data.Dtos;
 using PartSource.Data.Models;
 using PartSource.Data.Nexpart;
 using PartSource.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -19,12 +20,100 @@ namespace PartSource.Api.Controllers
         private readonly NexpartService _nexpartService;
         private readonly PartService _partService;
         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;
             _partService = partService;
             _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();
+            }
+
+            try
+            {
+                string[] segments = vehicleFitment.NoteText.Split(']');
+                vehicleFitment.PartDescription = segments[0].TrimStart('[');
+                vehicleFitment.DriveTypes = GetDriveTypesFromNote(vehicleFitment.NoteText);
+                vehicleFitment.Notes = segments[1].Split(';')
+                    .Select(n => n.Trim())
+                    .ToList();
+            }
+
+            catch
+            {
+                throw new InvalidOperationException($"The note_text field provided by WHI for {vehicleFitment.LineCode} {vehicleFitment.PartNumber} was in an invalid format.");
+            }
+
+            SmartPageDataSearch smartPageDataSearch = new SmartPageDataSearch
+            {
+                Items = new[]
+                {
+                    new Item { PartNumber = vehicleFitment.PartNumber, MfrCode = vehicleFitment.LineCode }
+                }
+            };
+
+            SmartPageDataSearchResponse smartPageResponse = await _nexpartService.SendRequest<SmartPageDataSearch, SmartPageDataSearchResponse>(smartPageDataSearch);
+            if (smartPageResponse.ResponseBody?.Item != null)
+            {
+                PartType[] partTypes = smartPageResponse.ResponseBody.Item.Select(i => new PartType
+                {
+                    Id = i.Part.PartType.Id
+                })
+                .ToArray();
+
+                ApplicationSearch applicationSearch = new ApplicationSearch
+                {
+                    VehicleIdentifier = new VehicleIdentifier
+                    {
+                        BaseVehicleId = vehicleFitment.BaseVehicleId,
+                        EngineConfigId = vehicleFitment.EngineConfigId
+                    },
+                    MfrCode = new[] { vehicleFitment.LineCode },
+                    PartType = partTypes,
+                    GroupBy = "MFR",
+                    QuestionOption = "QUESTION_OTHERWISE_APP"
+                };
+
+                ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
+                if (response.ResponseBody != null && response.ResponseBody is Questions)
+                {
+                    Question driveTypeQuestion = ((Questions)response.ResponseBody).Question
+                        .Where(q => q.Attribute == "DRIVE_TYPE")
+                        .FirstOrDefault();
+
+                    if (driveTypeQuestion != null)
+                    {
+                        foreach (Answer answer in driveTypeQuestion.Answer)
+                        {
+                            applicationSearch.Criterion = new[]
+                            {
+                                new Criterion { Attribute = "DRIVE_TYPE", Id = answer.Id}
+                            };
+
+                            ApplicationSearchResponse driveTypeResponse = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
+                            if (driveTypeResponse.ResponseBody != null && ((Apps)driveTypeResponse.ResponseBody).App.Where(a => a.Part == vehicleFitment.PartNumber).Any())
+                            {
+                                vehicleFitment.DriveTypes.Add(answer.Value);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Ok(vehicleFitment);
         }
 
         [HttpGet]
@@ -47,18 +136,18 @@ namespace PartSource.Api.Controllers
             {
                 return BadRequest(new
                 {
-                    Message = $"No vehicle data is available for SKU {sku}. Confirm it is available in the database maintained by Sound Press.",
+                    Message = $"No vehicle data is available for vehicle ID {vehicleId}. 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,
+                PartNumber = part.PartNumber,
-                    MfrCode = m.WhiCode
+                MfrCode = m.WhiCode
-                })
+            })
-                .ToArray();
+            .ToArray();
 
             SmartPageDataSearch smartPageDataSearch = new SmartPageDataSearch
             {
@@ -76,10 +165,10 @@ namespace PartSource.Api.Controllers
             }
 
             PartType[] partTypes = smartPageResponse.ResponseBody.Item.Select(i => new PartType
-                {
+            {
-                    Id = i.Part.PartType.Id
+                Id = i.Part.PartType.Id
-                })
+            })
-                .ToArray();
+            .ToArray();
 
             ApplicationSearch applicationSearch = new ApplicationSearch
             {
@@ -90,13 +179,13 @@ namespace PartSource.Api.Controllers
                 MfrCode = mappings.Select(m => m.WhiCode).ToArray(),
                 PartType = new[] { new PartType { Id = smartPageResponse.ResponseBody.Item[0].Part.PartType.Id } },
                 Criterion = new[]
+                {
+                    new Criterion
                     {
-                        new Criterion
+                        Attribute = "REGION",
-                        {
+                        Id = 2
-                            Attribute = "REGION",
+                    }
-                            Id = 2
+                },
-                        }
-                    },
                 GroupBy = "PARTTYPE"
             };
 
@@ -112,7 +201,7 @@ namespace PartSource.Api.Controllers
             }
 
             IList<string> positions = new List<string>();
-            foreach (App app in response.ResponseBody?.App)
+            foreach (App app in ((Apps)response.ResponseBody)?.App)
             {
                 if (!string.IsNullOrEmpty(app.Position) && app.Part == part.PartNumber)
                 {
@@ -128,5 +217,33 @@ namespace PartSource.Api.Controllers
             });
         }
 
+        private IList<string> GetDriveTypesFromNote(string fitmentNote)
+        {
+            fitmentNote = fitmentNote.ToUpperInvariant();
+            IList<string> driveTypes = new List<string>();
+
+            if (fitmentNote.Contains("FWD"))
+            {
+                driveTypes.Add("FWD");
+            }
+
+            if (fitmentNote.Contains("RWD"))
+            {
+                driveTypes.Add("RWD");
+            }
+
+            if (fitmentNote.Contains("AWD"))
+            {
+                driveTypes.Add("AWD");
+            }
+
+            if (fitmentNote.Contains("4WD"))
+            {
+                driveTypes.Add("4WD");
+            }
+
+            return driveTypes;
+        }
+
     }
 }

PartSource.Api/Controllers/WipersController.cs

@@ -51,7 +51,7 @@ namespace PartSource.Api.Controllers
 
             if (response.ResponseBody != null)
             {
-                return NexpartResponse<ApplicationSearchResponse, Apps>(response);
+                return NexpartResponse<ApplicationSearchResponse, object>(response);
             }
 
             else

PartSource.Api/PartSource.Api.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>f9e2fd37-0f2d-4e3a-955a-8e49a16fce1c</UserSecretsId>
     <Configurations>Debug;Release;Also Debug</Configurations>
+      <SatelliteResourceLanguages>en-us;en</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\.editorconfig" Link=".editorconfig" />
     <None Include="appsettings.development.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -35,6 +35,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Ratermania.Shopify" Version="6.16.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.3.1" />
   </ItemGroup>

PartSource.Api/Properties/launchSettings.json

@@ -1,13 +1,4 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:31337",
-      "sslPort": 0
-    }
-  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -18,12 +9,20 @@
     },
     "PartSource.Api": {
       "commandName": "Project",
-      "launchBrowser": true,
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:31337",
+      "sslPort": 0
+    }
   }
 }

PartSource.Api/Startup.cs

@@ -52,13 +52,12 @@ namespace PartSource.Api
 			services.AddAutoMapper(typeof(PartSourceProfile));
 
 			services.AddTransient<PartService>();
+			services.AddTransient<FitmentService>();
 			services.AddTransient<NexpartService>();
 			services.AddTransient<SecurityService>();
 			services.AddTransient<VehicleService>();
 			services.AddTransient<ShopifyChangelogService>();
 
-			services.AddTransient<FitmentContext>();
-
 			services.AddCors(o => o.AddPolicy("Default", builder =>
 			{
 				builder.AllowAnyOrigin()
@@ -69,9 +68,9 @@ namespace PartSource.Api
 			services.AddDbContext<PartSourceContext>(options =>
 				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.

PartSource.Api/appsettings.json

@@ -2,6 +2,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": "Server=tcp:ps-automation.eastus2.cloudapp.azure.com,1433;Initial Catalog=WhiFitment;User ID=sa;Password=GZ0`-ekd~[2u;Encrypt=True;TrustServerCertificate=True;Connection Timeout=300"
     },
     "Logging": {
         "LogLevel": {

PartSource.Automation/Extensions/FileInfoExtensions.cs

@@ -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;
+        }
+    }
+}

PartSource.Automation/Jobs/BulkUpdateInventory.cs

@@ -0,0 +1,107 @@
+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 Microsoft.Extensions.Logging;
+using PartSource.Automation.Models.Configuration;
+using PartSource.Automation.Models.Ftp;
+using PartSource.Automation.Services;
+using Ratermania.Automation.Interfaces;
+
+namespace PartSource.Automation.Jobs
+{
+    public class BulkUpdateInventory : IAutomationJob
+    {
+        private readonly FtpService _ftpService;
+        private readonly ILogger<BulkUpdateInventory> _logger;
+		private readonly string _connectionString;
+
+        public BulkUpdateInventory(IConfiguration configuration, ILogger<BulkUpdateInventory> logger)
+        {
+            FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
+            _ftpService = new FtpService(ftpConfiguration);
+
+            _connectionString = configuration.GetConnectionString("PartSourceDatabase");
+
+            _logger = logger;
+        }
+
+        public async Task Run(CancellationToken token, params string[] arguments)
+        {
+            FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended()
+                .Where(f => f.FileType == FtpFileType.File && f.Filename.IndexOf("Availability Full") > -1)
+                .OrderByDescending(f => f.Modified)
+                .FirstOrDefault();
+
+            if (lastUploadedFile == null)
+            {
+                _logger.LogInformation($"No full inventory file available.");
+                return;
+            }
+
+            string file = _ftpService.Download(lastUploadedFile.Filename);
+
+			DataTable dataTable = GetDataTable(file);
+
+			using SqlConnection connection = new SqlConnection(_connectionString);
+			connection.Open();
+
+			using SqlCommand command = new SqlCommand("TRUNCATE TABLE PartAvailability", connection);
+			await command.ExecuteNonQueryAsync(token);
+
+			using SqlBulkCopy bulk = new SqlBulkCopy(connection)
+			{
+				DestinationTableName = "PartAvailability",
+				BulkCopyTimeout = 14400
+			};
+
+			await bulk.WriteToServerAsync(dataTable, token);
+
+            _ftpService.Delete(lastUploadedFile.Filename);
+
+            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));
+			dataTable.Columns.Add("Updated", typeof(string));
+
+			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();
+				string updated = columns[3].Trim();
+
+				if (int.TryParse(columns[0], out int store)
+					&& !string.IsNullOrEmpty(sku)
+					&& int.TryParse(columns[2], out int quantity)
+					&& !string.IsNullOrEmpty(updated))
+				{
+					dataTable.Rows.Add(new object[] { store, sku, quantity, updated });
+				}
+			}
+
+			return dataTable;
+		}
+	}
+}

PartSource.Automation/Jobs/ExecuteSsisPackages.cs

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

PartSource.Automation/Jobs/POC/GetImageUrls.cs

@@ -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);
+        }
+    }
+}

PartSource.Automation/Jobs/POC/GetImageUrlsTemp.cs

@@ -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}");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

PartSource.Automation/Jobs/POC/ImageList.cs

@@ -18,15 +18,17 @@ using Ratermania.Shopify.Resources;
 
 namespace PartSource.Automation.Jobs.POC
 {
-    public class GetImageUrls : IAutomationJob
+    public class ImageList : IAutomationJob
     {
         private readonly NexpartService _nexpartService;
         private readonly PartSourceContext _partSourceContext;
+        private readonly FitmentContext _fitmentContext;
 
-        public GetImageUrls(NexpartService nexpartService, PartSourceContext partSourceContext)
+        public ImageList(NexpartService nexpartService, PartSourceContext partSourceContext, FitmentContext fitmentContext)
         {
             _nexpartService = nexpartService;
             _partSourceContext = partSourceContext;
+            _fitmentContext = fitmentContext;
         }
 
         public async Task Run(CancellationToken token, params string[] arguments)
@@ -34,45 +36,54 @@ namespace PartSource.Automation.Jobs.POC
             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)
+            IList<Data.Models.Part> parts = await _fitmentContext.Parts.ToListAsync();
+            string oldLineCode = string.Empty;
+            IList<DcfMapping> mappings = new List<DcfMapping>();
+
+            foreach (Data.Models.Part part in parts)
             {
-                SmartPageDataSearch dataSearch = new SmartPageDataSearch
+                if (part.LineCode != oldLineCode)
                 {
-                    Items = new Item[]
+                    mappings = await _fitmentContext.DcfMappings.Where(d => d.LineCode == part.LineCode).ToListAsync();
+                }
+                ;
+
+                foreach (DcfMapping mapping in mappings)
+                {
+                    SmartPageDataSearch dataSearch = new SmartPageDataSearch
                     {
+                        Items = new Item[]
+                        {
                         new Item
                         {
-                            MfrCode = item.LineCode,
+                            MfrCode = mapping.WhiCode,
-                            PartNumber = item.PartNumber
+                            PartNumber = part.PartNumber
                         }
-                    },
+                        },
-                    DataOption = new[] { "DIST_LINE", "ALL" }
+                        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)
+                    SmartPageDataSearchResponse response = await _nexpartService.SendRequest<SmartPageDataSearch, SmartPageDataSearchResponse>(dataSearch);
-                    {
-                        urls.AddRange(response.ResponseBody.Item[0].AddImgs.AddImg.Select(i => i.AddImgUrl));
-                    }
 
-                    if (urls.Count > 0)
+                    if (response.ResponseBody.Item?.Length > 0)
                     {
-                        rows.Add($"\"{item.LineCode}\", \"{item.PartNumber}\", \"{string.Join(";", urls)}\"");
+                        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($"\"{part.LineCode}\", \"{part.PartNumber}\", \"{string.Join(";", urls)}\"");
+                        }
                     }
                 }
 

PartSource.Automation/Jobs/POC/UpdateBulbFitment.cs

@@ -68,7 +68,7 @@ namespace PartSource.Automation.Jobs.POC
                 ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
                 if (response.ResponseBody != null)
                 {
-                    foreach (App app in response.ResponseBody.App)
+                    foreach (App app in ((Apps)response.ResponseBody).App)
                     {
                         try
                         {

PartSource.Automation/Jobs/POC/UpdateWiperFitment.cs

@@ -68,7 +68,7 @@ namespace PartSource.Automation.Jobs.POC
                 ApplicationSearchResponse response = await _nexpartService.SendRequest<ApplicationSearch, ApplicationSearchResponse>(applicationSearch);
                 if (response.ResponseBody != null)
                 {
-                    foreach (App app in response.ResponseBody.App)
+                    foreach (App app in ((Apps)response.ResponseBody).App)
                     {
                         try
                         {

PartSource.Automation/Jobs/PartialInventoryUpdate.cs

@@ -0,0 +1,119 @@
+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 Microsoft.Extensions.Logging;
+using PartSource.Automation.Models.Configuration;
+using PartSource.Automation.Models.Ftp;
+using PartSource.Automation.Services;
+using Ratermania.Automation.Interfaces;
+
+namespace PartSource.Automation.Jobs
+{
+    public class PartialInventoryUpdate : IAutomationJob
+    {
+        private readonly FtpService _ftpService;
+        private readonly ILogger<PartialInventoryUpdate> _logger;
+        private readonly string _connectionString;
+
+        public PartialInventoryUpdate(IConfiguration configuration, ILogger<PartialInventoryUpdate> logger)
+        {
+            FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:AutomationConfiguration").Get<FtpConfiguration>();
+            _ftpService = new FtpService(ftpConfiguration);
+
+            _connectionString = _connectionString = configuration.GetConnectionString("PartSourceDatabase");
+
+            _logger = logger;
+        }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2100:Review SQL queries for security vulnerabilities")]
+        public async Task Run(CancellationToken token, params string[] arguments)
+        {
+            FtpFileInfo lastUploadedFile = _ftpService.ListFilesExtended()
+                .Where(f => f.FileType == FtpFileType.File && f.Filename.IndexOf("Availability Partial") > -1)
+                .OrderByDescending(f => f.Modified)
+                .FirstOrDefault();
+
+            if (lastUploadedFile == null)
+            {
+                _logger.LogInformation($"No partial inventory file available.");
+                return;
+            }
+
+            _logger.LogInformation("Processing {filename}", lastUploadedFile.Filename);
+
+            string file = _ftpService.Download($"{lastUploadedFile.Filename}");
+
+            using SqlConnection connection = new SqlConnection(_connectionString);
+            connection.Open();
+
+            using StreamReader reader = new StreamReader(file);
+            string line = reader.ReadLine(); // Burn the header row
+
+            IDictionary<string, object> parameters = new Dictionary<string, object>();
+            string command = string.Empty;
+            int i = 0;
+
+            while (reader.Peek() > 0)
+            {
+                line = reader.ReadLine();
+
+                string[] columns = line.Split("|");
+                for (int j = 0; j < columns.Length; j++)
+                {
+                    columns[j] = columns[j].Replace("\"", string.Empty);
+                }
+                string sku = columns[1].Trim();
+                string updated = columns[3].Trim();
+
+                if (int.TryParse(columns[0], out int store)
+                    && !string.IsNullOrEmpty(sku)
+                    && int.TryParse(columns[2], out int quantity)
+                    && !string.IsNullOrEmpty(updated))
+                {
+                    command += $"UPDATE PartAvailability SET QTY = @qty_{i}, Updated = @updated_{i} WHERE SKU = @sku_{i} AND Store = @store_{i};";
+
+                    parameters.Add($"qty_{i}", quantity);
+                    parameters.Add($"store_{i}", store);
+                    parameters.Add($"sku_{i}", sku);
+                    parameters.Add($"updated_{i}", updated);
+
+                    i++;
+                }
+
+                if (i == 250)
+                {
+                    using SqlCommand nested = new SqlCommand(command, connection);
+                    foreach (KeyValuePair<string, object> parameter in parameters)
+                    {
+                        nested.Parameters.Add(new SqlParameter(parameter.Key, parameter.Value));
+                    }
+
+                    await nested.ExecuteNonQueryAsync(token);
+
+                    parameters.Clear();
+                    command = string.Empty;
+                    i = 0;
+                }
+            }
+
+            using SqlCommand sqlCommand = new SqlCommand(command, connection);
+            foreach (KeyValuePair<string, object> parameter in parameters)
+            {
+                sqlCommand.Parameters.Add(new SqlParameter(parameter.Key, parameter.Value));
+            }
+
+            await sqlCommand.ExecuteNonQueryAsync(token);
+
+            _ftpService.Delete(lastUploadedFile.Filename);
+
+            return;
+        }
+    }
+}

PartSource.Automation/Jobs/PartsSync.cs

@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using PartSource.Automation.Models.Jobs;
+using PartSource.Automation.Services;
+using PartSource.Data.Contexts;
+using PartSource.Data.Models;
+using Ratermania.Automation.Interfaces;
+using Ratermania.Shopify;
+using Ratermania.Shopify.Resources;
+using Ratermania.Shopify.Resources.Enums;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Mail;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PartSource.Automation.Jobs
+{
+    public class PartsSync : IAutomationJob
+    {
+        private readonly ILogger<UpdatePricing> _logger;
+        private readonly FitmentContext _fitmentContext;
+        private readonly ShopifyClient _shopifyClient;
+
+        public PartsSync(ILogger<UpdatePricing> logger, FitmentContext fitmentContext, ShopifyClient shopifyClient)
+        {
+            _logger = logger;
+            _fitmentContext = fitmentContext;
+            _shopifyClient = shopifyClient;
+        }
+
+        public async Task Run(CancellationToken token, params string[] arguments)
+        {
+            IEnumerable<Product> products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 } });
+
+            while (products != null && products.Any())
+            {
+
+                foreach (Product product in products)
+                {
+                    try
+                    {
+                        IEnumerable<Metafield> metafields = await _shopifyClient.Metafields.Get(new Dictionary<string, object> { { "metafield[owner_id]", product.Id }, { "metafield[owner_resource]", "product" } });
+                        Part part = new Part
+                        {
+                            LineCode = metafields.FirstOrDefault(m => m.Key == "custom_label_0")?.Value ?? string.Empty,
+                            PartNumber = metafields.FirstOrDefault(m => m.Key == "custom_label_1")?.Value ?? string.Empty,
+                            Sku = product.Variants[0].Sku  // They know we can't do fitment for variants
+                        };
+
+                        // part.PartNumber = part.PartNumber.Replace("-", string.Empty);
+
+                        if (
+                            string.IsNullOrEmpty(part.LineCode)
+                            || string.IsNullOrEmpty(part.PartNumber)
+                            || int.TryParse(part.LineCode, out _)) //If the line code is numeric, it cannot have fitment data associated with it.
+                        {
+                            continue;
+                        }
+
+                        Part? existing = await _fitmentContext.Parts.FirstOrDefaultAsync(p => p.Sku == part.Sku);
+                        if (existing == null)
+                        {
+                            await _fitmentContext.Parts.AddAsync(part);
+                            await _fitmentContext.SaveChangesAsync();
+                        }
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.LogInformation(ex.Message);
+                    }
+                }
+                   
+                try
+                {
+                    products = await _shopifyClient.Products.GetNext();
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.LogInformation(ex.Message);
+                }
+            }
+        }
+    }
+}

PartSource.Automation/Jobs/ProcessWhiFitment.cs

@@ -56,24 +56,25 @@ namespace PartSource.Automation.Jobs
 				fileGroups.Enqueue(fileGroup);
 			}
 
-			Task[] taskArray = new Task[8];
+			Task[] taskArray = new Task[18];
-
 			for (int i = 0; i < taskArray.Length; i++)
 			{
 				taskArray[i] = Task.Factory.StartNew(() =>
 				{
 					while (fileGroups.TryDequeue(out IGrouping<string, FileInfo> fileGroup))
 					{
+						string tableName = string.Empty;
+
 						foreach (FileInfo fileInfo in fileGroup)
 						{
 							try
 							{
 								string filename = Decompress(fileInfo);
-								string tableName = fileInfo.Name.Substring(0, fileInfo.Name.IndexOf('.'));
+                                DataTable dataTable = GetDataTable(filename, out tableName);
 
-								DataTable dataTable = GetDataTable(filename);
+								string tempTable = $"Fitment_{Guid.NewGuid():N}_{tableName}";
 
-								_whiSeoService.BulkCopyFitment(dataTable, tableName);
+                                _whiSeoService.BulkCopyFitment(dataTable, tempTable);
 								_logger.LogInformation($"Copied {fileInfo.Name} to the database.");
 
 								File.Delete(filename);
@@ -85,20 +86,18 @@ namespace PartSource.Automation.Jobs
 							}
 						}
 
-						string fitmentTable = fileGroup.Key.Substring(0, fileGroup.Key.IndexOf('.'));
+						_whiSeoService.CreateFitmentTable(tableName);
-						_whiSeoService.CreateFitmentTable(fitmentTable);
 
-						_logger.LogInformation($"Created fitment table for part group {fitmentTable}.");
+						_logger.LogInformation($"Created fitment table for part group {tableName}.");
 
 					}
 				});
 			}
 
 			Task.WaitAll(taskArray);
+			_whiSeoService.SaveNotes(_noteDictionary);
 
-		//	_whiSeoService.CreateFitmentView();
+			_whiSeoService.CreateFitmentView();
-
-			//_whiSeoService.SaveNotes(_noteDictionary);
 		}
 
 		public string Decompress(FileInfo fileInfo)
@@ -113,8 +112,10 @@ namespace PartSource.Automation.Jobs
 			return decompressedFile;
 		}
 
-		private DataTable GetDataTable(string filename)
+		private DataTable GetDataTable(string filename, out string lineCode)
 		{
+			lineCode = string.Empty;
+
 			using DataTable dataTable = new DataTable();
 			dataTable.Columns.Add("LineCode", typeof(string));
 			dataTable.Columns.Add("PartNumber", typeof(string));
@@ -122,8 +123,9 @@ namespace PartSource.Automation.Jobs
 			dataTable.Columns.Add("EngineConfigId", typeof(int));
 			dataTable.Columns.Add("Position", typeof(string));
 			dataTable.Columns.Add("FitmentNoteHash", typeof(string));
+            dataTable.Columns.Add("PartTerminologyId", typeof(int));
 
-			using StreamReader reader = new StreamReader(filename);
+            using StreamReader reader = new StreamReader(filename);
 			string line = reader.ReadLine(); // Burn the header row
 
 			while (reader.Peek() > 0)
@@ -136,7 +138,7 @@ namespace PartSource.Automation.Jobs
 					columns[i] = columns[i].Replace("\"", string.Empty);
 				}
 
-				string lineCode = Regex.Replace(columns[0], "[^a-zA-Z0-9]", string.Empty).Trim();
+				lineCode = Regex.Replace(columns[0], "[^a-zA-Z0-9]", string.Empty).Trim();
 				string partNumber = Regex.Replace(columns[1], "[^a-zA-Z0-9]", string.Empty).Trim();
 				string position = columns[7].Trim();
 
@@ -150,10 +152,11 @@ namespace PartSource.Automation.Jobs
 
 				if (!string.IsNullOrEmpty(lineCode)
 					&& !string.IsNullOrEmpty(partNumber)
+					&& int.TryParse(columns[2], out int partTerminologyId)
 					&& int.TryParse(columns[5], out int baseVehicleId)
 					&& int.TryParse(columns[6], out int engineConfigId))
 				{
-					dataTable.Rows.Add(new object[] { lineCode, partNumber, baseVehicleId, engineConfigId, position, noteTextHash });
+					dataTable.Rows.Add(new object[] { lineCode, partNumber, baseVehicleId, engineConfigId, position, noteTextHash, partTerminologyId });
 				}
 			}
 

PartSource.Automation/Jobs/ProcessWhiVehicles.cs

@@ -1,25 +1,21 @@
-using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using PartSource.Automation.Extensions;
 using PartSource.Automation.Models.Configuration;
 using PartSource.Automation.Models.Enums;
 using PartSource.Automation.Services;
 using Ratermania.Automation.Interfaces;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace PartSource.Automation.Jobs
 {
-	public class ProcessWhiVehicles : IAutomationJob
+    public class ProcessWhiVehicles : IAutomationJob
 	{
 		private readonly ILogger<ProcessWhiVehicles> _logger;
 		private readonly WhiSeoService _whiSeoService;
@@ -45,7 +41,9 @@ namespace PartSource.Automation.Jobs
 			string directory = Path.Combine(_ftpConfiguration.Destination, _seoDataType.ToString().ToLowerInvariant());
 			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)
 			{

PartSource.Automation/Jobs/TestJob.cs

@@ -24,7 +24,7 @@ namespace PartSource.Automation.Jobs
 #pragma warning disable CS1998, CA1303
 		public async Task Run(CancellationToken token, params string[] arguments)
 		{
-		//	_emailService.Send("Automation Test Message", "This is a test email from the automation server. If this message was in your spam folder, whitelist the address that sent this email.");
+			_emailService.Send("Automation Test Message", "This is a test email from the automation server. If this message was in your spam folder, whitelist the address that sent this email.");
 
 			_logger.LogInformation("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc scelerisque congue euismod. Curabitur enim eros, sollicitudin ac purus eget, dignissim mattis augue. In quam sapien, tincidunt et elementum vitae, interdum vitae sem.");
 			_logger.LogWarning("Praesent feugiat sapien non suscipit faucibus. Mauris fermentum ut augue a feugiat. Integer felis sem, laoreet et augue at, finibus maximus ex. Fusce sit amet erat non tortor porta condimentum condimentum quis ipsum.");

PartSource.Automation/Jobs/UpdateFitment.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using PartSource.Automation.Services;
@@ -13,6 +14,7 @@ using PartSource.Data.Models;
 using Ratermania.Automation.Interfaces;
 using Ratermania.Shopify;
 using Ratermania.Shopify.Resources;
+using System.Web;
 
 namespace PartSource.Automation.Jobs
 {
@@ -36,213 +38,148 @@ namespace PartSource.Automation.Jobs
         public async Task Run(CancellationToken token, params string[] arguments)
         {
 
-            IEnumerable<Product> products = null;
+            IList<string> productTypes = await _fitmentContext.ProductTypes
+                .Where(p => p.Active)
+                .Select(p => HttpUtility.UrlEncode(p.Name))
+                .ToListAsync();
 
-            try
+            foreach (string productType in productTypes)
             {
-                products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 }, { "product_type", "CA111-SC250-FL25049_Entry Ball Joints" } });
+                _logger.LogInformation("Processing {productType}", HttpUtility.UrlDecode(productType));
-                //products = new List<Product>
-                //{
-                //    await _shopifyClient.Products.GetById(4388919574575)
-                //};
-            }
 
-            catch (Exception ex)
+                IEnumerable<Product> products = null;
-            {
-                _logger.LogError("Failed to get products from Shopify", ex);
-                throw;
-            }
-
-            int i = 1;
-
-            while (products != null && products.Any())
-            {
-                foreach (Product product in products)
-                {
-                    ImportData importData = null;
-
-                    try
-                    {
-                        IEnumerable<Metafield> metafields = await _shopifyClient.Metafields.Get(new Dictionary<string, object> { { "metafield[owner_id]", product.Id }, { "metafield[owner_resource]", "product" } });
-                        importData = new ImportData
-                        {
-                            LineCode = metafields.FirstOrDefault(m => m.Key == "custom_label_0")?.Value ?? string.Empty,
-                            PartNumber = metafields.FirstOrDefault(m => m.Key == "custom_label_1")?.Value ?? string.Empty,
-                            VariantSku = product.Variants[0].Sku  // They know we can't do fitment for variants
-                        };
-
-                        bool isFitment = false;
-                        string bodyHtml = product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("</ul>") + "</ul>".Length);
-
-                        IList<Vehicle> vehicles = _vehicleFitmentService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
-                        IList<int> vehicleIdFitment = _vehicleFitmentService.GetVehicleIdFitment(vehicles);
-
-                        if (vehicleIdFitment.Count > 0)
-                        {
-                            string vehicleIdString = string.Join(',', vehicleIdFitment.Select(j => $"v{j}"));
-
-                            bodyHtml += $"<div id=\"vehicleIDs\" style=\"display:none;\">{vehicleIdString}</div>";
-
-                            isFitment = true;
-
-                            string json = JsonConvert.SerializeObject(vehicleIdFitment);
-                            if (json.Length < 100000)
-                            {
-                                Metafield vehicleMetafield = new Metafield
-                                {
-                                    Namespace = "fitment",
-                                    Key = "ids",
-                                    Value = json,
-                                    Type = "json_string",
-                                    OwnerResource = "product",
-                                    OwnerId = product.Id
-                                };
-
-                                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 = _vehicleFitmentService.GetYmmFitment(vehicles);
-                        if (ymmFitment.Count > 0)
-                        {
-                            isFitment = true;
-
-                            StringBuilder stringBuilder = new StringBuilder();
-                            stringBuilder.AppendLine("<table><tr><th colspan=\"2\">This Part Fits</th></tr>");
-
-                            foreach (string fitment in ymmFitment)
-                            {
-                                try
-                                {
-                                    string[] parts = fitment.Split(' ', 2);
-
-                                    stringBuilder.AppendLine($"<tr><td>{parts[1]}</td><td>{parts[0].Replace("-", ", ")}</td></tr>");
-                                }
-
-                                catch
-                                {
-                                    // This is still a POC at this point.  Oh well...
-                                }
-                            }
-
-                            stringBuilder.AppendLine("</table>");
-
-                            bodyHtml += $"<div id=\"seoData\">{stringBuilder.ToString()}</div>";
-
-                            string json = JsonConvert.SerializeObject(ymmFitment);
-                            if (json.Length < 100000)
-                            {
-                                Metafield ymmMetafield = new Metafield
-                                {
-                                    Namespace = "fitment",
-                                    Key = "seo",
-                                    Value = json,
-                                    Type = "json_string",
-                                    OwnerResource = "product",
-                                    OwnerId = product.Id
-                                };
-
-                                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",
-                            Key = "IsFitment",
-                            Value = isFitment.ToString(),
-                            Type = "string",
-                            OwnerResource = "product",
-                            OwnerId = product.Id
-                        };
-
-                        await _shopifyClient.Metafields.Add(isFitmentMetafield);
-
-                        //Metafield lineCodeMetafield = new Metafield
-                        //{
-                        //	Namespace = "google",
-                        //	Key = "custom_label_0",
-                        //	Value = importData.LineCode,
-                        //	Type = "string",
-                        //	OwnerResource = "product",
-                        //	OwnerId = product.Id
-                        //};
-
-                        //await _shopifyClient.Metafields.Add(lineCodeMetafield);
-
-                        //Metafield partNumberMetafield = new Metafield
-                        //{
-                        //	Namespace = "google",
-                        //	Key = "custom_label_1",
-                        //	Value = importData.PartNumber,
-                        //	Type = "string",
-                        //	OwnerResource = "product",
-                        //	OwnerId = product.Id
-                        //};
-
-                        //await _shopifyClient.Metafields.Add(partNumberMetafield);
-
-                        List<string> tags = new List<string>();
-
-                        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 > 249)
-                        {
-                            tags = tags.Take(249).ToList();
-                        }
-
-                        string zzzIsFitment = isFitment
-                            ? "zzzIsFitment=true"
-                            : "zzzIsFitment=false";
-
-                        tags.Add(zzzIsFitment);
-
-                        product.Tags = string.Join(',', tags);
-                        product.BodyHtml = bodyHtml;
-                        await _shopifyClient.Products.Update(product);
-
-                        importData.IsFitment = isFitment;
-                        importData.UpdatedAt = DateTime.Now;
-                        importData.UpdateType = "Fitment";
-                    }
-
-                    catch (Exception ex)
-                    {
-                        _logger.LogError($"Failed to updated fitment data for SKU {importData?.VariantSku} - {ex.Message}", ex);
-                    }
-
-                }
                 try
                 {
-                    Console.WriteLine(i);
+                    products = await _shopifyClient.Products.Get(new Dictionary<string, object> { { "limit", 250 }, { "product_type", productType } });
-
+                    //products = new List<Product>
-                    _partSourceContext.SaveChanges();
+                    //{
-                    products = await _shopifyClient.Products.GetNext();
+                    //    await _shopifyClient.Products.GetById(7458071052335)
-
+                    //};
-                    i++;
                 }
 
                 catch (Exception ex)
                 {
-                    _logger.LogWarning(ex, "Failed to get the next set of products.  Retrying");
+                    _logger.LogError("Failed to get products from Shopify", ex);
-                    products = await _shopifyClient.Products.GetPrevious();
+                    throw;
+                }
+
+                while (products != null && products.Any())
+                {
+                    foreach (Product product in products)
+                    {
+                        ImportData importData = null;
+                        bool isFitment = false;
+
+                        try
+                        {
+                            IEnumerable<Metafield> metafields = await _shopifyClient.Metafields.Get(new Dictionary<string, object> { { "metafield[owner_id]", product.Id }, { "metafield[owner_resource]", "product" } });
+                            importData = new ImportData
+                            {
+                                LineCode = metafields.FirstOrDefault(m => m.Key == "custom_label_0")?.Value ?? string.Empty,
+                                PartNumber = metafields.FirstOrDefault(m => m.Key == "custom_label_1")?.Value ?? string.Empty,
+                                VariantSku = product.Variants[0].Sku  // They know we can't do fitment for variants
+                            };
+
+                            importData.PartNumber = importData.PartNumber.Replace("-", string.Empty);
+
+                            //If the line code is numeric, it cannot have fitment data associated with it.
+                            if (int.TryParse(importData.LineCode, out _))
+                            {
+                                continue;
+                            }
+
+                            // Extract Partsource bullet points if present.
+                            string bodyHtml = string.IsNullOrEmpty(product.BodyHtml)
+                                ? string.Empty
+                                : product.BodyHtml.Substring(0, product.BodyHtml.IndexOf("</ul>") + "</ul>".Length);
+
+                            IList<Vehicle> vehicles = await _vehicleFitmentService.GetVehiclesForPart(importData.PartNumber, importData.LineCode);
+                            IList<int> vehicleIdFitment = _vehicleFitmentService.GetVehicleIdFitment(vehicles);
+
+                            if (!vehicleIdFitment.Any())
+                            {
+                                Console.WriteLine($"No fitment data for {importData.LineCode} {importData.PartNumber}");
+                                continue;
+                            }
+
+                            string vehicleIdString = string.Join(',', vehicleIdFitment.Select(j => $"v{j}"));
+
+                            bodyHtml += $"<div id=\"vehicleIDs\" style=\"display:none;\">{vehicleIdString}</div>";
+                            isFitment = true;
+
+                            IList<string> ymmFitment = _vehicleFitmentService.GetYmmFitment(vehicles);
+                            if (ymmFitment.Count > 0)
+                            {
+                                isFitment = true;
+
+                                StringBuilder stringBuilder = new StringBuilder();
+                                stringBuilder.AppendLine("<table><tr><th colspan=\"2\">This Part Fits</th></tr>");
+
+                                foreach (string fitment in ymmFitment)
+                                {
+                                    try
+                                    {
+                                        string[] parts = fitment.Split(' ', 2);
+                                        stringBuilder.AppendLine($"<tr><td>{parts[1]}</td><td>{parts[0].Replace("-", ", ")}</td></tr>");
+                                    }
+
+                                    catch (Exception ex)
+                                    {
+                                        _logger.LogWarning(ex, "YMM fitment for {fitment} was in an invalid format", fitment);
+                                    }
+                                }
+
+                                stringBuilder.AppendLine("</table>");
+
+                                bodyHtml += $"<div id=\"seoData\">{stringBuilder}</div>";
+                            }
+
+                            List<string> tags = new List<string>();
+
+                            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 > 249)
+                            {
+                                tags = tags.Take(249).ToList();
+                            }
+
+                            string zzzIsFitment = isFitment
+                                ? "zzzIsFitment=true"
+                                : "zzzIsFitment=false";
+
+                            tags.Add(zzzIsFitment);
+
+                            product.Tags = string.Join(',', tags);
+                            product.BodyHtml = bodyHtml;
+                            await _shopifyClient.Products.Update(product);
+
+                            importData.IsFitment = isFitment;
+                            importData.UpdatedAt = DateTime.Now;
+                            importData.UpdateType = "Fitment";
+                        }
+
+                        catch (Exception ex)
+                        {
+                            _logger.LogError($"Failed to updated fitment data for SKU {importData?.VariantSku} - {ex.Message}", ex);
+                        }
+
+                    }
+                    try
+                    {
+                        products = await _shopifyClient.Products.GetNext();
+
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Failed to get the next set of products.  Retrying");
+                        products = await _shopifyClient.Products.GetPrevious();
+                    }
                 }
             }
         }

PartSource.Automation/Jobs/UpdatePositioning.cs

@@ -64,7 +64,7 @@ namespace PartSource.Automation.Jobs
 						}
 
 						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)
 						{

PartSource.Automation/Jobs/UpdatePricing.cs

@@ -76,7 +76,8 @@ namespace PartSource.Automation.Jobs
 
                             try
                             {
-                                _shopifyClient.BulkActions.Add(new Metafield
+
+                                await _shopifyClient.Metafields.Add(new Metafield
                                 {
                                     Namespace = "Pricing",
                                     Key = "CorePrice",
@@ -85,24 +86,16 @@ namespace PartSource.Automation.Jobs
                                     OwnerResource = "product",
                                     OwnerId = product.Id
                                 });
+
+                                await _shopifyClient.Products.Update(product);
+
+                                _logger.LogInformation("Updated product id {productId}", product.Id);
                             }
 
                             catch (Exception ex)
                             {
-                                _logger.LogWarning(ex, $"Failed to update pricing for product ID {product.Id}");
+                                _logger.LogWarning(ex, "Failed to update pricing for product ID {productId}", product.Id);
                             }
-
-
-                        }
-
-                        try
-                        {
-                            _shopifyClient.BulkActions.Update(product);
-                        }
-
-                        catch (Exception ex)
-                        {
-                            _logger.LogWarning(ex, $"Failed to update pricing for product ID {product.Id}");
                         }
                     }
                 }
@@ -119,14 +112,9 @@ namespace PartSource.Automation.Jobs
                     _logger.LogWarning(ex, "Failed to get the next set of products.  Retrying");
                     products = await _shopifyClient.Products.GetPrevious();
                 }
-            }
 
-            while (_shopifyClient.BulkActions.PendingCount() > 0)
+                _emailService.Send("Pricing Update Completed", $"The pricing update has completed.");
-            {
-                await Task.Delay(15 * 1000, token);
-                _logger.LogInformation(_shopifyClient.BulkActions.PendingCount().ToString());
             }
-            //    _emailService.Send("Pricing Update Completed", $"The pricing update has completed.");
         }
     }
 }

PartSource.Automation/Models/Configuration/FtpConfiguration.cs

@@ -16,5 +16,7 @@ namespace PartSource.Automation.Models.Configuration
 		public string Username { get; set; }
 
 		public string Password { get; set; }
+
+		public int Port { get; set; }
 	}
 }

PartSource.Automation/Models/Ftp/FtpFileInfo.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PartSource.Automation.Models.Ftp
+{
+    public class FtpFileInfo
+    {
+        public string Filename { get; set; }
+
+        public DateTime Modified { get; set; }
+
+        public long Size { get; set; }
+
+        public FtpFileType FileType { get; set; }
+    }
+}

PartSource.Automation/Models/Ftp/FtpFileType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PartSource.Automation.Models.Ftp
+{
+    public enum FtpFileType 
+    {
+        File,
+        Directory
+    }
+}

PartSource.Automation/PartSource.Automation.csproj

@@ -21,11 +21,11 @@
     <PackageReference Include="Ratermania.Automation" Version="6.16.9" />
     <PackageReference Include="Ratermania.Automation.Common" Version="6.16.9" />
     <PackageReference Include="Ratermania.JwtSpot" Version="6.16.9" />
+    <PackageReference Include="Ratermania.Shopify" Version="6.16.11" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\ratermania\Packages\Shopify\Shopify.csproj" />
     <ProjectReference Include="..\PartSource.Data\PartSource.Data.csproj" />
     <ProjectReference Include="..\PartSource.Services\PartSource.Services.csproj" />
   </ItemGroup>

PartSource.Automation/Program.cs

@@ -1,18 +1,14 @@
-using AutoMapper;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using PartSource.Automation.Jobs;
-using PartSource.Automation.Jobs.POC;
 using PartSource.Automation.Services;
-using PartSource.Data;
 using PartSource.Data.AutoMapper;
 using PartSource.Data.Contexts;
 using PartSource.Services;
 using Ratermania.Automation.DependencyInjection;
-using Ratermania.Automation.Logging;
 using Ratermania.Shopify.DependencyInjection;
 using System;
 using System.IO;
@@ -20,53 +16,54 @@ using System.Threading.Tasks;
 
 namespace PartSource.Automation
 {
-	class Program
+    class Program
-	{
+    {
-		static async Task Main(string[] args){
+        static async Task Main(string[] args)
-			try
+        {
-			{
+            try
-				using IHost host = CreateHostBuilder().Build();
+            {
+                using IHost host = CreateHostBuilder().Build();
 
-				await host.StartAsync();
+                await host.StartAsync();
-			}
+            }
 
-			catch (Exception ex)
+            catch (Exception ex)
-			{
+            {
-				Console.WriteLine(ex.ToString());
+                Console.WriteLine(ex.ToString());
-				throw;
+                throw;
-			}
+            }
-		}
+        }
 
-		private static IHostBuilder CreateHostBuilder()
+        private static IHostBuilder CreateHostBuilder()
-		{
+        {
-			return Host.CreateDefaultBuilder()
+            return Host.CreateDefaultBuilder()
-				.ConfigureAppConfiguration(builder =>
+                .ConfigureAppConfiguration(builder =>
-				{
+                {
-					string environment = Environment.GetEnvironmentVariable("AUTOMATION_ENVIRONMENT");
+                    string environment = Environment.GetEnvironmentVariable("AUTOMATION_ENVIRONMENT");
 
-					builder.SetBasePath(Directory.GetCurrentDirectory())
+                    builder.SetBasePath(Directory.GetCurrentDirectory())
-						.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-						.AddJsonFile($"appsettings.{environment}.json", optional: true, reloadOnChange: true);
+                        .AddJsonFile($"appsettings.{environment}.json", optional: true, reloadOnChange: true);
-				})
+                })
-				.ConfigureServices((builder, services) =>
+                .ConfigureServices((builder, services) =>
-				{
+                {
-					services.AddDbContext<PartSourceContext>(options =>
+                    services.AddDbContext<PartSourceContext>(options =>
-						options.UseSqlServer(builder.Configuration.GetConnectionString("PartSourceDatabase"), opts => opts.EnableRetryOnFailure())
+                        options.UseSqlServer(builder.Configuration.GetConnectionString("PartSourceDatabase"), opts => opts.EnableRetryOnFailure())
-					)
+                    )
 
-					.AddDbContext<FitmentContext>(options =>
+                    .AddDbContext<FitmentContext>(options =>
-						options.UseSqlServer(builder.Configuration.GetConnectionString("FitmentDatabase"), opts =>
+                        options.UseSqlServer(builder.Configuration.GetConnectionString("FitmentDatabase"), opts =>
-						{
+                        {
-							opts.EnableRetryOnFailure();
+                            opts.EnableRetryOnFailure();
-							opts.CommandTimeout(600);
+                            opts.CommandTimeout(600);
-						})
+                        })
-					)
+                    )
 
-					.AddShopify(options =>
+                    .AddShopify(options =>
-					{
+                    {
                         options.ApiKey = builder.Configuration["Shopify:ApiKey"];
                         options.ApiSecret = builder.Configuration["Shopify:ApiSecret"];
-                        options.ApiVersion = "2022-10";
+                        options.ApiVersion = "2024-10";
                         options.ShopDomain = builder.Configuration["Shopify:ShopDomain"];
 
                         //options.ApiKey = "9a533dad460321c6ce8f30bf5b8691ed";
@@ -75,55 +72,69 @@ namespace PartSource.Automation
                         //options.ShopDomain = "dev-partsource.myshopify.com";
                     })
 
-					.AddAutomation(options =>
+                    .AddAutomation(options =>
-					{
+                    {
-						options.HasBaseInterval(new TimeSpan(0, 15, 0))
+                        options.HasBaseInterval(new TimeSpan(0, 5, 0))
-							.HasMaxFailures(1)
+                            .HasMaxFailures(5)
-                                //.HasJob<TestJob>(options => options.HasInterval(new TimeSpan(7, 0, 0, 0)));
+                            //.HasJob<TestJob>(options => options.HasInterval(new TimeSpan(7, 0, 0, 0)));
-                                //
+                            //
-                                //.HasJob<SyncronizeProducts>(options => options.HasInterval(new TimeSpan(24, 0, 0)))
+                            //.HasJob<SyncronizeProducts>(options => options.HasInterval(new TimeSpan(24, 0, 0)))
-                                //	.HasJob<ProcessWhiFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0)));
+                            //	.HasJob<ProcessWhiFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0)));
-                                //.HasJob<ProcessWhiVehicles>(options => options.HasInterval(new TimeSpan(24, 0, 0))
+                            //.HasJob<ProcessWhiVehicles>(options => options.HasInterval(new TimeSpan(24, 0, 0))
-                                //.HasDependency<SyncronizeProducts>()
+                            //.HasDependency<SyncronizeProducts>()
-                                //.HasJob<UpdateFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0)));
+                            //.HasJob<UpdateFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0)));
-                                //.HasJob<UpdatePositioning>(options => options.HasInterval(new TimeSpan(24, 0, 0))
+                            //.HasJob<UpdatePositioning>(options => options.HasInterval(new TimeSpan(24, 0, 0))
-                                //		.HasDependency<UpdateFitment>()
+                            //		.HasDependency<UpdateFitment>()
-                                //	.HasDependency<ProcessWhiFitment>()
+                            //	.HasDependency<ProcessWhiFitment>()
-                                //	.HasDependency<SyncronizeProducts>()
+                            //	.HasDependency<SyncronizeProducts>()
-                                //	.StartsAt(DateTime.Today.AddHours(8))
+                            //	.StartsAt(DateTime.Today.AddHours(8))
-                                //) ;
+                            //) ;
-                                //.HasJob<StatusCheck>(options => options.HasInterval(new TimeSpan(24, 0, 0))
+                            //.HasJob<StatusCheck>(options => options.HasInterval(new TimeSpan(24, 0, 0))
-                                //	.StartsAt(DateTime.Parse("2021-04-01 08:00:00"))
+                            //	.StartsAt(DateTime.Parse("2021-04-01 08:00:00"))
-                                //)
+                            //)
-                                //.HasJob<ExecuteSsisPackages>(options =>
+                            //.HasJob<ExecuteSsisPackages>(options =>
-                                //    options.HasInterval(new TimeSpan(24, 0, 0))
+                            //    options.HasInterval(new TimeSpan(24, 0, 0))
-                                //    //.StartsAt(DateTime.Today.AddHours(25))
+                            //        .StartsAt(DateTime.Today.AddHours(-24))
-                                //    )
+                            //    )
-
+                            .HasJob<UpdatePricing>(options =>
-                            .HasJob<UpdateFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0))
+                                options.HasInterval(new TimeSpan(24, 0, 0))
-                                //.HasDependency<ExecuteSsisPackages>()
+                                    .StartsAt(DateTime.Today.AddHours(-22))
-                         //       .StartsAt(DateTime.Today.AddHours(28))
+                                    //.HasDependency<ExecuteSsisPackages>()
-                            );
+                                );
+                            //.HasJob<BulkUpdateInventory>(options =>
+                            //    options.HasInterval(new TimeSpan(1, 0, 0))
+                            //        .StartsAt(DateTime.Today.AddHours(-27))
+                            //    );
+                            //.HasJob<TestJob>(options =>
+                            //    options.HasInterval(new TimeSpan(1, 0, 0))
+                            //        .StartsAt(DateTime.Today.AddHours(-27).AddMinutes(30))
                             //);
-                            //.AddApiServer();
+
+                        //.HasJob<PartialInventoryUpdate>(options => options.HasInterval(new TimeSpan(1, 0, 0))
+                        //.HasDependency<ExecuteSsisPackages>()
+                        //	   .StartsAt(DateTime.Today)
+                        //);
+                        //);
+                        //.AddApiServer();
                     })
 
-					.AddSingleton<EmailService>()
+                    .AddSingleton<EmailService>()
-					.AddSingleton<SsisService>()
+                    .AddSingleton<SsisService>()
-					.AddSingleton<WhiSeoService>()
+                    .AddSingleton<WhiSeoService>()
-					.AddSingleton<VehicleService>()
+                    .AddSingleton<VehicleService>()
-					.AddSingleton<VehicleFitmentService>()
+                    .AddSingleton<VehicleFitmentService>()
-					.AddSingleton<NexpartService>()
+                    .AddSingleton<NexpartService>()
+                    .AddSingleton<PartService>()
 
-					.AddAutoMapper(typeof(PartSourceProfile));
+                    .AddAutoMapper(typeof(PartSourceProfile));
-				})
+                })
-				.ConfigureLogging((builder, logging) =>
+                .ConfigureLogging((builder, logging) =>
-				{
+                {
-					logging.AddEventLog();
+                    logging.AddEventLog();
-					logging.AddConsole();
+                    logging.AddConsole();
 
-					//	logging.AddProvider(new AutomationLoggerProvider());
+                    //	logging.AddProvider(new AutomationLoggerProvider());
-				});
+                });
-		}
+        }
-	}
+    }
 }

PartSource.Automation/Services/FtpService.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using PartSource.Automation.Models.Configuration;
+using PartSource.Automation.Models.Ftp;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -9,44 +10,119 @@ using System.Threading.Tasks;
 
 namespace PartSource.Automation.Services
 {
-	public class FtpService
+    public class FtpService
-	{
+    {
-		private readonly FtpConfiguration _ftpConfiguration;
+        private readonly FtpConfiguration _ftpConfiguration;
 
-		public FtpService(FtpConfiguration ftpConfiguration)
+        public FtpService(FtpConfiguration ftpConfiguration)
-		{
+        {
-			_ftpConfiguration = ftpConfiguration;
+            _ftpConfiguration = ftpConfiguration;
-		}
+        }
 
-		public string[] ListFiles(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);
-			request.Method = WebRequestMethods.Ftp.ListDirectory;
+            request.Method = WebRequestMethods.Ftp.ListDirectoryDetails;
 
-			using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
+            using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
-			using StreamReader reader = new StreamReader(response.GetResponseStream());
+            using StreamReader reader = new StreamReader(response.GetResponseStream());
 
-			string files = reader.ReadToEnd();
+            IList<FtpFileInfo> files = new List<FtpFileInfo>();
+            string[] fileStrings = reader.ReadToEnd().Split("\r\n");
 
-			return files.Length > 0
+            foreach (string fileString in fileStrings)
-				? files.Split("\r\n")
+            {
-				: Array.Empty<string>();
+                if (string.IsNullOrEmpty(fileString))
-		}
+                {
+                    continue;
+                }
 
-		public void Download(string filename)
+                string dateString = fileString[..17];
-		{
+                string[] sizeAndName = fileString[18..].TrimStart().Split(" ", 2);
-			string file = $"{_ftpConfiguration.Destination}\\{filename.Replace("/", "\\")}";
 
-			FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{filename}"));
+                if (sizeAndName[0].ToUpperInvariant().IndexOf("DIR") > -1)
-			request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
+                {
-			request.Method = WebRequestMethods.Ftp.DownloadFile;
+                    files.Add(new FtpFileInfo
-			
+                    {
-			using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
+                        Modified = DateTime.Parse(fileString[..17]),
-			using Stream responseStream = response.GetResponseStream();
+                        Size = 0,
-			using FileStream fileStream = new FileStream($"{_ftpConfiguration.Destination}\\{filename.Replace("/", "\\")}", FileMode.Create);
+                        Filename = sizeAndName[1].Trim(),
-			
+                        FileType = FtpFileType.Directory
-			responseStream.CopyTo(fileStream);
+                    });
-		}
+                }
-	}
+
+                else
+                {
+                    files.Add(new FtpFileInfo
+                    {
+                        Modified = DateTime.Parse(fileString[..17]),
+                        Size = long.Parse(sizeAndName[0]),
+                        Filename = sizeAndName[1].Trim(),
+                        FileType = FtpFileType.File
+                    });
+                }
+            }
+
+            return files;
+        }
+
+        public string[] ListFiles(string directory = "")
+        {
+            FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{directory}"));
+            request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
+            request.Method = WebRequestMethods.Ftp.ListDirectory;
+
+            using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
+            using StreamReader reader = new StreamReader(response.GetResponseStream());
+
+            string files = reader.ReadToEnd();
+
+            return files.Length > 0
+                ? files.Split("\r\n")
+                : Array.Empty<string>();
+        }
+
+        public string Download(string filename, string destination = null)
+        {
+            FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{filename}"));
+            request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
+            request.Method = WebRequestMethods.Ftp.DownloadFile;
+
+            if (string.IsNullOrEmpty(destination))
+            {
+                destination = _ftpConfiguration.Destination;
+            }
+
+            if (Path.DirectorySeparatorChar == '\\')
+            {
+                filename = filename.Replace("/", "\\");
+            }
+
+            destination = Path.Combine(destination, filename);
+            string destinationDirectory = Path.GetDirectoryName(destination);
+            if (!Directory.Exists(destinationDirectory))
+            {
+                Directory.CreateDirectory(destinationDirectory);
+            }
+            
+            using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
+            using Stream responseStream = response.GetResponseStream();
+            using FileStream fileStream = new FileStream(destination, FileMode.Create);
+
+            responseStream.CopyTo(fileStream);
+
+            return destination;
+        }
+
+        public void Delete(string filename)
+        {
+            FtpWebRequest request = (FtpWebRequest)WebRequest.Create(new Uri($"{_ftpConfiguration.Url}/{filename}"));
+            request.Credentials = new NetworkCredential(_ftpConfiguration.Username, _ftpConfiguration.Password);
+            request.Method = WebRequestMethods.Ftp.DeleteFile;
+
+
+            using FtpWebResponse response = (FtpWebResponse)request.GetResponse();
+        }
+    }
 }

PartSource.Automation/Services/SsisService.cs

@@ -28,7 +28,7 @@ namespace PartSource.Automation.Services
                 {
                     StartInfo = new ProcessStartInfo
                     {
-                        FileName = "dtexec",
+                        FileName = "C:\\Program Files\\Microsoft SQL Server\\150\\DTS\\Binn\\dtexec.exe",
                         Arguments = $"/file \"{_ssisConfiguration.Directory}\\{packageName}\"",
                         UseShellExecute = false,
                         CreateNoWindow = false,

PartSource.Automation/Services/VehicleFitmentService.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using PartSource.Data.Contexts;
 using PartSource.Data.Dtos;
 using PartSource.Data.Models;
@@ -90,21 +91,24 @@ namespace PartSource.Automation.Services
 
 		public IList<int> GetVehicleIdFitment(IList<Vehicle> vehicles)
 		{
-			return vehicles.Select(v => v.VehicleToEngineConfigId).Distinct().ToArray();
+			return vehicles != null 
+				? vehicles.Select(v => v.VehicleToEngineConfigId).Distinct().ToArray()
+				: new List<int>();
 		}
 
-		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))
 			{
 				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
 				.Where(f => f.PartNumber == partNumber && whiCodes.Contains(f.LineCode))
@@ -122,38 +126,5 @@ namespace PartSource.Automation.Services
 
 			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();
-		}
 	}
 }

PartSource.Automation/Services/WhiSeoService.cs

@@ -5,167 +5,154 @@ using Microsoft.Extensions.Logging;
 using PartSource.Automation.Models.Configuration;
 using PartSource.Automation.Models.Enums;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace PartSource.Automation.Services
 {
-	public class WhiSeoService
+    public class WhiSeoService
-	{
+    {
-		private readonly FtpService _ftpService;
+        private readonly FtpService _ftpService;
-		private readonly string _connectionString;
+        private readonly string _connectionString;
-		private readonly ILogger<WhiSeoService> _logger;
+        private readonly ILogger<WhiSeoService> _logger;
 
-		public WhiSeoService(IConfiguration configuration, ILogger<WhiSeoService> logger)
+        public WhiSeoService(IConfiguration configuration, ILogger<WhiSeoService> logger)
-		{
+        {
-			FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:WhiConfiguration").Get<FtpConfiguration>();
+            FtpConfiguration ftpConfiguration = configuration.GetSection("FtpServers:WhiConfiguration").Get<FtpConfiguration>();
-			_ftpService = new FtpService(ftpConfiguration);
+            _ftpService = new FtpService(ftpConfiguration);
 
-			_connectionString = configuration.GetConnectionString("FitmentDatabase");
+            _connectionString = configuration.GetConnectionString("FitmentDatabase");
 
-			_logger = logger;
+            _logger = logger;
-		}
+        }
 
-		public void GetFiles(SeoDataType seoDataType)
+        public void GetFiles(SeoDataType seoDataType)
-		{
+        {
-			string seoDataTypeString = seoDataType.ToString().ToLowerInvariant();
+            string seoDataTypeString = seoDataType.ToString().ToLowerInvariant();
-			string[] files = _ftpService.ListFiles(seoDataTypeString);
+            
+            // WHI changed the transfer protocol to SFTP and then messed with the directory structure.
+            // Since fitment isn't really all that automated anyway, just download the files manually with an SFTP client.
+            Console.WriteLine($"Remember to manually download the {seoDataTypeString} files with an SFTP client.  Press any key to continue.");
+            Console.ReadLine();
+        }
 
-			foreach (string file in files)
+        public void TruncateVehicleTable()
-			{
+        {
-				if (file.Contains(".csv"))
+            using SqlConnection connection = new SqlConnection(_connectionString);
-				{
+            connection.Open();
-					try
-					{
-						_ftpService.Download($"{seoDataTypeString}/{file}");
-						_logger.LogInformation($"Finished downloading {file}.");
-					}
 
+            using SqlCommand command = new SqlCommand($"truncate table dbo.Vehicle", connection);
+            command.ExecuteNonQuery();
+        }
 
-					catch (Exception ex)
+        public void TruncateFitmentTables()
-					{
+        {
-						_logger.LogWarning($"Failed to download {file}, quitting", ex);
+            using SqlConnection connection = new SqlConnection(_connectionString);
-						throw;
+            connection.Open();
-					}
-				}
-			}
-		}
 
-		public void TruncateVehicleTable()
+            using SqlCommand command = new SqlCommand($"exec DropFitmentTables", connection);
-		{
+            command.ExecuteNonQuery();
-			using SqlConnection connection = new SqlConnection(_connectionString);
+        }
-			connection.Open();
 
-			using SqlCommand command = new SqlCommand($"truncate table dbo.Vehicle", connection);
+        public void SaveNotes(IDictionary<string, string> notes)
-			command.ExecuteNonQuery();
+        {
-		}
+            using DataTable dataTable = new DataTable();
+            dataTable.Columns.Add("NoteText", typeof(string));
+            dataTable.Columns.Add("Hash", typeof(string));
 
-		public void TruncateFitmentTables()
+            foreach (KeyValuePair<string, string> note in notes)
-		{
+            {
-			using SqlConnection connection = new SqlConnection(_connectionString);
-			connection.Open();
 
-			using SqlCommand command = new SqlCommand($"exec DropFitmentTables", connection);
+                dataTable.Rows.Add(new string[] { note.Value, note.Key });
-			command.ExecuteNonQuery();
+            }
-		}
 
-		public void SaveNotes(IDictionary<string, string> notes)
+            using SqlConnection connection = new SqlConnection(_connectionString);
-		{
+            connection.Open();
-			using DataTable dataTable = new DataTable();
-			dataTable.Columns.Add("NoteText", typeof(string));
-			dataTable.Columns.Add("Hash", typeof(string));
 
-			foreach (KeyValuePair<string, string> note in notes)
+            using SqlBulkCopy bulk = new SqlBulkCopy(connection)
-			{
+            {
+                DestinationTableName = $"FitmentNote",
+                BulkCopyTimeout = 14400
+            };
 
-				dataTable.Rows.Add(new string[] { note.Value, note.Key });
+            bulk.WriteToServer(dataTable);
-			}
+        }
 
-			using SqlConnection connection = new SqlConnection(_connectionString);
+        public void BulkCopyFitment(DataTable dataTable, string tableName)
-			connection.Open();
+        {
+            using SqlConnection connection = new SqlConnection(_connectionString);
+            connection.Open();
 
-			using SqlBulkCopy bulk = new SqlBulkCopy(connection)
+            string sql = string.Empty;
-			{
-				DestinationTableName = $"FitmentNote",
-				BulkCopyTimeout = 14400
-			};
 
-			bulk.WriteToServer(dataTable);
+            using SqlCommand command = new SqlCommand($"EXEC CreateFitmentTempTable @tableName = '{tableName}'", connection);
-		}
+            command.ExecuteNonQuery();
 
-		public void BulkCopyFitment(DataTable dataTable, string tableName)
+            using SqlBulkCopy bulk = new SqlBulkCopy(connection)
-		{
+            {
-			using SqlConnection connection = new SqlConnection(_connectionString);
+                DestinationTableName = $"FitmentTemp.{tableName}",
-			connection.Open();
+                BulkCopyTimeout = 14400
+            };
 
-			string sql = string.Empty;
+            bulk.WriteToServer(dataTable);
+        }
 
-			using SqlCommand command = new SqlCommand($"EXEC CreateFitmentTempTable @tableName = '{tableName}'", connection);
+        public void BulkCopyVehicle(DataTable dataTable, string tableName)
-			command.ExecuteNonQuery();
+        {
+            using SqlConnection connection = new SqlConnection(_connectionString);
+            connection.Open();
 
-			using SqlBulkCopy bulk = new SqlBulkCopy(connection)
+            string sql = string.Empty;
-			{
-				DestinationTableName = $"FitmentTemp.{tableName}",
-				BulkCopyTimeout = 14400
-			};
 
-			bulk.WriteToServer(dataTable);
+            using SqlCommand command = new SqlCommand($"EXEC CreateVehicleTempTable @tableName = '{tableName}'", connection);
-		}
+            command.ExecuteNonQuery();
 
-		public void BulkCopyVehicle(DataTable dataTable, string tableName)
+            using SqlBulkCopy bulk = new SqlBulkCopy(connection)
-		{
+            {
-			using SqlConnection connection = new SqlConnection(_connectionString);
+                DestinationTableName = $"VehicleTemp.{tableName}",
-			connection.Open();
+                BulkCopyTimeout = 14400
+            };
 
-			string sql = string.Empty;
+            bulk.WriteToServer(dataTable);
+        }
 
-			using SqlCommand command = new SqlCommand($"EXEC CreateVehicleTempTable @tableName = '{tableName}'", connection);
+        public void CreateFitmentTable(string tableName)
-			command.ExecuteNonQuery();
+        {
+            using SqlConnection connection = new SqlConnection(_connectionString);
+            connection.Open();
 
-			using SqlBulkCopy bulk = new SqlBulkCopy(connection)
+            using SqlCommand command = new SqlCommand($"exec CreateFitmentTable @tableName = '{tableName}'", connection);
-			{
+            command.CommandTimeout = 1800;
-				DestinationTableName = $"VehicleTemp.{tableName}",
+            command.ExecuteNonQuery();
-				BulkCopyTimeout = 14400
+        }
-			};
 
-			bulk.WriteToServer(dataTable);
+        public void CreateFitmentView()
-		}
+        {
+            using SqlConnection connection = new SqlConnection(_connectionString);
+            connection.Open();
 
-		public void CreateFitmentTable(string tableName)
+            using SqlCommand command = new SqlCommand($"exec CreateFitmentView", connection);
-		{
+            command.CommandTimeout = 1800;
-			using SqlConnection connection = new SqlConnection(_connectionString);
+            command.ExecuteNonQuery();
-			connection.Open();
 
-			using SqlCommand command = new SqlCommand($"exec CreateFitmentTable @tableName = '{tableName}'", connection);
+            using SqlCommand command2 = new SqlCommand($"exec CreateFitmentIndexes", connection);
-			command.CommandTimeout = 1800;
+            command.CommandTimeout = 3600;
-			command.ExecuteNonQuery();
+            command2.ExecuteNonQuery();
-		}
+        }
 
-		public void CreateFitmentView()
+        public void CreateVehicleTable()
-		{
+        {
-			using SqlConnection connection = new SqlConnection(_connectionString);
+            using SqlConnection connection = new SqlConnection(_connectionString);
-			connection.Open();
+            connection.Open();
 
-			using SqlCommand command = new SqlCommand($"exec CreateFitmentView", connection);
+            using SqlCommand command = new SqlCommand($"exec CreateVehicleTable", connection);
-			command.CommandTimeout = 1800;
+            command.CommandTimeout = 1800;
-			command.ExecuteNonQuery();
+            command.ExecuteNonQuery();
-
+        }
-			using SqlCommand command2 = new SqlCommand($"exec CreateFitmentIndexes", connection);
+    }
-			command.CommandTimeout = 1800;
-			command2.ExecuteNonQuery();
-		}
-
-		public void CreateVehicleTable()
-		{
-			using SqlConnection connection = new SqlConnection(_connectionString);
-			connection.Open();
-
-			using SqlCommand command = new SqlCommand($"exec CreateVehicleTable", connection);
-			command.CommandTimeout = 1800;
-			command.ExecuteNonQuery();
-		}
-	}
 }
 #pragma warning restore CA2100 // Review SQL queries for security vulnerabilities	

PartSource.Automation/appsettings.json

@@ -1,26 +1,28 @@
 {
 	"ConnectionStrings": {
-		"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true;TrustServerCertificate=True",
+		"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true;TrustServerCertificate=true",
+		//"FitmentDatabase": "Server=tcp:ps-automation.eastus2.cloudapp.azure.com,1433;Initial Catalog=WhiFitment;User ID=sa;Password=GZ0`-ekd~[2u;Encrypt=True;TrustServerCertificate=True;Connection Timeout=300",
 		"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": {
 		"From": "alerts@ps-automation.eastus2.cloudapp.azure.com",
-		"To": "tom@soundpress.com,Anas.Bajwa@Partsource.ca,josh@soundpress.com,alex.au@partsource.ca,michael.massara@partsource.ca",
+		"To": "tom@soundpress.com,josh@soundpress.com,alex.au@partsource.ca,michael.massara@partsource.ca",
-		//"To": "tom@tomraterman.com",
+		//"To": "tom@tomraterman.com,josh@soundpress.com",
 		"SmtpHost": "localhost"
 	},
 	"FtpServers": {
-		"AzureConfiguration": {
-			"Username": "ps-ftp\\$ps-ftp",
-			"Password": "ycvXptffBxqkBXW4vuRYqn4Zi1soCvnvMMolTe5HNSeAlcl3bAyJYtNhG579",
-			"Url": "ftp://waws-prod-yq1-007.ftp.azurewebsites.windows.net/site/wwwroot",
-			"Destination": "C:\\Partsource.Automation\\Downloads"
-		},
 		"WhiConfiguration": {
 			"Username": "ctc_seo",
-			"Password": "be34hz64e4",
+			"Password": "YD3gtaQ5kPdtNKs",
 			"Url": "ftp://ftp.whisolutions.com",
-			"Destination": "C:\\Partsource.Automation\\Downloads\\WHI"
+			"Destination": "C:\\Partsource.Automation\\Downloads\\WHI",
+			"Port": 3001
+		},
+		"AutomationConfiguration": {
+			"Username": "stageuser",
+			"Password": "FXepK^cFYS|[H<",
+			"Url": "ftp://localhost",
+			"Destination": "C:\\Partsource.Automation\\Downloads"
 		}
 	},
 	"ssisConfiguration": {

PartSource.Data/Contexts/FitmentContext.cs

@@ -13,13 +13,19 @@ namespace PartSource.Data.Contexts
 
 		public DbSet<DcfMapping> DcfMappings { get; set; }
 
+		public DbSet<Part> Parts { get; set; }
+
 		public DbSet<Fitment> Fitments { get; set; }
 
 		public DbSet<FitmentNote> FitmentNotes { get; set; }
 
+		public DbSet<ProductType> ProductTypes { get; set; }
+
 		public DbSet<Vehicle> Vehicles { get; set; }
 
-		public DbSet<Wiper> Wipers { get; set; }
+        public DbSet<VehicleFitment> VehicleFitments { get; set; }
+
+        public DbSet<Wiper> Wipers { get; set; }
 
 		protected override void OnModelCreating(ModelBuilder modelBuilder)
 		{
@@ -28,8 +34,9 @@ namespace PartSource.Data.Contexts
 			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});
+            modelBuilder.Entity<VehicleFitment>().HasNoKey();
 
-			foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
+            foreach (IMutableEntityType entityType in modelBuilder.Model.GetEntityTypes())
 			{
 				entityType.SetTableName(entityType.ClrType.Name);
 			}

PartSource.Data/Contexts/PartSourceContext.cs

@@ -26,13 +26,13 @@ namespace PartSource.Data.Contexts
 
         public DbSet<PartPrice> PartPrices { get; set; }
 
-        public DbSet<Part> Parts { get; set; }
+       // public DbSet<Part> Parts { get; set; }
 
         public DbSet<ShopifyChangelog> ShopifyChangelogs { get; set; }
 
         public DbSet<Vehicle> Vehicles { get; set; }
         
-        public DbSet<PartsAvailability> PartAvailabilities { get; set; }
+        public DbSet<PartAvailability> PartAvailabilities { get; set; }
 
         public DbSet<BaseVehicle> BaseVehicles { get; set; }
 
@@ -48,7 +48,7 @@ namespace PartSource.Data.Contexts
         {
             base.OnModelCreating(modelBuilder);
 
-            modelBuilder.Entity<PartsAvailability>().HasKey(p => new { p.Store, p.SKU });
+            modelBuilder.Entity<PartAvailability>().HasKey(p => new { p.Store, p.SKU });
             modelBuilder.Entity<DcfMapping>().HasKey(d => new { d.LineCode, d.WhiCode });
 
             modelBuilder.Entity<ShopifyChangelog>()

PartSource.Data/Dtos/VehicleFitmentDto.cs

@@ -5,10 +5,15 @@ using System.Text;
 
 namespace PartSource.Data.Dtos
 {
-	public class VehicleFitmentDto
+    public class VehicleFitmentDto : VehicleFitment
-	{
+    {
-		public Fitment Fitment { get; set; }
+        public string PartDescription { get; set; }
+        
+        // May not be needed, but don't remove just yet
+        public IList<string> SubmodelNames { get; set; }
 
-		public Vehicle Vehicle { get; set; }
+        public IList<string> DriveTypes { get; set; }
-	}
+
-}
+        public IList<string> Notes { get; set; }
+    }
+}

PartSource.Data/Models/PartAvailability.cs

@@ -1,9 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PartSource.Data.Models
 {
-    public class PartsAvailability
+    public class PartAvailability
     {
         [Column(Order = 0)]
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -13,14 +14,8 @@ namespace PartSource.Data.Models
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public int SKU { get; set; }
 
-        [Column("Line Code")]
-        [StringLength(50)]
-        public string Line_Code { get; set; }
-
-        [Column("Part Number")]
-        [StringLength(50)]
-        public string Part_Number { get; set; }
-
         public int? QTY { get; set; }
+
+        public string Updated { get; set; }
     }
 }

PartSource.Data/Models/ProductType.cs

@@ -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 ProductType
+    {
+        [Key]
+        public string Name { get; set; }
+
+        public bool Active { get; set; }
+    }
+}

PartSource.Data/Models/VehicleFitment.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace PartSource.Data.Models
+{
+    public class VehicleFitment
+    {
+        public string Sku { get; set; }
+
+        public string LineCode { get; set; }
+
+        public string PartNumber { get; set; }
+
+        [JsonIgnore]
+        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; }
+    }
+}

PartSource.Data/Nexpart/AddImg.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class AddImg
     {
         [XmlAttribute]

PartSource.Data/Nexpart/AddImgs.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class AddImgs
     {
         [XmlElement]

PartSource.Data/Nexpart/Answer.cs

@@ -0,0 +1,22 @@
+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(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
+    public class Answer
+    {
+        [XmlAttribute]
+        public int Id { get; set; }
+
+        [XmlAttribute]
+        public int Count { get; set; }
+
+        [XmlText]
+        public string Value { get; set; }
+    }
+}

PartSource.Data/Nexpart/App.cs

@@ -8,7 +8,7 @@ using Newtonsoft.Json;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class App
     {
         [XmlElement]

PartSource.Data/Nexpart/ApplicationSearch.cs

@@ -7,7 +7,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class ApplicationSearch
     {
         public ApplicationSearch()
@@ -31,9 +31,15 @@ namespace PartSource.Data.Nexpart
         public bool SecondaryDCF => true;
 
         [XmlElement(Order = 6)]
-        public Criterion[] Criterion { get; set; }
+        public string[] AppOption { get; set; } 
 
         [XmlElement(Order = 7)]
+        public Criterion[] Criterion { get; set; }
+
+        [XmlElement(Order = 8)]
         public string GroupBy { get; set; }
+
+        [XmlElement(Order = 9)]
+        public string QuestionOption { get; set; }
     }
 }

PartSource.Data/Nexpart/ApplicationSearchResponse.cs

@@ -8,14 +8,14 @@ using PartSource.Data.Nexpart.Interfaces;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
-    public class ApplicationSearchResponse : IResponseElement<Apps>
+    public class ApplicationSearchResponse : IResponseElement<object>
     {
-
         [XmlElement]
         public PSResponseHeader PSResponseHeader { get; set; }
 
-        [XmlElement(ElementName = nameof(Apps))]
+        [XmlElement(ElementName = nameof(Apps), Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(Apps))]
-        public Apps ResponseBody { get; set; }
+        [XmlElement(ElementName = nameof(Questions), Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(Questions))]
+        public object ResponseBody { get; set; }
     }
 }

PartSource.Data/Nexpart/Apps.cs

@@ -3,10 +3,10 @@ using Newtonsoft.Json;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Apps
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         [JsonProperty("wipers")]
         public App[] App { get; set; }
     }

PartSource.Data/Nexpart/BaseVehicle.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class BaseVehicle
     {
         [XmlAttribute]

PartSource.Data/Nexpart/BaseVehicleDetail.cs

@@ -8,22 +8,22 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetail
   {
     [XmlAttribute]
     public int WHIMakeId { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public int BaseVehicleId { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public string MakeName { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public string ModelName { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public int Year { get; set; }
   }
 }

PartSource.Data/Nexpart/BaseVehicleDetailLookup.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetailLookup
   {
     public BaseVehicleDetailLookup()

PartSource.Data/Nexpart/BaseVehicleDetailLookupResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetailLookupResponse : IResponseElement<BaseVehicleDetail>
   {
     [XmlElement]

PartSource.Data/Nexpart/BaseVehicleSearch.cs

@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicleSearch
     {
         public BaseVehicleSearch()

PartSource.Data/Nexpart/BaseVehicleSearchResponse.cs

@@ -3,7 +3,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicleSearchResponse : IResponseElement<BaseVehicles>
     {
         [XmlElement]

PartSource.Data/Nexpart/BaseVehicles.cs

@@ -5,10 +5,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicles
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public BaseVehicle[] BaseVehicle { get; set; }
 
 

PartSource.Data/Nexpart/Body.cs

@@ -8,37 +8,37 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Body
     {
-        [XmlElement(ElementName = "ApplicationSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearch))]
+        [XmlElement(ElementName = "ApplicationSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ApplicationSearch))]
-        [XmlElement(ElementName = "ApplicationSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearchResponse))]
+        [XmlElement(ElementName = "ApplicationSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ApplicationSearchResponse))]
-        [XmlElement(ElementName = "BaseVehicleDetailLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookup))]
+        [XmlElement(ElementName = "BaseVehicleDetailLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleDetailLookup))]
-        [XmlElement(ElementName = "BaseVehicleDetailLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookupResponse))]
+        [XmlElement(ElementName = "BaseVehicleDetailLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleDetailLookupResponse))]
-        [XmlElement(ElementName = "BaseVehicleSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearch))]
+        [XmlElement(ElementName = "BaseVehicleSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleSearch))]
-        [XmlElement(ElementName = "BaseVehicleSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearchResponse))]
+        [XmlElement(ElementName = "BaseVehicleSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleSearchResponse))]
-        [XmlElement(ElementName = "EngineSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearch))]
+        [XmlElement(ElementName = "EngineSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(EngineSearch))]
-        [XmlElement(ElementName = "EngineSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearchResponse))]
+        [XmlElement(ElementName = "EngineSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(EngineSearchResponse))]
-        [XmlElement(ElementName = "MakeSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MakeSearch))]
+        [XmlElement(ElementName = "MakeSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MakeSearch))]
-        [XmlElement(ElementName = "MakeSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MakeSearchResponse))]
+        [XmlElement(ElementName = "MakeSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MakeSearchResponse))]
-        [XmlElement(ElementName = "ModelSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ModelSearch))]
+        [XmlElement(ElementName = "ModelSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ModelSearch))]
-        [XmlElement(ElementName = "ModelSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ModelSearchResponse))]
+        [XmlElement(ElementName = "ModelSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ModelSearchResponse))]
-        [XmlElement(ElementName = "MenuNodesLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MenuNodesLookup))]
+        [XmlElement(ElementName = "MenuNodesLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MenuNodesLookup))]
-        [XmlElement(ElementName = "MenuNodesLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MenuNodesLookupResponse))]
+        [XmlElement(ElementName = "MenuNodesLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MenuNodesLookupResponse))]
-        [XmlElement(ElementName = "PartTypeSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypeSearch))]
+        [XmlElement(ElementName = "PartTypeSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypeSearch))]
-        [XmlElement(ElementName = "PartTypeSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypeSearchResponse))]
+        [XmlElement(ElementName = "PartTypeSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypeSearchResponse))]
-        [XmlElement(ElementName = "PartTypesValidateLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypesValidateLookup))]
+        [XmlElement(ElementName = "PartTypesValidateLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypesValidateLookup))]
-        [XmlElement(ElementName = "PartTypesValidateLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypesValidateLookupResponse))]
+        [XmlElement(ElementName = "PartTypesValidateLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypesValidateLookupResponse))]
-        [XmlElement(ElementName = "SmartPageDataSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SmartPageDataSearch))]
+        [XmlElement(ElementName = "SmartPageDataSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SmartPageDataSearch))]
-        [XmlElement(ElementName = "SmartPageDataSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SmartPageDataSearchResponse))]
+        [XmlElement(ElementName = "SmartPageDataSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SmartPageDataSearchResponse))]
-        [XmlElement(ElementName = "SubModelSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SubModelSearch))]
+        [XmlElement(ElementName = "SubModelSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SubModelSearch))]
-        [XmlElement(ElementName = "SubModelSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SubModelSearchResponse))]
+        [XmlElement(ElementName = "SubModelSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SubModelSearchResponse))]
-        [XmlElement(ElementName = "VehicleIdSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleIdSearch))]
+        [XmlElement(ElementName = "VehicleIdSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleIdSearch))]
-        [XmlElement(ElementName = "VehicleIdSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleIdSearchResponse))]
+        [XmlElement(ElementName = "VehicleIdSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleIdSearchResponse))]
-        [XmlElement(ElementName = "VehicleTypesGet", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleTypesGet))]
+        [XmlElement(ElementName = "VehicleTypesGet", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleTypesGet))]
-        [XmlElement(ElementName = "VehicleTypesGetResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleTypesGetResponse))]
+        [XmlElement(ElementName = "VehicleTypesGetResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleTypesGetResponse))]
-        [XmlElement(ElementName = "WHIEngineSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(WHIEngineSearch))]
+        [XmlElement(ElementName = "WHIEngineSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(WHIEngineSearch))]
-        [XmlElement(ElementName = "WHIEngineSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(WHIEngineSearchResponse))]
+        [XmlElement(ElementName = "WHIEngineSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(WHIEngineSearchResponse))]
         public object Content { get; set; }
     }
 }

PartSource.Data/Nexpart/Criterion.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class Criterion
 	{
 		[XmlAttribute]

PartSource.Data/Nexpart/Engine.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Engine
     {
         [XmlAttribute]

PartSource.Data/Nexpart/EngineSearch.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class EngineSearch
 	{
 		public EngineSearch()

PartSource.Data/Nexpart/EngineSearchResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class EngineSearchResponse : IResponseElement<Engines>
   {
     [XmlElement]

PartSource.Data/Nexpart/Engines.cs

@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Engines
   {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public Engine[] Engine;
   }
 }

PartSource.Data/Nexpart/Exceptions.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/header/parts")]
   public class Exceptions
   {
     [XmlAttribute(AttributeName = "code")]

PartSource.Data/Nexpart/Item.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Item
   {
     [XmlAttribute]

PartSource.Data/Nexpart/Items.cs

@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Items
     {
-        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
         public PartSource.Data.Nexpart.Item[] Item { get; set; }
     }
 }

PartSource.Data/Nexpart/Make.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Make
   {
     [XmlText]

PartSource.Data/Nexpart/MakeSearch.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class MakeSearch
   {
     public MakeSearch()
@@ -18,16 +18,16 @@ namespace PartSource.Data.Nexpart
       this.RegionId = new int[]{ 2 };
     }
 
-    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
     public PSRequestHeader PSRequestHeader { get; set; }
 
-    [XmlElement(ElementName = "Years", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+    [XmlElement(ElementName = "Years", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
     public Years Years { get; set; }
 
-    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
     public int[] RegionId { get; set; }
 
-    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 4)]
+    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 4)]
     public int[] VehicleTypeId { get; set; }
   }
 }

PartSource.Data/Nexpart/MakeSearchResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class MakeSearchResponse : IResponseElement<Makes>
   {
     [XmlElement]

PartSource.Data/Nexpart/Makes.cs

@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Makes
   {
-    [XmlElement(ElementName = "Make", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+    [XmlElement(ElementName = "Make", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
     public PartSource.Data.Nexpart.Make[] Make { get; set; }
   }
 }

PartSource.Data/Nexpart/MenuNode.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNode
     {
         [XmlAttribute]

PartSource.Data/Nexpart/MenuNodes.cs

@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodes
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public MenuNode[] MenuNode{ get; set; }
     }
 }

PartSource.Data/Nexpart/MenuNodesLookup.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodesLookup
     {
         public MenuNodesLookup()

PartSource.Data/Nexpart/MenuNodesLookupResponse.cs

@@ -3,7 +3,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodesLookupResponse : IResponseElement<MenuNodes>
     {
         [XmlElement]

PartSource.Data/Nexpart/Model.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Model
   {
     [XmlText]

PartSource.Data/Nexpart/ModelSearch.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class ModelSearch
   {
     public ModelSearch()
@@ -17,19 +17,19 @@ namespace PartSource.Data.Nexpart
       this.RegionId = new int[] { 2 };
     }
 
-    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
     public PSRequestHeader PSRequestHeader { get; set; }
 
-    [XmlElement(ElementName = "Year", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+    [XmlElement(ElementName = "Year", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
     public int Year { get; set; }
 
-    [XmlElement(ElementName = "MakeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+    [XmlElement(ElementName = "MakeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
     public int MakeId { get; set; }
 
-    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 4)]
+    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 4)]
     public int[] RegionId { get; set; }
 
-    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 5)]
+    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 5)]
     public int[] VehicleTypeId { get; set; }
   }
 }

PartSource.Data/Nexpart/ModelSearchResponse.cs

@@ -9,13 +9,13 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class ModelSearchResponse : IResponseElement<Models[]>
   {
     [XmlElement]
     public PSResponseHeader PSResponseHeader { get; set; }
 
-    [XmlElement(ElementName = "Models", Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlElement(ElementName = "Models", Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public Models[] ResponseBody { get; set; }
   }
 }

PartSource.Data/Nexpart/Models.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Models
   {
         public Models()
@@ -19,7 +19,7 @@ namespace PartSource.Data.Nexpart
     [XmlAttribute]
     public int Region { get; set; }
 
-    [XmlElement(ElementName = "Model", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(ElementName = "Model", Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public PartSource.Data.Nexpart.Model[] Model { get; set; }
   }
 }

PartSource.Data/Nexpart/PSRequestHeader.cs

@@ -8,19 +8,19 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PSRequestHeader
   {
     public PSRequestHeader()
     {
-      this.SvcVersion = "1.0";
+      this.SvcVersion = "2.0";
       this.ReturnWarnings = "true";
     }
 
-    [XmlElement(ElementName = "SvcVersion", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "SvcVersion", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string SvcVersion { get; set; }
 
-    [XmlElement(ElementName = "ReturnWarnings", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "ReturnWarnings", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string ReturnWarnings { get; set; }
   }
 }

PartSource.Data/Nexpart/PSResponseHeader.cs

@@ -8,25 +8,25 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PSResponseHeader
   {
-    [XmlElement(ElementName = "RequestId", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "RequestId", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string RequestId { get; set; }
 
-    [XmlElement(ElementName = "RequestProcessingTime", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "RequestProcessingTime", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string RequestProcessingTime { get; set; }
 
-    [XmlElement(ElementName = "Build", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "Build", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string Build { get; set; }
 
-    [XmlElement(ElementName = "TimeStamp", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "TimeStamp", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string TimeStamp { get; set; }
 
-    [XmlElement(ElementName = "StatusCode", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "StatusCode", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string StatusCode { get; set; }
 
-    [XmlElement(ElementName = "Exceptions", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "Exceptions", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public PartSource.Data.Nexpart.Exceptions[] Exceptions { get; set; }
   }
 }

PartSource.Data/Nexpart/Part.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Part
 	{
         [XmlElement]
@@ -15,7 +15,7 @@ namespace PartSource.Data.Nexpart
         public PartPartType PartType { get; set; }
 
             // There are two different kinds of PartType because of course there are...
-        [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public class PartPartType
         {
             [XmlAttribute]

PartSource.Data/Nexpart/PartNumber.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
 	public class PartNumber
 	{
 		[XmlText]

PartSource.Data/Nexpart/PartType.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartType
   {
     [XmlAttribute]

PartSource.Data/Nexpart/PartTypeSearch.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypeSearch
   {
     public PartTypeSearch()

PartSource.Data/Nexpart/PartTypeSearchResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class PartTypeSearchResponse : IResponseElement<PartTypes>
     {
         [XmlElement]

PartSource.Data/Nexpart/PartTypes.cs

@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypes
   {
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public PartSource.Data.Nexpart.PartType[] PartType { get; set; }
   }
 }

PartSource.Data/Nexpart/PartTypesValidateLookup.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class PartTypesValidateLookup
     {
         public PartTypesValidateLookup()

PartSource.Data/Nexpart/PartTypesValidateLookupResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypesValidateLookupResponse : IResponseElement<PartTypes>
   {
     [XmlElement]

PartSource.Data/Nexpart/PrimaryImg.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class PrimaryImg
   {
     [XmlElement]

PartSource.Data/Nexpart/Question.cs

@@ -0,0 +1,25 @@
+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(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
+    public class Question
+    {
+        [XmlAttribute(AttributeName = "Attrib")]
+        public string Attribute { get; set; }
+
+        [XmlAttribute]
+        public int Count { get; set; }
+
+        [XmlAttribute]
+        public string Text { get; set; }
+
+        [XmlElement]
+        public Answer[] Answer { get; set; }
+    }
+}

PartSource.Data/Nexpart/Questions.cs

@@ -0,0 +1,19 @@
+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(Namespace = "http://whisolutions.com/pss/common/model/parts")]
+    public class Questions
+    {
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
+        public Question[] Question { get; set; }
+
+        [XmlAttribute]
+        public int NumApps { get; set; }
+    }
+}

PartSource.Data/Nexpart/Region.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Region
     {
         [XmlAttribute]

PartSource.Data/Nexpart/RegionId.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class RegionId
 	{
 		[XmlText]

PartSource.Data/Nexpart/ResultOption.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class ResultOption
     {
         [XmlText]

PartSource.Data/Nexpart/SmartPageDataSearch.cs

@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SmartPageDataSearch
     {
         public SmartPageDataSearch()
@@ -10,15 +10,15 @@ namespace PartSource.Data.Nexpart
             PSRequestHeader = new PSRequestHeader();
         }
 
-        [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+        [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
         public PSRequestHeader PSRequestHeader { get; set; }
 
         
-        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
         public Item[] Items { get; set; }
 
        
-        [XmlElement(ElementName = "DataOption", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+        [XmlElement(ElementName = "DataOption", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
         public string[] DataOption { get; set; }
     }
 }

PartSource.Data/Nexpart/SmartPageDataSearchResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class SmartPageDataSearchResponse : IResponseElement<Items>
   {
     [XmlElement]

PartSource.Data/Nexpart/SubModel.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class SubModel
     {
         [XmlAttribute]

PartSource.Data/Nexpart/SubModelSearchResponse.cs

@@ -6,7 +6,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModelSearchResponse : IResponseElement<SubModels>
     {
         [XmlElement]

PartSource.Data/Nexpart/SubModels.cs

@@ -5,10 +5,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModels
     {
-            [XmlElement(ElementName = "SubModel", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+            [XmlElement(ElementName = "SubModel", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
             public SubModel[] SubModel { get; set; }
     }
 }

PartSource.Data/Nexpart/SubModelsSearch.cs

@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModelSearch
     {
         public SubModelSearch()

PartSource.Data/Nexpart/VehicleDetail.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleDetail
     {
         [XmlAttribute]
@@ -32,7 +32,7 @@ namespace PartSource.Data.Nexpart
         [XmlAttribute]
         public int VehicleToEngineConfigId { get; set; }
 
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public BaseVehicle BaseVehicle { get; set; }
     }
 }

PartSource.Data/Nexpart/VehicleIdSearch.cs

@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleIdSearch
     {
         public VehicleIdSearch()

PartSource.Data/Nexpart/VehicleIdSearchResponse.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class VehicleIdSearchResponse : IResponseElement<VehicleDetail>
   {
     [XmlElement]

PartSource.Data/Nexpart/VehicleIdentifier.cs

@@ -8,13 +8,13 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleIdentifier
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public int BaseVehicleId { get; set; }
 
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public int EngineConfigId { get; set; }
 
         public bool ShouldSerializeBaseVehicleId()