From 7f00d55ce69f700d3fe810e4fb659d56c0edf392 Mon Sep 17 00:00:00 2001 From: danmash721 <65614057+danmash721@users.noreply.github.com> Date: Tue, 19 May 2020 18:00:02 +0200 Subject: [PATCH 1/2] Added my changes --- TechTest/.gitattributes | 63 ++++ TechTest/.gitignore | 340 ++++++++++++++++++ .../AnyCompany.Tests/AnyCompany.Tests.csproj | 44 ++- .../AnyCompany.Tests/CustomerOrderTest.cs | 62 ++++ TechTest/AnyCompany.Tests/packages.config | 4 + TechTest/AnyCompany/AnyCompany.csproj | 2 + TechTest/AnyCompany/Customer.cs | 2 + TechTest/AnyCompany/CustomerOrder.cs | 14 + TechTest/AnyCompany/CustomerRepository.cs | 84 +++++ .../AnyCompany/Interface/IOrderService.cs | 13 + TechTest/AnyCompany/Order.cs | 1 + TechTest/AnyCompany/OrderRepository.cs | 8 +- TechTest/AnyCompany/OrderService.cs | 22 +- 13 files changed, 636 insertions(+), 23 deletions(-) create mode 100644 TechTest/.gitattributes create mode 100644 TechTest/.gitignore create mode 100644 TechTest/AnyCompany.Tests/CustomerOrderTest.cs create mode 100644 TechTest/AnyCompany.Tests/packages.config create mode 100644 TechTest/AnyCompany/CustomerOrder.cs create mode 100644 TechTest/AnyCompany/Interface/IOrderService.cs diff --git a/TechTest/.gitattributes b/TechTest/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/TechTest/.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/TechTest/.gitignore b/TechTest/.gitignore new file mode 100644 index 0000000..4ce6fdd --- /dev/null +++ b/TechTest/.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/TechTest/AnyCompany.Tests/AnyCompany.Tests.csproj b/TechTest/AnyCompany.Tests/AnyCompany.Tests.csproj index b537fc2..8f4c113 100644 --- a/TechTest/AnyCompany.Tests/AnyCompany.Tests.csproj +++ b/TechTest/AnyCompany.Tests/AnyCompany.Tests.csproj @@ -1,10 +1,10 @@ - + Debug AnyCPU - cd5d577e-bdc9-4dfc-ac6a-b1da474995f3 + {CD5D577E-BDC9-4DFC-AC6A-B1DA474995F3} Library Properties AnyCompany.Tests @@ -30,24 +30,34 @@ 4 - - - - - - - - - - - - - - + + ..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + + + + + + {C7E15594-7D8F-4C18-9DD7-14F3FBB1572D} + AnyCompany + + - + \ No newline at end of file diff --git a/TechTest/AnyCompany.Tests/CustomerOrderTest.cs b/TechTest/AnyCompany.Tests/CustomerOrderTest.cs new file mode 100644 index 0000000..3716287 --- /dev/null +++ b/TechTest/AnyCompany.Tests/CustomerOrderTest.cs @@ -0,0 +1,62 @@ +using AnyCompany.Interface; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AnyCompany.Tests +{ + [TestClass] + public class CustomerOrderTest + { + public static IOrderService orderService; + + [TestMethod] + public void TestOrderInvalidCustomerID() + { + Order order = new Order + { + CustomerID = -1, + Amount = 20, + OrderId = 1, + VAT = 14 + }; + var success = orderService.PlaceOrder(order, -1, out string message); + Assert.AreEqual(success, false); + Assert.AreEqual(message, "Please insert valid customer id"); + } + + [TestMethod] + public void TestOrderInvalidAmount() + { + Order order = new Order + { + CustomerID = 1, + Amount = 20, + OrderId = 1, + VAT = 14 + }; + var success = orderService.PlaceOrder(order, 1, out string message); + Assert.AreEqual(success, false); + Assert.AreEqual(message, "Amount can not be zero or below, please provide a correct amount and try again"); + } + + [TestMethod] + public void TestOrderSuccess() + { + Order order = new Order + { + CustomerID = 1, + Amount = 20, + OrderId = 1, + VAT = 14 + }; + var success = orderService.PlaceOrder(order, 1, out string message); + Assert.AreEqual(success, true); + Assert.AreEqual(message, ""); + } + + } +} diff --git a/TechTest/AnyCompany.Tests/packages.config b/TechTest/AnyCompany.Tests/packages.config new file mode 100644 index 0000000..e6b0379 --- /dev/null +++ b/TechTest/AnyCompany.Tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TechTest/AnyCompany/AnyCompany.csproj b/TechTest/AnyCompany/AnyCompany.csproj index 5b0498d..c047c18 100644 --- a/TechTest/AnyCompany/AnyCompany.csproj +++ b/TechTest/AnyCompany/AnyCompany.csproj @@ -41,7 +41,9 @@ + + diff --git a/TechTest/AnyCompany/Customer.cs b/TechTest/AnyCompany/Customer.cs index aa994b6..94de854 100644 --- a/TechTest/AnyCompany/Customer.cs +++ b/TechTest/AnyCompany/Customer.cs @@ -1,9 +1,11 @@ using System; +using System.Collections.Generic; namespace AnyCompany { public class Customer { + public int CustomerID { get; set; } public string Country { get; set; } public DateTime DateOfBirth { get; set; } diff --git a/TechTest/AnyCompany/CustomerOrder.cs b/TechTest/AnyCompany/CustomerOrder.cs new file mode 100644 index 0000000..b899eff --- /dev/null +++ b/TechTest/AnyCompany/CustomerOrder.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AnyCompany +{ + public class CustomerOrder + { + public Customer Customer { get; set; } + public List Orders { get; set; } + } +} diff --git a/TechTest/AnyCompany/CustomerRepository.cs b/TechTest/AnyCompany/CustomerRepository.cs index e3de9b7..5c34f70 100644 --- a/TechTest/AnyCompany/CustomerRepository.cs +++ b/TechTest/AnyCompany/CustomerRepository.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using System.Data.SqlClient; +using System.Linq; namespace AnyCompany { @@ -20,6 +22,7 @@ public static Customer Load(int customerId) while (reader.Read()) { + customer.CustomerID = Convert.ToInt32(reader["CustomerID"].ToString()); customer.Name = reader["Name"].ToString(); customer.DateOfBirth = DateTime.Parse(reader["DateOfBirth"].ToString()); customer.Country = reader["Country"].ToString(); @@ -29,5 +32,86 @@ public static Customer Load(int customerId) return customer; } + + public static Customer Save(Customer customer) + { + using (SqlConnection connection = new SqlConnection(ConnectionString)) + { + + SqlCommand command = new SqlCommand("INSERT INTO Customer (Name, DateOfBirth, Country) OUTPUT INSERTED.CustomerID VALUES (@Name, @DateOfBirth, @Country) ", connection); + + command.Parameters.AddWithValue("@Name", customer.Name); + command.Parameters.AddWithValue("@DateOfBirth", customer.DateOfBirth); + command.Parameters.AddWithValue("@Country", customer.Country); + + connection.Open(); + + customer.CustomerID = (int)command.ExecuteScalar(); + + } + + return customer; + } + + public static List LoadCustomers() + { + List customers = new List(); + + using (SqlConnection connection = new SqlConnection(ConnectionString)) + { + SqlCommand command = new SqlCommand("SELECT * FROM Customer LEFT JOIN Order ON Customer.CustomerID = Order.CustomerID", connection); + + connection.Open(); + + var reader = command.ExecuteReader(); + + int customerId = 0; + + while (reader.Read()) + { + int readerCustId = Convert.ToInt32(reader["CustomerID"]); + + if (readerCustId == customerId) + { + Customer customer = new Customer() + { + CustomerID = readerCustId, + Name = reader["Name"].ToString(), + DateOfBirth = DateTime.Parse(reader["DateOfBirth"].ToString()), + Country = reader["Country"].ToString() + }; + + Order order = new Order + { + CustomerID = readerCustId, + OrderId = Convert.ToInt32(reader["OrderId"]), + Amount = Convert.ToDouble(reader["Amount"]), + VAT = Convert.ToDouble(reader["VAT"]) + }; + + + customers.Add(new CustomerOrder + { + Customer = customer, + Orders = new List { order } + }); + } + else + { + customers.Where(c => c.Customer.CustomerID == readerCustId).FirstOrDefault().Orders.Add(new Order + { + CustomerID = readerCustId, + OrderId = Convert.ToInt32(reader["OrderId"]), + Amount = Convert.ToDouble(reader["Amount"]), + VAT = Convert.ToDouble(reader["VAT"]) + }); + } + } + + connection.Close(); + } + + return customers; + } } } diff --git a/TechTest/AnyCompany/Interface/IOrderService.cs b/TechTest/AnyCompany/Interface/IOrderService.cs new file mode 100644 index 0000000..15acc1e --- /dev/null +++ b/TechTest/AnyCompany/Interface/IOrderService.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AnyCompany.Interface +{ + public interface IOrderService + { + bool PlaceOrder(Order order, int customerId, out string message); + } +} diff --git a/TechTest/AnyCompany/Order.cs b/TechTest/AnyCompany/Order.cs index fec8e7b..3d71b17 100644 --- a/TechTest/AnyCompany/Order.cs +++ b/TechTest/AnyCompany/Order.cs @@ -5,5 +5,6 @@ public class Order public int OrderId { get; set; } public double Amount { get; set; } public double VAT { get; set; } + public int CustomerID { get; set; } } } diff --git a/TechTest/AnyCompany/OrderRepository.cs b/TechTest/AnyCompany/OrderRepository.cs index 3229885..e5b43cf 100644 --- a/TechTest/AnyCompany/OrderRepository.cs +++ b/TechTest/AnyCompany/OrderRepository.cs @@ -1,4 +1,6 @@ -using System.Data.SqlClient; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; namespace AnyCompany { @@ -11,8 +13,9 @@ public void Save(Order order) SqlConnection connection = new SqlConnection(ConnectionString); connection.Open(); - SqlCommand command = new SqlCommand("INSERT INTO Orders VALUES (@OrderId, @Amount, @VAT)", connection); + SqlCommand command = new SqlCommand("INSERT INTO Orders VALUES (@CustomerID, @OrderId, @Amount, @VAT)", connection); + command.Parameters.AddWithValue("@CustomerID", order.CustomerID); command.Parameters.AddWithValue("@OrderId", order.OrderId); command.Parameters.AddWithValue("@Amount", order.Amount); command.Parameters.AddWithValue("@VAT", order.VAT); @@ -21,5 +24,6 @@ public void Save(Order order) connection.Close(); } + } } diff --git a/TechTest/AnyCompany/OrderService.cs b/TechTest/AnyCompany/OrderService.cs index ebfb103..daa3088 100644 --- a/TechTest/AnyCompany/OrderService.cs +++ b/TechTest/AnyCompany/OrderService.cs @@ -1,15 +1,29 @@ -namespace AnyCompany +using AnyCompany.Interface; + +namespace AnyCompany { - public class OrderService + public class OrderService : IOrderService { private readonly OrderRepository orderRepository = new OrderRepository(); - public bool PlaceOrder(Order order, int customerId) + public bool PlaceOrder(Order order, int customerId, out string message) { + message = ""; + + if(customerId == 0) + { + message = "Error, Customer ID should be greater than 0"; + return false; + } + Customer customer = CustomerRepository.Load(customerId); - if (order.Amount == 0) + order.CustomerID = customer.CustomerID; + + if (order.Amount <= 0) { + message = "Amount cannot be zero or less."; return false; + } if (customer.Country == "UK") order.VAT = 0.2d; From 835a083f74de7b7f5e4133f30a0cac245209488d Mon Sep 17 00:00:00 2001 From: danmash721 <65614057+danmash721@users.noreply.github.com> Date: Tue, 19 May 2020 18:27:37 +0200 Subject: [PATCH 2/2] Test --- TechTest/AnyCompany/OrderService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/TechTest/AnyCompany/OrderService.cs b/TechTest/AnyCompany/OrderService.cs index daa3088..a9f7ee7 100644 --- a/TechTest/AnyCompany/OrderService.cs +++ b/TechTest/AnyCompany/OrderService.cs @@ -16,6 +16,7 @@ public bool PlaceOrder(Order order, int customerId, out string message) return false; } + Customer customer = CustomerRepository.Load(customerId); order.CustomerID = customer.CustomerID;