From 668e50f5d089a228a43db3ad76d49d8176163b13 Mon Sep 17 00:00:00 2001 From: J0S39H-MC Date: Sun, 15 Dec 2019 20:51:21 -0600 Subject: [PATCH 01/18] commit solution. --- .gitattributes | 63 ++++ .gitignore | 340 ++++++++++++++++++ README.md | 30 +- SimpleOrderSearch.Console/Program.cs | 12 + .../SimpleOrderSearch.Console.csproj | 8 + SimpleOrderSearch.Desktop/App.config | 14 + SimpleOrderSearch.Desktop/App.xaml | 9 + SimpleOrderSearch.Desktop/App.xaml.cs | 17 + SimpleOrderSearch.Desktop/FodyWeavers.xml | 4 + SimpleOrderSearch.Desktop/FodyWeavers.xsd | 26 ++ SimpleOrderSearch.Desktop/MainViewModel.cs | 119 ++++++ SimpleOrderSearch.Desktop/MainWindow.xaml | 66 ++++ SimpleOrderSearch.Desktop/MainWindow.xaml.cs | 28 ++ .../Properties/AssemblyInfo.cs | 55 +++ .../Properties/Resources.Designer.cs | 71 ++++ .../Properties/Resources.resx | 117 ++++++ .../Properties/Settings.Designer.cs | 30 ++ .../Properties/Settings.settings | 7 + .../ProxyClient/OrderSearchProxy.cs | 31 ++ .../SimpleOrderSearch.Desktop.csproj | 169 +++++++++ SimpleOrderSearch.Desktop/packages.config | 17 + SimpleOrderSearch.ModelStandard/Extensions.cs | 33 ++ SimpleOrderSearch.ModelStandard/OrderInfo.cs | 25 ++ .../OrderSearchQuery.cs | 27 ++ .../PagedOrderInfo.cs | 21 ++ .../SimpleOrderSearch.Model.csproj | 7 + .../SimpleOrderSearch.Tests.csproj | 15 + SimpleOrderSearch.Tests/UnitTest1.cs | 13 + SimpleOrderSearch.sln | 49 +++ SimpleOrderSearch/Contracts/IDataAccessor.cs | 34 ++ .../Contracts/JsonDataAccessor.cs | 41 +++ .../Controllers/OrderSearchController.cs | 51 +++ SimpleOrderSearch/Data/orderInfo.json | 136 +++++++ SimpleOrderSearch/Program.cs | 24 ++ .../Properties/launchSettings.json | 30 ++ .../SimpleOrderSearch.Service.csproj | 25 ++ SimpleOrderSearch/Startup.cs | 52 +++ .../appsettings.Development.json | 9 + SimpleOrderSearch/appsettings.json | 8 + 39 files changed, 1814 insertions(+), 19 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 SimpleOrderSearch.Console/Program.cs create mode 100644 SimpleOrderSearch.Console/SimpleOrderSearch.Console.csproj create mode 100644 SimpleOrderSearch.Desktop/App.config create mode 100644 SimpleOrderSearch.Desktop/App.xaml create mode 100644 SimpleOrderSearch.Desktop/App.xaml.cs create mode 100644 SimpleOrderSearch.Desktop/FodyWeavers.xml create mode 100644 SimpleOrderSearch.Desktop/FodyWeavers.xsd create mode 100644 SimpleOrderSearch.Desktop/MainViewModel.cs create mode 100644 SimpleOrderSearch.Desktop/MainWindow.xaml create mode 100644 SimpleOrderSearch.Desktop/MainWindow.xaml.cs create mode 100644 SimpleOrderSearch.Desktop/Properties/AssemblyInfo.cs create mode 100644 SimpleOrderSearch.Desktop/Properties/Resources.Designer.cs create mode 100644 SimpleOrderSearch.Desktop/Properties/Resources.resx create mode 100644 SimpleOrderSearch.Desktop/Properties/Settings.Designer.cs create mode 100644 SimpleOrderSearch.Desktop/Properties/Settings.settings create mode 100644 SimpleOrderSearch.Desktop/ProxyClient/OrderSearchProxy.cs create mode 100644 SimpleOrderSearch.Desktop/SimpleOrderSearch.Desktop.csproj create mode 100644 SimpleOrderSearch.Desktop/packages.config create mode 100644 SimpleOrderSearch.ModelStandard/Extensions.cs create mode 100644 SimpleOrderSearch.ModelStandard/OrderInfo.cs create mode 100644 SimpleOrderSearch.ModelStandard/OrderSearchQuery.cs create mode 100644 SimpleOrderSearch.ModelStandard/PagedOrderInfo.cs create mode 100644 SimpleOrderSearch.ModelStandard/SimpleOrderSearch.Model.csproj create mode 100644 SimpleOrderSearch.Tests/SimpleOrderSearch.Tests.csproj create mode 100644 SimpleOrderSearch.Tests/UnitTest1.cs create mode 100644 SimpleOrderSearch.sln create mode 100644 SimpleOrderSearch/Contracts/IDataAccessor.cs create mode 100644 SimpleOrderSearch/Contracts/JsonDataAccessor.cs create mode 100644 SimpleOrderSearch/Controllers/OrderSearchController.cs create mode 100644 SimpleOrderSearch/Data/orderInfo.json create mode 100644 SimpleOrderSearch/Program.cs create mode 100644 SimpleOrderSearch/Properties/launchSettings.json create mode 100644 SimpleOrderSearch/SimpleOrderSearch.Service.csproj create mode 100644 SimpleOrderSearch/Startup.cs create mode 100644 SimpleOrderSearch/appsettings.Development.json create mode 100644 SimpleOrderSearch/appsettings.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ce6fdd --- /dev/null +++ b/.gitignore @@ -0,0 +1,340 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- Backup*.rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb \ No newline at end of file diff --git a/README.md b/README.md index b68f928..75c6a2f 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,19 @@ # simpleOrderSearch simpleOrderSearch +Solution Built Using: -I want to assess your ability to create an application and REST API service. It truly is the bare minimum of knowledge necessary to be successful in this position. I don't want you to spend a lot of time on this. You should be able to do this in an hour or so if the job is right for you. +.NET Core 2.2 +.NET Standard +Visual Studio 2019 +WPF +RX.NET -Order Search -This programming task consists of building a simple console application to search for orders. Fork this repository and create your application. It should take this input from the user: +Instructions: -(Order Number || (MSA && Status)) && CompletionDte +Download solution as zip and extract. +Set SimpleOrderSearch.Desktop and SimpleOrderSearch.Service as startup projects. Ensuring that the service is the first project to start up. +Run the service solution and the client solution. +The UI should be easy to navigate. -The console application will call a service that you create using C#. I have provided some sample data for the application in the JSON file in the data folder. - - - -The file contains an array whose elements represent orders. The data should be defined as a model in your service. - -The application calling the service can be a console app. You have total freedom to do what you want but make sure it can do these three things: - -• Validate that the user has provided the right criteria to make a search - -• Provide an offset and page value for pagination. - -• Write the outputs of the service call to a console window. - -Create a pull request once you have it working. I will clone your repository, verify that it works, and evaluate it. Please ensure you include any instructions for running that may be required. diff --git a/SimpleOrderSearch.Console/Program.cs b/SimpleOrderSearch.Console/Program.cs new file mode 100644 index 0000000..63cc405 --- /dev/null +++ b/SimpleOrderSearch.Console/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace SimpleOrderSearch.Console +{ + class Program + { + static void Main(string[] args) + { + //Console.WriteLine("Hello World!"); + } + } +} diff --git a/SimpleOrderSearch.Console/SimpleOrderSearch.Console.csproj b/SimpleOrderSearch.Console/SimpleOrderSearch.Console.csproj new file mode 100644 index 0000000..21dff5c --- /dev/null +++ b/SimpleOrderSearch.Console/SimpleOrderSearch.Console.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp2.2 + + + diff --git a/SimpleOrderSearch.Desktop/App.config b/SimpleOrderSearch.Desktop/App.config new file mode 100644 index 0000000..acaa45d --- /dev/null +++ b/SimpleOrderSearch.Desktop/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SimpleOrderSearch.Desktop/App.xaml b/SimpleOrderSearch.Desktop/App.xaml new file mode 100644 index 0000000..b90de89 --- /dev/null +++ b/SimpleOrderSearch.Desktop/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/SimpleOrderSearch.Desktop/App.xaml.cs b/SimpleOrderSearch.Desktop/App.xaml.cs new file mode 100644 index 0000000..39da15c --- /dev/null +++ b/SimpleOrderSearch.Desktop/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace SimpleOrderSearch.Desktop +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/SimpleOrderSearch.Desktop/FodyWeavers.xml b/SimpleOrderSearch.Desktop/FodyWeavers.xml new file mode 100644 index 0000000..e12df67 --- /dev/null +++ b/SimpleOrderSearch.Desktop/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/SimpleOrderSearch.Desktop/FodyWeavers.xsd b/SimpleOrderSearch.Desktop/FodyWeavers.xsd new file mode 100644 index 0000000..f3ac476 --- /dev/null +++ b/SimpleOrderSearch.Desktop/FodyWeavers.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/SimpleOrderSearch.Desktop/MainViewModel.cs b/SimpleOrderSearch.Desktop/MainViewModel.cs new file mode 100644 index 0000000..62d66c5 --- /dev/null +++ b/SimpleOrderSearch.Desktop/MainViewModel.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using ReactiveUI; +using ReactiveUI.Fody.Helpers; +using DynamicData.Binding; +using System.Collections.ObjectModel; +using SimpleOrderSearch.Model; +using System.Reactive; +using SimpleOrderSearch.Desktop.ProxyClient; +using DynamicData; + +namespace SimpleOrderSearch.Desktop +{ + public class MainViewModel : ReactiveObject + { + [Reactive] public string OrderNo { get; set; } + [Reactive] public string MSA { get; set; } + [Reactive] public string Status { get; set; } + [Reactive] public DateTime? CompletionDate { get; set; } = DateTime.Now; + + [Reactive] public int PageSize { get; set; } = 5; + [Reactive] public int PageNo { get; set; } = 1; + [Reactive] public bool HasValidCriteria { get; set; } + [Reactive] public bool CanPageUp { get; set; } + [Reactive] public bool CanPageDown { get; set; } + [Reactive] public string ErrorMsg { get; set; } + + public ObservableCollection Orders { get; set; } = new ObservableCollection(); + + ReactiveCommand _rxSearchCommand; + ReactiveCommand _rxCommandPageUp; + ReactiveCommand _rxCommandPageDown; + public ReactiveCommand RxSearchCommad => _rxSearchCommand; + public ReactiveCommand RxCommandPageUp => _rxCommandPageUp; + public ReactiveCommand RxCommandPageDown => _rxCommandPageDown; + + public MainViewModel() + { + this.WhenAnyValue(x => x.MSA, x => x.Status, x => x.OrderNo, x => x.CompletionDate).Do(OnNextParamter).Subscribe(); + var canSearch = this.WhenAnyValue(x => x.HasValidCriteria); + var canPageUp = this.WhenAnyValue(x => x.HasValidCriteria, x => x.Orders.Count, x => x.CanPageUp, x => x.PageNo).Select(x => x.Item1 && x.Item2 > 0 && !x.Item3 && x.Item4 > 0); + var canPageDown = this.WhenAnyValue(x => x.HasValidCriteria, x => x.Orders.Count, x => x.CanPageDown, x => x.PageNo).Select(x => x.Item1 && x.Item2 > 0 && !x.Item3 && x.Item4 > 0); + + _rxSearchCommand = ReactiveCommand.Create(() => OnSearch(), canSearch); + _rxCommandPageUp = ReactiveCommand.Create(() => OnPageUp(), canPageUp); + _rxCommandPageDown = ReactiveCommand.Create(() => OnPageDown(), canPageDown); + } + + private void OnPageDown() + { + PageNo -= 1; + OnSearch(); + } + + private void OnPageUp() + { + PageNo += 1; + OnSearch(); + } + + private void OnSearch() + { + OrderSearchQuery query = new OrderSearchQuery() + { + CompletionDate = this.CompletionDate, + MSA = MSA.ToNullableValue(), + OrderNumber = OrderNo.ToNullableValue(), + Page = this.PageNo, + PageLimit = this.PageSize, + Status = Status.ToNullableValue() + }; + + var orderResults = OrderSearchProxy.GetOrders(query); + this.CanPageDown = orderResults.IsStart; + this.CanPageUp = orderResults.IsEnd; + + Orders.Clear(); + foreach (var result in orderResults.Orders) + { + Orders.Add(result); + } + } + + private void OnNextParamter((string msa, string status, string orderno, DateTime? completionDate) obj) + { + List errors = new List(); + + if (!obj.completionDate.HasValue) + errors.Add("Valid CompletionDate Required."); + + var orderObj = NumericValidation(obj.orderno); + var msaObj = NumericValidation(obj.msa); + var statusObj = NumericValidation(obj.status); + + if (!orderObj.isValid && !msaObj.isValid && !statusObj.isValid) + errors.Add("Valid Numeric OrderNo or Valid Numeric Status and MSA value Required."); + else if (!orderObj.isValid) + { + if (msaObj.isValid && !statusObj.isValid) + errors.Add("Numeric Status Value Required."); + else if (!msaObj.isValid && statusObj.isValid) + errors.Add("Numeric MSA Value Required."); + } + HasValidCriteria = !errors.Any(); + ErrorMsg = string.Join("|", errors); + } + + private (object orgValue, int parsedValue, bool isValid) NumericValidation(object o) + { + int parsedValue; + bool isValid = int.TryParse(o == null ? "" : o.ToString(), out parsedValue); + return (o, parsedValue, isValid); + } + } +} \ No newline at end of file diff --git a/SimpleOrderSearch.Desktop/MainWindow.xaml b/SimpleOrderSearch.Desktop/MainWindow.xaml new file mode 100644 index 0000000..71e55ff --- /dev/null +++ b/SimpleOrderSearch.Desktop/MainWindow.xaml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +