diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..bc2d543 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# refactoring-dotnet + +An example project demonstrating cleaning up legacy code in a .NET Core MVC project + +This repository was created for the Productive Dev YouTube series on refactoring legacy code ([here's the link](https://www.youtube.com/watch?v=uj0RWP3DdUo&list=PL3_YUnRN3Uhh8H3Zw2M6KDdP3aAlbfT8j)). + +## Key concepts + +- Improving testability +- Inversion of control via dependency injection +- Message-sending between objects +- Making smaller things +- Improving naming +- Extracting configuration +- Programming to abstractions instead of implementations +- Replacing conditional logic with polymorphism +- Using factory methods +- Using async / await +- Using `Task.FromResult` for non-asynchronous overiddes of `Task` methods +- Writing unit and integration tests +- Monitoring code quality using static code analysis +- Creating a continuous integration loop + +## To Follow along via YouTube series +The `main` branch contains the result of refactoring the legacy code. The `legacy_code` branch contains the starting point of the project, from where the refactoring begins. + +- Clone the repository +- Checkout the `legacy_code` branch +- Complete the refactor diff --git a/Refactoring.Tests/Refactoring.Tests.csproj b/Refactoring.Tests/Refactoring.Tests.csproj new file mode 100644 index 0000000..b916d90 --- /dev/null +++ b/Refactoring.Tests/Refactoring.Tests.csproj @@ -0,0 +1,26 @@ + + + + netcoreapp3.1 + + false + + + + + + + + + + + + + + + + + + + + diff --git a/Refactoring.Tests/Tests/Services/OrderProcessors/TestCambridgeOrderProcessor.cs b/Refactoring.Tests/Tests/Services/OrderProcessors/TestCambridgeOrderProcessor.cs new file mode 100644 index 0000000..c88f2b3 --- /dev/null +++ b/Refactoring.Tests/Tests/Services/OrderProcessors/TestCambridgeOrderProcessor.cs @@ -0,0 +1,76 @@ +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services; +using Refactoring.Web.Services.Interfaces; +using Refactoring.Web.Services.OrderProcessors; +using Xunit; + +namespace Refactoring.Tests.Tests.Services.OrderProcessors { + public class TestCambridgeOrderProcessor { + [Fact] + public async void GivenDateIsTuesday_ImageUrl_Set_OnOrderAdvert() { + // Arrange + var testOrder = new Order { + Id = "foo" + }; + var fakeAdvertPrinter= new Mock(); + + var fakeDateTimeResolver = new Mock(); + fakeDateTimeResolver.Setup(m => m.IsItTuesday()).Returns(true); + + var fakeChamberOfCommerceApi = new Mock(); + var fakeDataResult = new DataResult { + ThumbnailUrl = "http://example.com/some_thumbnail.png", + Title = "My Title..." + }; + fakeChamberOfCommerceApi + .Setup(m => m.GetImageAndThumbnailDataFor(It.IsAny())) + .Returns(Task.FromResult(fakeDataResult)); + + var sut = new CambridgeOrderProcessor( + fakeChamberOfCommerceApi.Object, + fakeAdvertPrinter.Object, + fakeDateTimeResolver.Object); + + // Act + var result = await sut.PrintAdvertAndUpdateOrder(testOrder); + + // Assert + result.Advert.ImageUrl.Should().Be(fakeDataResult.ThumbnailUrl); + } + + [Fact] + public async void GivenDateIsNotTuesday_ImageUrl_NotSet_OnOrderAdvert() { + // Arrange + var testOrder = new Order { + Id = "foo" + }; + var fakeAdvertPrinter= new Mock(); + + var fakeDateTimeResolver = new Mock(); + fakeDateTimeResolver.Setup(m => m.IsItTuesday()).Returns(false); + + var fakeChamberOfCommerceApi = new Mock(); + var fakeDataResult = new DataResult { + ThumbnailUrl = "http://example.com/some_thumbnail.png", + Title = "My Title..." + }; + fakeChamberOfCommerceApi + .Setup(m => m.GetImageAndThumbnailDataFor(It.IsAny())) + .Returns(Task.FromResult(fakeDataResult)); + + var sut = new CambridgeOrderProcessor( + fakeChamberOfCommerceApi.Object, + fakeAdvertPrinter.Object, + fakeDateTimeResolver.Object); + + // Act + var result = await sut.PrintAdvertAndUpdateOrder(testOrder); + + // Assert + result.Advert.ImageUrl.Should().BeNull(); + } + } +} \ No newline at end of file diff --git a/Refactoring.Tests/Tests/Services/OrderProcessors/TestMiddletonOrderProcessor.cs b/Refactoring.Tests/Tests/Services/OrderProcessors/TestMiddletonOrderProcessor.cs new file mode 100644 index 0000000..476db97 --- /dev/null +++ b/Refactoring.Tests/Tests/Services/OrderProcessors/TestMiddletonOrderProcessor.cs @@ -0,0 +1,45 @@ +using System; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Interfaces; +using Refactoring.Web.Services.OrderProcessors; +using Xunit; + +namespace Refactoring.Tests.Tests.Services.OrderProcessors { + public class TestMiddletonOrderProcessor { + [Theory] + [InlineData(0.05, "Get 5.00% off your next purchase!")] + [InlineData(0.08, "Get 8.00% off your next purchase!")] + [InlineData(0.18, "Get 18.00% off your next purchase!")] + public async Task Given_ItIsMorning_PrintAdvertAndUpdateOrder_Returns_Order_With_AdvertContent_AmDealRate( + decimal inputDeal, string expectedContent) { + // Arrange + var testOrder = new Order { + Id = "foo" + }; + + var fakeDealService = new Mock(); + fakeDealService.Setup(m => m.GenerateDeal(It.IsAny())) + .Returns(inputDeal); + + var fakeChamberOfCommerce = new Mock(); + var fakePrinter = new Mock(); + var fakeRandom = new Mock(); + + var sut = new MiddletonOrderProcessor( + fakeDealService.Object, + fakeChamberOfCommerce.Object, + fakePrinter.Object, + fakeRandom.Object + ); + + // Act + var order = await sut.PrintAdvertAndUpdateOrder(testOrder); + + // Assert + order.Advert.Content.Should().Be(expectedContent); + } + } +} \ No newline at end of file diff --git a/Refactoring.Tests/Tests/Services/TestDealService.cs b/Refactoring.Tests/Tests/Services/TestDealService.cs new file mode 100644 index 0000000..06f282a --- /dev/null +++ b/Refactoring.Tests/Tests/Services/TestDealService.cs @@ -0,0 +1,36 @@ +using System; +using FluentAssertions; +using Refactoring.Web.Services; +using Xunit; + +namespace Refactoring.Tests.Tests.Services { + public class TestDealService { + [Fact] + public void Given_MorningDateTime_GenerateDeal_Returns_AmRate() { + // Arrange + var sut = new DealService(); + var morningTime = new DateTime(2020, 10, 10, 10, 10, 10); + var amRate = DealService.AmRate; + + // Act + var generatedDealRate = sut.GenerateDeal(morningTime); + + // Assert + generatedDealRate.Should().Be(amRate); + } + + [Fact] + public void Given_EveningDateTime_GenerateDeal_Returns_PmRate() { + // Arrange + var sut = new DealService(); + var afternoonTime = new DateTime(2020, 10, 10, 20, 10, 10); + var pmRate = DealService.PmRate; + + // Act + var generatedDealRate = sut.GenerateDeal(afternoonTime); + + // Assert + generatedDealRate.Should().Be(pmRate); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Controllers/HomeController.cs b/Refactoring.Web/Controllers/HomeController.cs index eeceee0..13f6e8b 100644 --- a/Refactoring.Web/Controllers/HomeController.cs +++ b/Refactoring.Web/Controllers/HomeController.cs @@ -1,26 +1,25 @@ -using System.Collections.Generic; -using System.Diagnostics; +using System.Diagnostics; using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Logging; using Refactoring.Web.Models; +using Refactoring.Web.Services.Helpers; namespace Refactoring.Web.Controllers { + public class HomeController : Controller { private readonly ILogger _logger; public HomeController(ILogger logger) { _logger = logger; } - + public IActionResult Index() { _logger.LogDebug("Index loaded"); - var districts = new List { - "Cambridge", "Downtown", "County", "Middleton" - }; var viewModel = new OrderFormModel { - Districts = districts.Select(d => new SelectListItem { + Districts = District.StandardDistricts.Select( + d => new SelectListItem { Value = d.ToLower(), Text = d }) diff --git a/Refactoring.Web/Controllers/OrderController.cs b/Refactoring.Web/Controllers/OrderController.cs index e78301d..d88ba3c 100644 --- a/Refactoring.Web/Controllers/OrderController.cs +++ b/Refactoring.Web/Controllers/OrderController.cs @@ -1,23 +1,41 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Refactoring.Web.DomainModels; -using Refactoring.Web.Services; +using Refactoring.Web.Services.Interfaces; namespace Refactoring.Web.Controllers { public class OrderController : Controller { + private readonly ILogger _logger; + private readonly IOrderService _orderService; + + public OrderController( + ILogger logger, + IOrderService orderService) { + _logger = logger; + _orderService = orderService; + } + public IActionResult Index() { return View(); } [HttpPost] public async Task SubmitOrder(string selectedDistrict, decimal orderAmount) { - var order = new Order(); - order.District = selectedDistrict; - order.Total = orderAmount; - var orderService = new OrderService(order); - await orderService.ProcessOrder(); - var completedOrder = orderService.GetOrder(); - return View(completedOrder); + var order = new Order { + District = selectedDistrict, + Total = orderAmount + }; + + order = await _orderService.ProcessOrder(order); + + if (order != null) { + _logger.LogDebug($"Processed Order: {order.Id}"); + return View(order); + } + + _logger.LogError("Error processing order"); + return StatusCode(500); } } } \ No newline at end of file diff --git a/Refactoring.Web/Folder.DotSettings.user b/Refactoring.Web/Folder.DotSettings.user new file mode 100644 index 0000000..3eac0ea --- /dev/null +++ b/Refactoring.Web/Folder.DotSettings.user @@ -0,0 +1,6 @@ + + <SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="GivenDateIsTuesday_ImageUrl_Set_OnOrderAdvert" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <TestAncestor> + <TestId>xUnit::379BF7AF-7FEB-25F1-4786-CB2C870A3E27::.NETCoreApp,Version=v3.1::Refactoring.Web.Tests.OrderProcessors.TestCambridgeOrderProcessor.GivenDateIsTuesday_ImageUrl_Set_OnOrderAdvert</TestId> + </TestAncestor> +</SessionState> \ No newline at end of file diff --git a/Refactoring.Web/Refactoring.Web.csproj b/Refactoring.Web/Refactoring.Web.csproj index aa09f48..48eae9f 100644 --- a/Refactoring.Web/Refactoring.Web.csproj +++ b/Refactoring.Web/Refactoring.Web.csproj @@ -17,6 +17,7 @@ + diff --git a/Refactoring.Web/Services/ChamberOfCommerceAPI.cs b/Refactoring.Web/Services/ChamberOfCommerceAPI.cs index 8314522..165931b 100644 --- a/Refactoring.Web/Services/ChamberOfCommerceAPI.cs +++ b/Refactoring.Web/Services/ChamberOfCommerceAPI.cs @@ -1,25 +1,40 @@ -using System.Collections.Generic; +using System; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Newtonsoft.Json; +using Refactoring.Web.Services.Helpers; +using Refactoring.Web.Services.Interfaces; namespace Refactoring.Web.Services { - public static class ChamberOfCommerceApi { - public static async Task GetFor(string district) { - var client = new HttpClient(); - var districtLookup = new Dictionary() { - {"downtown", 11}, - {"county", 23}, - {"middleton", 18}, - {"cambridge", 42} - }; - var request = new HttpRequestMessage(HttpMethod.Get, - $"https://jsonplaceholder.typicode.com/photos/{districtLookup[district.ToLower()].ToString()}"); + public class ChamberOfCommerceApi : IChamberOfCommerceApi { + private readonly IConfiguration _config; + + public ChamberOfCommerceApi(IConfiguration config) { + _config = config; + } + + /// + /// For the provided `district` returns the `DataResult` object containing + /// the id, thumbnail url, and title for the district's image + /// + /// + /// + public async Task GetImageAndThumbnailDataFor(string district) { + using var client = new HttpClient(); + var absoluteUrl = BuildUrlForDistrict(district); + var request = new HttpRequestMessage(HttpMethod.Get, absoluteUrl); var response = client.SendAsync(request); var data = await response.Result.Content.ReadAsStringAsync(); var result = JsonConvert.DeserializeObject(data); return result; } + + private Uri BuildUrlForDistrict(string district) { + var districtId = District.GetDistrictNumberByName(district); + var basePhotoUrl = new Uri(_config.GetValue("BasePhotoUrl")); + return new Uri(basePhotoUrl, districtId.ToString()); + } } public struct DataResult { diff --git a/Refactoring.Web/Services/DealService.cs b/Refactoring.Web/Services/DealService.cs index 6aa1ade..f7bb5e8 100644 --- a/Refactoring.Web/Services/DealService.cs +++ b/Refactoring.Web/Services/DealService.cs @@ -1,25 +1,16 @@ using System; -using System.Collections.Generic; +using Refactoring.Web.Services.Interfaces; namespace Refactoring.Web.Services { - public class DealService { - public DealService() { } - - public decimal GenerateDeal(DateTime dateTime) { - if (dateTime.Hour > 12 && dateTime.Hour < 24) { - return 0.1M; - } else { - return 0.05M; - } - } + public class DealService : IDealService { + public static decimal PmRate => 0.1M; + public static decimal AmRate => 0.05M; - public string GetRandomLocalBusiness() { - var lbs = new List { - "Barbershop", "Bakery", "Shoe Store", "Pizza Place", "Diner", "Auto Repair", "Pharmacy", "Grocery", "Bakery" - }; - var random = new Random(); - var idx = random.Next(lbs.Count); - return lbs[idx]; - } + public decimal GenerateDeal(DateTime dateTime) + => IsAfternoon(dateTime) ? PmRate : AmRate; + + private static bool IsAfternoon(DateTime dateTime) + => dateTime.Hour > 12 + && dateTime.Hour < 24; } } \ No newline at end of file diff --git a/Refactoring.Web/Services/DistrictOrderFactory.cs b/Refactoring.Web/Services/DistrictOrderFactory.cs new file mode 100644 index 0000000..71e0f69 --- /dev/null +++ b/Refactoring.Web/Services/DistrictOrderFactory.cs @@ -0,0 +1,54 @@ +using System; +using Refactoring.Web.Services.Helpers; +using Refactoring.Web.Services.Interfaces; +using Refactoring.Web.Services.OrderProcessors; + +namespace Refactoring.Web.Services { + public class DistrictOrderFactory : IDistrictOrderFactory { + private readonly IChamberOfCommerceApi _chamberOfCommerceApi; + private readonly IAdvertPrinter _printer; + private readonly IDealService _dealService; + private readonly IDateTimeResolver _dateTimeResolver; + private readonly IRandomHelper _randomHelper; + + public DistrictOrderFactory( + IChamberOfCommerceApi chamberOfCommerceApi, + IAdvertPrinter printer, + IDealService dealService, + IDateTimeResolver dateTimeResolver, + IRandomHelper randomHelper) { + _chamberOfCommerceApi = chamberOfCommerceApi; + _printer = printer; + _dealService = dealService; + _dateTimeResolver = dateTimeResolver; + _randomHelper = randomHelper; + } + + public OrderProcessor For(string district) { + if (district.ToLower() == District.Cambridge) { + return new CambridgeOrderProcessor( + _chamberOfCommerceApi, + _printer, + _dateTimeResolver); + } + + if (district.ToLower() == District.Middleton) { + return new MiddletonOrderProcessor( + _dealService, + _chamberOfCommerceApi, + _printer, + _randomHelper); + } + + if (district.ToLower() == District.County) { + return new CountyOrderProcessor(_printer); + } + + if (district.ToLower() == District.Downtown) { + return new DowntownOrderProcessor(_printer, _dateTimeResolver); + } + + throw new NotImplementedException($"No Processor for {district}"); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Helpers/BusinessHelper.cs b/Refactoring.Web/Services/Helpers/BusinessHelper.cs new file mode 100644 index 0000000..a38db37 --- /dev/null +++ b/Refactoring.Web/Services/Helpers/BusinessHelper.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; + +namespace Refactoring.Web.Services.Helpers { + public static class LocalBusiness { + + public static string Barbershop => "Barbershop"; + public static string Bakery => "Bakery"; + public static string ShoeStore => "Shoe Store"; + public static string PizzaPlace => "Pizza place"; + public static string Diner => "Diner"; + public static string AutoRepair => "Auto Repair"; + public static string Pharmacy => "Pharmacy"; + public static string Grocery => "Grocery"; + + public static HashSet AllBusinesses + => new HashSet { + Barbershop, + Bakery, + ShoeStore, + PizzaPlace, + Diner, + AutoRepair, + Pharmacy, + Grocery + }; + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Helpers/DateTimeResolver.cs b/Refactoring.Web/Services/Helpers/DateTimeResolver.cs new file mode 100644 index 0000000..1ce7757 --- /dev/null +++ b/Refactoring.Web/Services/Helpers/DateTimeResolver.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.Helpers { + public class DateTimeResolver : IDateTimeResolver { + public bool IsItTuesday() => + DateTime.Now.DayOfWeek == DayOfWeek.Tuesday; + + public bool IsItTheWeekend () { + var weekendDays = new List {DayOfWeek.Saturday, DayOfWeek.Sunday}; + return weekendDays.Contains(DateTime.Now.DayOfWeek); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Helpers/DistrictHelper.cs b/Refactoring.Web/Services/Helpers/DistrictHelper.cs new file mode 100644 index 0000000..7ae6cbb --- /dev/null +++ b/Refactoring.Web/Services/Helpers/DistrictHelper.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace Refactoring.Web.Services.Helpers { + public static class District { + public static string Cambridge => "cambridge"; + public static string Downtown => "downtown"; + public static string County => "county"; + public static string Middleton => "middleton"; + + private static int DowntownId => 11; + private static int CountyId => 23; + private static int MiddletonId => 18; + private static int CambridgeId => 42; + + public static IEnumerable StandardDistricts => new List { + Cambridge, Downtown, County, Middleton + }; + + public static int GetDistrictNumberByName(string name) { + var districtLookup = new Dictionary() { + {Downtown, DowntownId}, + {County, CountyId}, + {Middleton, MiddletonId}, + {Cambridge, CambridgeId} + }; + return districtLookup[name]; + } + } + +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Helpers/RandomHelper.cs b/Refactoring.Web/Services/Helpers/RandomHelper.cs new file mode 100644 index 0000000..812d9fa --- /dev/null +++ b/Refactoring.Web/Services/Helpers/RandomHelper.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.Helpers { + public class RandomHelper : IRandomHelper { + public T GetRandomValueFromList(IEnumerable items) { + var random = new Random(); + var enumerable = items.ToList(); + var randomIndex = random.Next(enumerable.Count); + return enumerable[randomIndex]; + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IAdvertPrinter.cs b/Refactoring.Web/Services/Interfaces/IAdvertPrinter.cs new file mode 100644 index 0000000..0bf7522 --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IAdvertPrinter.cs @@ -0,0 +1,8 @@ +using Refactoring.Web.DomainModels; + +namespace Refactoring.Web.Services.Interfaces { + public interface IAdvertPrinter { + void PrintDefault(Advert advert); + void PrintCustom(Advert advert); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IChamberOfCommerceApi.cs b/Refactoring.Web/Services/Interfaces/IChamberOfCommerceApi.cs new file mode 100644 index 0000000..b78f5ca --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IChamberOfCommerceApi.cs @@ -0,0 +1,7 @@ +using System.Threading.Tasks; + +namespace Refactoring.Web.Services.Interfaces { + public interface IChamberOfCommerceApi { + Task GetImageAndThumbnailDataFor(string district); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IDateTimeResolver.cs b/Refactoring.Web/Services/Interfaces/IDateTimeResolver.cs new file mode 100644 index 0000000..bbaefb4 --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IDateTimeResolver.cs @@ -0,0 +1,6 @@ +namespace Refactoring.Web.Services.Interfaces { + public interface IDateTimeResolver { + bool IsItTuesday(); + bool IsItTheWeekend(); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IDealService.cs b/Refactoring.Web/Services/Interfaces/IDealService.cs new file mode 100644 index 0000000..f4dd07d --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IDealService.cs @@ -0,0 +1,7 @@ +using System; + +namespace Refactoring.Web.Services.Interfaces { + public interface IDealService { + decimal GenerateDeal(DateTime dateTime); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IDistrictOrderFactory.cs b/Refactoring.Web/Services/Interfaces/IDistrictOrderFactory.cs new file mode 100644 index 0000000..f997ece --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IDistrictOrderFactory.cs @@ -0,0 +1,7 @@ +using Refactoring.Web.Services.OrderProcessors; + +namespace Refactoring.Web.Services.Interfaces { + public interface IDistrictOrderFactory { + OrderProcessor For(string district); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IOrderService.cs b/Refactoring.Web/Services/Interfaces/IOrderService.cs new file mode 100644 index 0000000..42e5723 --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IOrderService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; + +namespace Refactoring.Web.Services.Interfaces { + public interface IOrderService { + Task ProcessOrder(Order order); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/Interfaces/IRandomHelper.cs b/Refactoring.Web/Services/Interfaces/IRandomHelper.cs new file mode 100644 index 0000000..bd64366 --- /dev/null +++ b/Refactoring.Web/Services/Interfaces/IRandomHelper.cs @@ -0,0 +1,7 @@ +using System.Collections.Generic; + +namespace Refactoring.Web.Services.Interfaces { + public interface IRandomHelper { + T GetRandomValueFromList(IEnumerable items); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderProcessors/CambridgeOrderProcessor.cs b/Refactoring.Web/Services/OrderProcessors/CambridgeOrderProcessor.cs new file mode 100644 index 0000000..3cd06f1 --- /dev/null +++ b/Refactoring.Web/Services/OrderProcessors/CambridgeOrderProcessor.cs @@ -0,0 +1,39 @@ +using System; +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Helpers; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.OrderProcessors { + public class CambridgeOrderProcessor : OrderProcessor { + private readonly IChamberOfCommerceApi _chamberOfCommerceApi; + private readonly IAdvertPrinter _printer; + private readonly IDateTimeResolver _dateResolver; + + public CambridgeOrderProcessor( + IChamberOfCommerceApi chamberOfCommerceApi, + IAdvertPrinter printer, + IDateTimeResolver dateResolver) { + _chamberOfCommerceApi = chamberOfCommerceApi; + _printer = printer; + _dateResolver = dateResolver; + } + + public override async Task PrintAdvertAndUpdateOrder(Order order) { + var advert = new Advert { + CreatedOn = DateTime.Now, + Heading = "Cambridge Bakery", + Content = "Custom Birthday and Wedding Cakes" + }; + if (_dateResolver.IsItTuesday()) { + var result = await _chamberOfCommerceApi + .GetImageAndThumbnailDataFor(District.Cambridge); + advert.ImageUrl = result.ThumbnailUrl; + } + order.Advert = advert; + _printer.PrintCustom(advert); + order.Status = "Complete"; + return order; + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderProcessors/CountyOrderProcessor.cs b/Refactoring.Web/Services/OrderProcessors/CountyOrderProcessor.cs new file mode 100644 index 0000000..fc61dc9 --- /dev/null +++ b/Refactoring.Web/Services/OrderProcessors/CountyOrderProcessor.cs @@ -0,0 +1,26 @@ +using System; +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.OrderProcessors { + public class CountyOrderProcessor : OrderProcessor { + private readonly IAdvertPrinter _printer; + + public CountyOrderProcessor(IAdvertPrinter printer) { + _printer = printer; + } + + public override Task PrintAdvertAndUpdateOrder(Order order) { + var advert = new Advert { + CreatedOn = DateTime.Now, + Heading = "County Diner", + Content = "Kids eat free every Thursday night" + }; + order.Advert = advert; + _printer.PrintCustom(advert); + order.Status = "Complete"; + return Task.FromResult(order); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderProcessors/DowntownOrderProcessor.cs b/Refactoring.Web/Services/OrderProcessors/DowntownOrderProcessor.cs new file mode 100644 index 0000000..bc20f43 --- /dev/null +++ b/Refactoring.Web/Services/OrderProcessors/DowntownOrderProcessor.cs @@ -0,0 +1,35 @@ +using System; +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.OrderProcessors { + public class DowntownOrderProcessor : OrderProcessor { + private readonly IAdvertPrinter _printer; + private readonly IDateTimeResolver _dateTimeResolver; + + public DowntownOrderProcessor( + IAdvertPrinter printer, + IDateTimeResolver dateTimeResolver) { + _printer = printer; + _dateTimeResolver = dateTimeResolver; + } + + public override Task PrintAdvertAndUpdateOrder(Order order) { + if (_dateTimeResolver.IsItTheWeekend()) { + _printer.PrintDefault(null); + } + + var advert = new Advert { + Heading = "Downtown Coffee Roasters", + CreatedOn = DateTime.Now, + Content = "Get a free coffee drink when you buy 1lb of coffee beans" + }; + order.Advert = advert; + _printer.PrintCustom(advert); + order.Status = "Complete"; + + return Task.FromResult(order); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderProcessors/MiddletonOrderProcessor.cs b/Refactoring.Web/Services/OrderProcessors/MiddletonOrderProcessor.cs new file mode 100644 index 0000000..decf2db --- /dev/null +++ b/Refactoring.Web/Services/OrderProcessors/MiddletonOrderProcessor.cs @@ -0,0 +1,41 @@ +using System; +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Helpers; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.OrderProcessors { + public class MiddletonOrderProcessor : OrderProcessor { + private readonly IChamberOfCommerceApi _chamberOfCommerceApi; + private readonly IDealService _dealService; + private readonly IAdvertPrinter _printer; + private readonly IRandomHelper _randomHelper; + + public MiddletonOrderProcessor( + IDealService dealService, + IChamberOfCommerceApi chamberOfCommerceApi, + IAdvertPrinter printer, + IRandomHelper randomHelper) { + _chamberOfCommerceApi = chamberOfCommerceApi; + _dealService = dealService; + _printer = printer; + _randomHelper = randomHelper; + } + + public override async Task PrintAdvertAndUpdateOrder(Order order) { + var deal = _dealService.GenerateDeal(DateTime.Now); + var biz = _randomHelper.GetRandomValueFromList(LocalBusiness.AllBusinesses); + var result = await _chamberOfCommerceApi.GetImageAndThumbnailDataFor(District.Middleton); + var advert = new Advert { + CreatedOn = DateTime.Now, + Heading = $"Middleton {biz}", + Content = $"Get {Math.Round(deal * 100, 2)}% off your next purchase!", + ImageUrl = result.ThumbnailUrl + }; + order.Advert = advert; + _printer.PrintCustom(advert); + order.Status = "Complete"; + return order; + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderProcessors/OrderProcessor.cs b/Refactoring.Web/Services/OrderProcessors/OrderProcessor.cs new file mode 100644 index 0000000..46aa8de --- /dev/null +++ b/Refactoring.Web/Services/OrderProcessors/OrderProcessor.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using Refactoring.Web.DomainModels; + +namespace Refactoring.Web.Services.OrderProcessors { + public abstract class OrderProcessor { + public abstract Task PrintAdvertAndUpdateOrder(Order order); + } +} \ No newline at end of file diff --git a/Refactoring.Web/Services/OrderService.cs b/Refactoring.Web/Services/OrderService.cs index 9719ce5..181a678 100644 --- a/Refactoring.Web/Services/OrderService.cs +++ b/Refactoring.Web/Services/OrderService.cs @@ -1,78 +1,24 @@ using System; using System.Threading.Tasks; using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Interfaces; namespace Refactoring.Web.Services { - public class OrderService{ - private readonly Order _order; - public OrderService(Order order) { - _order = order; - _order.Id = Guid.NewGuid().ToString(); - _order.CreatedOn = DateTime.Now; - _order.UpdatedOn = DateTime.Now; - } - - public async Task ProcessOrder() { - if (_order.District.ToLower() == "cambridge") { - var advert = new Advert(); - advert.CreatedOn = DateTime.Now; - advert.Heading = "Cambridge Bakery"; - advert.Content = "Custom Birthday and Wedding Cakes"; - if (DateTime.Now.DayOfWeek == DayOfWeek.Tuesday) { - var result = await ChamberOfCommerceApi.GetFor("Middleton"); - advert.ImageUrl = result.ThumbnailUrl; - } - _order.Advert = advert; - PrintAdvert(advert, false); - _order.Status = "Complete"; - } else if (_order.District.ToLower() == "middleton") { - var advert = new Advert(); - advert.CreatedOn = DateTime.Now; - var svc = new DealService(); - var deal = svc.GenerateDeal(DateTime.Now); - var biz = svc.GetRandomLocalBusiness(); - advert.Heading = "Middleton " + biz; - advert.Content = "Get " + deal * 100 + "Percent off your next purchase!"; - var result = await ChamberOfCommerceApi.GetFor("Middleton"); - advert.ImageUrl = result.ThumbnailUrl; - _order.Advert = advert; - PrintAdvert(advert, false); - _order.Status = "Complete"; - } else if (_order.District.ToLower() == "county") { - var advert = new Advert(); - advert.CreatedOn = DateTime.Now; - advert.Heading = "County Diner"; - advert.Content = "Kids eat free every Thursday night"; - _order.Advert = advert; - PrintAdvert(advert, false); - _order.Status = "Complete"; - } else if (_order.District.ToLower() == "downtown") { - if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) { - PrintAdvert(null, true); - } - var advert = new Advert(); - advert.Heading = "Downtown Coffee Roasters"; - advert.CreatedOn = DateTime.Now; - advert.Content = "Get a free coffee drink when you buy 1lb of coffee beans"; - _order.Advert = advert; - PrintAdvert(advert, false); - _order.Status = "Complete"; - } - } + public class OrderService : IOrderService { + private readonly IDistrictOrderFactory _districtOrderFactory; - private void PrintAdvert(Advert advert, bool IsDefaultAdvert) { - if (IsDefaultAdvert) { - Console.WriteLine("Printing Default Advert"); - } - else { - Console.WriteLine("Printing Custom Advert: " + advert.Heading); - } - System.Threading.Thread.Sleep(3000); + public OrderService( + IDistrictOrderFactory districtOrderFactory) { + _districtOrderFactory = districtOrderFactory; } - public Order GetOrder() { - return _order; + public async Task ProcessOrder(Order order) { + order.Id = Guid.NewGuid().ToString(); + order.CreatedOn = DateTime.Now; + order.UpdatedOn = DateTime.Now; + var orderProcessor = _districtOrderFactory.For(order.District); + return await orderProcessor.PrintAdvertAndUpdateOrder(order); } } } \ No newline at end of file diff --git a/Refactoring.Web/Services/Printers/AdvertPrinter.cs b/Refactoring.Web/Services/Printers/AdvertPrinter.cs new file mode 100644 index 0000000..f3b0f93 --- /dev/null +++ b/Refactoring.Web/Services/Printers/AdvertPrinter.cs @@ -0,0 +1,17 @@ +using System; +using Refactoring.Web.DomainModels; +using Refactoring.Web.Services.Interfaces; + +namespace Refactoring.Web.Services.Printers { + public class AdvertPrinter : IAdvertPrinter { + public void PrintCustom(Advert advert) { + Console.WriteLine("Printing Custom Advert: " + advert.Heading); + System.Threading.Thread.Sleep(3000); + } + + public void PrintDefault(Advert advert) { + Console.WriteLine("Printing Default Advert"); + System.Threading.Thread.Sleep(3000); + } + } +} \ No newline at end of file diff --git a/Refactoring.Web/Startup.cs b/Refactoring.Web/Startup.cs index c95e8de..a6a9b8b 100644 --- a/Refactoring.Web/Startup.cs +++ b/Refactoring.Web/Startup.cs @@ -3,6 +3,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Refactoring.Web.Services; +using Refactoring.Web.Services.Helpers; +using Refactoring.Web.Services.Interfaces; +using Refactoring.Web.Services.Printers; namespace Refactoring.Web { @@ -16,9 +20,16 @@ public Startup(IConfiguration configuration) public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { + public void ConfigureServices(IServiceCollection services) { services.AddControllersWithViews(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/Refactoring.Web/appsettings.json b/Refactoring.Web/appsettings.json index 81ff877..5c35592 100644 --- a/Refactoring.Web/appsettings.json +++ b/Refactoring.Web/appsettings.json @@ -6,5 +6,6 @@ "Microsoft.Hosting.Lifetime": "Information" } }, + "BasePhotoUrl": "https://jsonplaceholder.typicode.com/photos", "AllowedHosts": "*" } diff --git a/refactoring.sln b/refactoring.sln index bba50e0..56c7bc7 100644 --- a/refactoring.sln +++ b/refactoring.sln @@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refactoring.Tests", "Refactoring.Tests\Refactoring.Tests.csproj", "{2EF4684C-6E84-4988-AA06-CD028317C86F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refactoring.Web", "Refactoring.Web\Refactoring.Web.csproj", "{D5EBC267-5355-4F35-B055-411BEFFE16EF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,4 +19,30 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|x64.ActiveCfg = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|x64.Build.0 = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|x86.ActiveCfg = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Debug|x86.Build.0 = Debug|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|Any CPU.Build.0 = Release|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|x64.ActiveCfg = Release|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|x64.Build.0 = Release|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|x86.ActiveCfg = Release|Any CPU + {2EF4684C-6E84-4988-AA06-CD028317C86F}.Release|x86.Build.0 = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|x64.Build.0 = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|x86.ActiveCfg = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Debug|x86.Build.0 = Debug|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|Any CPU.Build.0 = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|x64.ActiveCfg = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|x64.Build.0 = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|x86.ActiveCfg = Release|Any CPU + {D5EBC267-5355-4F35-B055-411BEFFE16EF}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection EndGlobal diff --git a/refactoring.sln.DotSettings.user b/refactoring.sln.DotSettings.user new file mode 100644 index 0000000..cafe017 --- /dev/null +++ b/refactoring.sln.DotSettings.user @@ -0,0 +1,13 @@ + + <SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="GivenDateIsTuesday_ImageUrl_Set_OnOrderAdvert" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <TestAncestor> + <TestId>xUnit::2EF4684C-6E84-4988-AA06-CD028317C86F::.NETCoreApp,Version=v3.1::Refactoring.Tests.Tests.Services.TestDealService</TestId> + </TestAncestor> +</SessionState> + <SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="TestDealService" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <TestAncestor> + <TestId>xUnit::2EF4684C-6E84-4988-AA06-CD028317C86F::.NETCoreApp,Version=v3.1::Refactoring.Tests.Tests.Services.TestDealService</TestId> + <TestId>xUnit::2EF4684C-6E84-4988-AA06-CD028317C86F::.NETCoreApp,Version=v3.1::Refactoring.Tests.Tests.Services.OrderProcessors.TestMiddletonOrderProcessor.Given_ItIsMorning_PrintAdvertAndUpdateOrder_Returns_Order_With_AdvertContent_AmDealRate</TestId> + <TestId>xUnit::2EF4684C-6E84-4988-AA06-CD028317C86F::.NETCoreApp,Version=v3.1::Refactoring.Tests.Tests.Services.OrderProcessors.TestMiddletonOrderProcessor</TestId> + </TestAncestor> +</SessionState> \ No newline at end of file