From 336271aff24160533417c4456bf35ca1b38dd25b Mon Sep 17 00:00:00 2001 From: Aaron Hanusa Date: Thu, 24 Dec 2015 13:31:01 -0600 Subject: [PATCH] add proper namespacing and refactor accordingly --- .../Commands/CreateProductCommandTests.cs | 11 +++----- .../Commands/DeleteOrderCommandTests.cs | 9 +++---- .../Commands/DeleteProductCommandTests.cs | 8 +++--- .../Commands/ShipOrderItemCommandTests.cs | 6 ++--- .../Rules/CanDeleteCategoryRuleTests.cs | 4 +-- .../Rules/CanDeleteCustomerRuleTests.cs | 5 ++-- .../Rules/CanDeleteProductRuleTests.cs | 5 ++-- .../Rules/CanShipOrderItemRuleTests.cs | 8 ++---- .../Rules/CanSubmitOrderItemRuleTests.cs | 8 ++---- .../Rules/OrderItemAmountValidityRuleTests.cs | 3 +-- .../Rules/OrderItemPriceValidityRuleTests.cs | 3 +-- .../ValidOrderItemStatusForDeleteRuleTests.cs | 5 ++-- .../ValidOrderItemStatusForUpdateRuleTests.cs | 5 ++-- .../ValidOrderStatusForUpdateRuleTests.cs | 8 +++--- .../Commands/CreateProductCommand.cs | 5 ++-- Orders.com.BLL/Commands/DeleteOrderCommand.cs | 5 ++-- .../Commands/DeleteProductCommand.cs | 4 +-- .../Commands/ShipOrderItemCommand.cs | 8 +++--- .../DataProxy/ICategoryDataProxy.cs | 4 +-- .../DataProxy/ICustomerDataProxy.cs | 4 +-- Orders.com.BLL/DataProxy/IOrderDataProxy.cs | 7 +++--- .../DataProxy/IOrderItemDataProxy.cs | 5 ++-- .../DataProxy/IOrderStatusDataProxy.cs | 4 +-- .../DataProxy/IOrdersDotComDataProxy.cs | 2 +- Orders.com.BLL/DataProxy/IProductDataProxy.cs | 4 +-- .../DataProxy/InventoryItemDataProxy.cs | 4 +-- Orders.com.BLL/Domain/Category.cs | 2 +- Orders.com.BLL/Domain/Customer.cs | 6 ++--- Orders.com.BLL/Domain/DomainBase.cs | 2 +- .../Domain/IOrderStatusIDContainer.cs | 8 +----- Orders.com.BLL/Domain/InventoryItem.cs | 4 +-- Orders.com.BLL/Domain/Order.cs | 2 +- Orders.com.BLL/Domain/OrderItem.cs | 2 +- Orders.com.BLL/Domain/OrderStatus.cs | 2 +- Orders.com.BLL/Domain/Product.cs | 2 +- Orders.com.BLL/Extensions/DateExtensions.cs | 2 +- .../Extensions/IVersionContainerExtensions.cs | 2 +- .../Extensions/OrderItemExtensions.cs | 4 +-- Orders.com.BLL/Extensions/OrderStates.cs | 7 +++--- Orders.com.BLL/QueryData/OrderInfo.cs | 9 ++----- Orders.com.BLL/Rules/CanDeleteCategoryRule.cs | 3 +-- Orders.com.BLL/Rules/CanDeleteCustomerRule.cs | 3 ++- Orders.com.BLL/Rules/CanDeleteProductRule.cs | 2 +- Orders.com.BLL/Rules/CanShipOrderItemRule.cs | 4 +-- .../Rules/CanSubmitOrderItemRule.cs | 4 +-- .../Rules/CannotEditPropertyRule.cs | 2 +- .../Rules/OrderItemAmountValidityRule.cs | 4 +-- .../Rules/OrderItemPriceValidityRule.cs | 5 ++-- .../ValidOrderItemStatusForDeleteRule.cs | 4 +-- .../ValidOrderItemStatusForUpdateRule.cs | 4 +-- .../Rules/ValidOrderStatusForUpdateRule.cs | 3 ++- Orders.com.BLL/Services/CategoryService.cs | 6 ++--- Orders.com.BLL/Services/CustomerService.cs | 6 ++--- Orders.com.BLL/Services/ICategoryService.cs | 9 ++----- Orders.com.BLL/Services/ICustomerService.cs | 9 ++----- .../Services/IInventoryItemService.cs | 4 +-- Orders.com.BLL/Services/IOrderItemService.cs | 4 +-- Orders.com.BLL/Services/IOrderService.cs | 6 ++--- .../Services/IOrderStatusService.cs | 9 ++----- Orders.com.BLL/Services/IProductService.cs | 4 +-- .../Services/IntentoryItemService.cs | 8 +++--- .../Services/OrderItemClientService.cs | 14 +++-------- Orders.com.BLL/Services/OrderItemService.cs | 10 +++----- Orders.com.BLL/Services/OrderService.cs | 8 +++--- Orders.com.BLL/Services/OrderStatusService.cs | 6 ++--- .../Services/OrdersDotComServiceBase.cs | 4 +-- .../Services/ProductClientService.cs | 9 +++---- Orders.com.BLL/Services/ProductService.cs | 7 +++--- Orders.com.DAL.EF/CategoryRepository.cs | 9 ++----- Orders.com.DAL.EF/CustomerRepository.cs | 4 +-- Orders.com.DAL.EF/InventoryItemRepository.cs | 10 +++----- Orders.com.DAL.EF/Migrations/Configuration.cs | 4 +-- Orders.com.DAL.EF/OrderItemRepository.cs | 4 +-- Orders.com.DAL.EF/OrderRepository.cs | 12 ++++----- Orders.com.DAL.EF/OrderStatusRepository.cs | 9 ++----- Orders.com.DAL.EF/OrdersDotComContext.cs | 2 +- .../OrdersDotComRepositoryBase.cs | 2 +- Orders.com.DAL.EF/ProductRepository.cs | 6 ++--- .../CategoriesHttpServiceProxy.cs | 4 +-- .../CustomersHttpServiceProxy.cs | 4 +-- .../InventoryItemsHttpServiceProxy.cs | 4 +-- .../OrderItemsHttpServiceProxy.cs | 4 +-- Orders.com.DAL.Http/OrdersHttpServiceProxy.cs | 8 +++--- .../ProductsHttpServiceProxy.cs | 4 +-- Orders.com.DAL.InMemory/CategoryRepository.cs | 4 +-- Orders.com.DAL.InMemory/CustomerRepository.cs | 5 ++-- .../InventoryItemRepository.cs | 4 +-- .../OrderItemRepository.cs | 5 ++-- Orders.com.DAL.InMemory/OrderRepository.cs | 25 ++++++++++++++----- .../OrderStatusRepository.cs | 4 +-- .../OrdersDotComMockBase.cs | 2 +- Orders.com.DAL.InMemory/ProductRepository.cs | 4 +-- Orders.com.WPF/CustomerOrderWindow.xaml.cs | 17 ++----------- Orders.com.WPF/MainWindow.xaml.cs | 2 +- Orders.com.WPF/OrderInsertedEvent.cs | 8 +----- Orders.com.WPF/OrderUpdatedEvent.cs | 8 +----- Orders.com.WPF/VM/CategoriesVM.cs | 2 +- Orders.com.WPF/VM/CategoryVM.cs | 4 +-- Orders.com.WPF/VM/CustomerOrderVM.cs | 6 ++--- Orders.com.WPF/VM/CustomerVM.cs | 4 +-- Orders.com.WPF/VM/CustomersVM.cs | 2 +- Orders.com.WPF/VM/InventoryItemVM.cs | 4 +-- Orders.com.WPF/VM/InventoryItemsVM.cs | 2 +- Orders.com.WPF/VM/MainWindowVM.cs | 2 +- Orders.com.WPF/VM/OrderItemVM.cs | 7 +++--- Orders.com.WPF/VM/OrderVM.cs | 6 ++--- Orders.com.WPF/VM/OrdersDotComVMBase.cs | 2 ++ Orders.com.WPF/VM/OrdersVM.cs | 2 +- Orders.com.WPF/VM/ProductVM.cs | 4 +-- Orders.com.WPF/VM/ProductsVM.cs | 1 + .../App_Start/NinjectWebCommon.cs | 2 +- .../Controllers/CategoriesController.cs | 4 +-- .../Controllers/CustomersController.cs | 5 ++-- .../Controllers/InventoryItemsController.cs | 5 ++-- .../Controllers/OrderItemsController.cs | 4 +-- .../Controllers/OrdersController.cs | 6 ++--- .../Controllers/ProductsController.cs | 4 +-- .../Controllers/CategoriesController.cs | 6 ++--- .../Controllers/ControllerBase.cs | 3 ++- .../Controllers/CustomersController.cs | 6 ++--- .../Controllers/ProductsController.cs | 6 ++--- .../OrdersDotComDataInitializer.cs | 8 +++--- .../ViewModels/CategoryViewModel.cs | 2 +- .../ViewModels/CustomerViewModel.cs | 2 +- .../ViewModels/ProductViewModel.cs | 2 +- 125 files changed, 274 insertions(+), 376 deletions(-) diff --git a/Orders.com.BLL.Tests/Commands/CreateProductCommandTests.cs b/Orders.com.BLL.Tests/Commands/CreateProductCommandTests.cs index fcc4ba7..5e2f853 100644 --- a/Orders.com.BLL.Tests/Commands/CreateProductCommandTests.cs +++ b/Orders.com.BLL.Tests/Commands/CreateProductCommandTests.cs @@ -1,18 +1,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Commands; -using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; using Orders.com.DAL.InMemory; -using Peasy; using Peasy.Core; -using Peasy.Rules; using Shouldly; -using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; +using Orders.com.BLL.DataProxy; namespace Orders.com.BLL.Tests.Commands { diff --git a/Orders.com.BLL.Tests/Commands/DeleteOrderCommandTests.cs b/Orders.com.BLL.Tests/Commands/DeleteOrderCommandTests.cs index 00de6ba..1706197 100644 --- a/Orders.com.BLL.Tests/Commands/DeleteOrderCommandTests.cs +++ b/Orders.com.BLL.Tests/Commands/DeleteOrderCommandTests.cs @@ -1,20 +1,19 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Commands; -using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; using Orders.com.DAL.InMemory; using Peasy; using Peasy.Extensions; using Peasy.Core; -using Peasy.Rules; using Shouldly; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; +using Orders.com.BLL.Services; namespace Orders.com.BLL.Tests.Commands { diff --git a/Orders.com.BLL.Tests/Commands/DeleteProductCommandTests.cs b/Orders.com.BLL.Tests/Commands/DeleteProductCommandTests.cs index 66a2c81..66f9ef6 100644 --- a/Orders.com.BLL.Tests/Commands/DeleteProductCommandTests.cs +++ b/Orders.com.BLL.Tests/Commands/DeleteProductCommandTests.cs @@ -1,17 +1,15 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Commands; -using Orders.com.DataProxy; -using Orders.com.Domain; using Orders.com.DAL.InMemory; using Peasy; -using Peasy.Extensions; using Shouldly; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Services; namespace Orders.com.BLL.Tests.Commands { diff --git a/Orders.com.BLL.Tests/Commands/ShipOrderItemCommandTests.cs b/Orders.com.BLL.Tests/Commands/ShipOrderItemCommandTests.cs index bdf777f..10492d9 100644 --- a/Orders.com.BLL.Tests/Commands/ShipOrderItemCommandTests.cs +++ b/Orders.com.BLL.Tests/Commands/ShipOrderItemCommandTests.cs @@ -1,9 +1,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Commands; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; using Peasy; using Shouldly; using System; diff --git a/Orders.com.BLL.Tests/Rules/CanDeleteCategoryRuleTests.cs b/Orders.com.BLL.Tests/Rules/CanDeleteCategoryRuleTests.cs index 9f6b2e7..da29dbd 100644 --- a/Orders.com.BLL.Tests/Rules/CanDeleteCategoryRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/CanDeleteCategoryRuleTests.cs @@ -1,11 +1,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Linq; using System.Threading.Tasks; using Shouldly; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; namespace Orders.com.BLL.Tests.Rules { diff --git a/Orders.com.BLL.Tests/Rules/CanDeleteCustomerRuleTests.cs b/Orders.com.BLL.Tests/Rules/CanDeleteCustomerRuleTests.cs index 3904c15..adb2bd0 100644 --- a/Orders.com.BLL.Tests/Rules/CanDeleteCustomerRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/CanDeleteCustomerRuleTests.cs @@ -1,12 +1,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Linq; using System.Threading.Tasks; using Shouldly; using Peasy; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; +using Orders.com.BLL.DataProxy; namespace Orders.com.BLL.Tests.Rules { diff --git a/Orders.com.BLL.Tests/Rules/CanDeleteProductRuleTests.cs b/Orders.com.BLL.Tests/Rules/CanDeleteProductRuleTests.cs index 95d1dac..1582412 100644 --- a/Orders.com.BLL.Tests/Rules/CanDeleteProductRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/CanDeleteProductRuleTests.cs @@ -1,12 +1,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Linq; using System.Threading.Tasks; using Shouldly; -using Peasy; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; namespace Orders.com.BLL.Tests.Rules { diff --git a/Orders.com.BLL.Tests/Rules/CanShipOrderItemRuleTests.cs b/Orders.com.BLL.Tests/Rules/CanShipOrderItemRuleTests.cs index 060929f..d7d46f4 100644 --- a/Orders.com.BLL.Tests/Rules/CanShipOrderItemRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/CanShipOrderItemRuleTests.cs @@ -1,13 +1,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; -using System.Linq; using System.Threading.Tasks; using Shouldly; -using Peasy; +using Orders.com.BLL.Extensions; +using Orders.com.BLL.Domain; namespace Orders.com.BLL.Tests.Rules { diff --git a/Orders.com.BLL.Tests/Rules/CanSubmitOrderItemRuleTests.cs b/Orders.com.BLL.Tests/Rules/CanSubmitOrderItemRuleTests.cs index c2aea07..960cdfb 100644 --- a/Orders.com.BLL.Tests/Rules/CanSubmitOrderItemRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/CanSubmitOrderItemRuleTests.cs @@ -1,13 +1,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; -using System.Linq; using System.Threading.Tasks; using Shouldly; -using Peasy; +using Orders.com.BLL.Extensions; +using Orders.com.BLL.Domain; namespace Orders.com.BLL.Tests.Rules { diff --git a/Orders.com.BLL.Tests/Rules/OrderItemAmountValidityRuleTests.cs b/Orders.com.BLL.Tests/Rules/OrderItemAmountValidityRuleTests.cs index 0dac3d3..7769419 100644 --- a/Orders.com.BLL.Tests/Rules/OrderItemAmountValidityRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/OrderItemAmountValidityRuleTests.cs @@ -1,7 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Orders.com.BLL.Domain; using Orders.com.BLL.Rules; -using Orders.com.Domain; -using Peasy.Rules; using Shouldly; using System.Threading.Tasks; diff --git a/Orders.com.BLL.Tests/Rules/OrderItemPriceValidityRuleTests.cs b/Orders.com.BLL.Tests/Rules/OrderItemPriceValidityRuleTests.cs index 1981c94..36687f5 100644 --- a/Orders.com.BLL.Tests/Rules/OrderItemPriceValidityRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/OrderItemPriceValidityRuleTests.cs @@ -1,7 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Orders.com.BLL.Domain; using Orders.com.BLL.Rules; -using Orders.com.Domain; -using Peasy.Rules; using Shouldly; using System.Threading.Tasks; diff --git a/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForDeleteRuleTests.cs b/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForDeleteRuleTests.cs index c10fe2c..f4950bd 100644 --- a/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForDeleteRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForDeleteRuleTests.cs @@ -1,8 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; using Orders.com.BLL.Rules; -using Orders.com.Domain; -using Orders.com.Extensions; -using Peasy.Rules; using Shouldly; using System.Threading.Tasks; diff --git a/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForUpdateRuleTests.cs b/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForUpdateRuleTests.cs index a1ee363..706fff3 100644 --- a/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForUpdateRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/ValidOrderItemStatusForUpdateRuleTests.cs @@ -1,8 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; using Orders.com.BLL.Rules; -using Orders.com.Domain; -using Orders.com.Extensions; -using Peasy.Rules; using Shouldly; using System.Threading.Tasks; diff --git a/Orders.com.BLL.Tests/Rules/ValidOrderStatusForUpdateRuleTests.cs b/Orders.com.BLL.Tests/Rules/ValidOrderStatusForUpdateRuleTests.cs index 4f6bc80..41b6512 100644 --- a/Orders.com.BLL.Tests/Rules/ValidOrderStatusForUpdateRuleTests.cs +++ b/Orders.com.BLL.Tests/Rules/ValidOrderStatusForUpdateRuleTests.cs @@ -1,11 +1,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Services; using Peasy; -using Peasy.Rules; using Shouldly; using System.Linq; using System.Threading.Tasks; diff --git a/Orders.com.BLL/Commands/CreateProductCommand.cs b/Orders.com.BLL/Commands/CreateProductCommand.cs index d54b8bd..e3f7543 100644 --- a/Orders.com.BLL/Commands/CreateProductCommand.cs +++ b/Orders.com.BLL/Commands/CreateProductCommand.cs @@ -1,10 +1,11 @@ using Peasy; using Peasy.Core; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Threading.Tasks; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; +using Orders.com.BLL.DataProxy; namespace Orders.com.BLL.Commands { diff --git a/Orders.com.BLL/Commands/DeleteOrderCommand.cs b/Orders.com.BLL/Commands/DeleteOrderCommand.cs index 5c6672a..1826e64 100644 --- a/Orders.com.BLL/Commands/DeleteOrderCommand.cs +++ b/Orders.com.BLL/Commands/DeleteOrderCommand.cs @@ -2,12 +2,13 @@ using Peasy.Core; using Peasy.Core.Extensions; using Peasy.Extensions; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Services; +using Orders.com.BLL.Domain; namespace Orders.com.BLL.Commands { diff --git a/Orders.com.BLL/Commands/DeleteProductCommand.cs b/Orders.com.BLL/Commands/DeleteProductCommand.cs index baa3534..d59a089 100644 --- a/Orders.com.BLL/Commands/DeleteProductCommand.cs +++ b/Orders.com.BLL/Commands/DeleteProductCommand.cs @@ -2,12 +2,12 @@ using Peasy.Core; using Peasy.Core.Extensions; using Peasy.Extensions; -using Orders.com.BLL; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Services; namespace Orders.com.BLL.Commands { diff --git a/Orders.com.BLL/Commands/ShipOrderItemCommand.cs b/Orders.com.BLL/Commands/ShipOrderItemCommand.cs index f972f35..988e04a 100644 --- a/Orders.com.BLL/Commands/ShipOrderItemCommand.cs +++ b/Orders.com.BLL/Commands/ShipOrderItemCommand.cs @@ -1,15 +1,13 @@ using Peasy; using Peasy.Core; -using Peasy.Core.Extensions; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; -using System.Linq; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Commands { diff --git a/Orders.com.BLL/DataProxy/ICategoryDataProxy.cs b/Orders.com.BLL/DataProxy/ICategoryDataProxy.cs index 8753cc0..5381ea3 100644 --- a/Orders.com.BLL/DataProxy/ICategoryDataProxy.cs +++ b/Orders.com.BLL/DataProxy/ICategoryDataProxy.cs @@ -1,6 +1,6 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface ICategoryDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/ICustomerDataProxy.cs b/Orders.com.BLL/DataProxy/ICustomerDataProxy.cs index 79548e1..84b905e 100644 --- a/Orders.com.BLL/DataProxy/ICustomerDataProxy.cs +++ b/Orders.com.BLL/DataProxy/ICustomerDataProxy.cs @@ -1,6 +1,6 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface ICustomerDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/IOrderDataProxy.cs b/Orders.com.BLL/DataProxy/IOrderDataProxy.cs index 73d0acc..3db9cd9 100644 --- a/Orders.com.BLL/DataProxy/IOrderDataProxy.cs +++ b/Orders.com.BLL/DataProxy/IOrderDataProxy.cs @@ -1,10 +1,9 @@ -using Orders.com.Domain; -using Orders.com.QueryData; -using System; +using Orders.com.BLL.Domain; +using Orders.com.BLL.QueryData; using System.Collections.Generic; using System.Threading.Tasks; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IOrderDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/IOrderItemDataProxy.cs b/Orders.com.BLL/DataProxy/IOrderItemDataProxy.cs index 27f6df5..bcb8476 100644 --- a/Orders.com.BLL/DataProxy/IOrderItemDataProxy.cs +++ b/Orders.com.BLL/DataProxy/IOrderItemDataProxy.cs @@ -1,9 +1,8 @@ -using Orders.com.Domain; -using System; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Threading.Tasks; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IOrderItemDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/IOrderStatusDataProxy.cs b/Orders.com.BLL/DataProxy/IOrderStatusDataProxy.cs index 33f816c..d1f9f6c 100644 --- a/Orders.com.BLL/DataProxy/IOrderStatusDataProxy.cs +++ b/Orders.com.BLL/DataProxy/IOrderStatusDataProxy.cs @@ -1,6 +1,6 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IOrderStatusDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/IOrdersDotComDataProxy.cs b/Orders.com.BLL/DataProxy/IOrdersDotComDataProxy.cs index 5b6f383..be1ff0e 100644 --- a/Orders.com.BLL/DataProxy/IOrdersDotComDataProxy.cs +++ b/Orders.com.BLL/DataProxy/IOrdersDotComDataProxy.cs @@ -1,6 +1,6 @@ using Peasy; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IOrdersDotComDataProxy : IServiceDataProxy { diff --git a/Orders.com.BLL/DataProxy/IProductDataProxy.cs b/Orders.com.BLL/DataProxy/IProductDataProxy.cs index bf70804..67cff83 100644 --- a/Orders.com.BLL/DataProxy/IProductDataProxy.cs +++ b/Orders.com.BLL/DataProxy/IProductDataProxy.cs @@ -1,8 +1,8 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Threading.Tasks; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IProductDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/DataProxy/InventoryItemDataProxy.cs b/Orders.com.BLL/DataProxy/InventoryItemDataProxy.cs index 69f1df1..864b306 100644 --- a/Orders.com.BLL/DataProxy/InventoryItemDataProxy.cs +++ b/Orders.com.BLL/DataProxy/InventoryItemDataProxy.cs @@ -1,7 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using System.Threading.Tasks; -namespace Orders.com.DataProxy +namespace Orders.com.BLL.DataProxy { public interface IInventoryItemDataProxy : IOrdersDotComDataProxy { diff --git a/Orders.com.BLL/Domain/Category.cs b/Orders.com.BLL/Domain/Category.cs index 48d1935..afcbee7 100644 --- a/Orders.com.BLL/Domain/Category.cs +++ b/Orders.com.BLL/Domain/Category.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class Category : DomainBase { diff --git a/Orders.com.BLL/Domain/Customer.cs b/Orders.com.BLL/Domain/Customer.cs index fa8e4a1..217a721 100644 --- a/Orders.com.BLL/Domain/Customer.cs +++ b/Orders.com.BLL/Domain/Customer.cs @@ -1,8 +1,6 @@ -using Peasy; -using System.ComponentModel.DataAnnotations; -using System; +using System.ComponentModel.DataAnnotations; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class Customer : DomainBase { diff --git a/Orders.com.BLL/Domain/DomainBase.cs b/Orders.com.BLL/Domain/DomainBase.cs index 5be1865..64d6f85 100644 --- a/Orders.com.BLL/Domain/DomainBase.cs +++ b/Orders.com.BLL/Domain/DomainBase.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; //using Newtonsoft.Json; -namespace Orders.com +namespace Orders.com.BLL.Domain { public abstract class DomainBase : IDomainObject { diff --git a/Orders.com.BLL/Domain/IOrderStatusIDContainer.cs b/Orders.com.BLL/Domain/IOrderStatusIDContainer.cs index 078f782..a722a8f 100644 --- a/Orders.com.BLL/Domain/IOrderStatusIDContainer.cs +++ b/Orders.com.BLL/Domain/IOrderStatusIDContainer.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public interface IOrderStatusIDContainer { diff --git a/Orders.com.BLL/Domain/InventoryItem.cs b/Orders.com.BLL/Domain/InventoryItem.cs index 9bfd24a..4707fe2 100644 --- a/Orders.com.BLL/Domain/InventoryItem.cs +++ b/Orders.com.BLL/Domain/InventoryItem.cs @@ -1,9 +1,7 @@ using Peasy; -using Peasy.Attributes; using System.ComponentModel.DataAnnotations; -using System; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class InventoryItem : DomainBase, IVersionContainer { diff --git a/Orders.com.BLL/Domain/Order.cs b/Orders.com.BLL/Domain/Order.cs index 86a49d1..b660664 100644 --- a/Orders.com.BLL/Domain/Order.cs +++ b/Orders.com.BLL/Domain/Order.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class Order : DomainBase { diff --git a/Orders.com.BLL/Domain/OrderItem.cs b/Orders.com.BLL/Domain/OrderItem.cs index 8f98190..2a5322d 100644 --- a/Orders.com.BLL/Domain/OrderItem.cs +++ b/Orders.com.BLL/Domain/OrderItem.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using System; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class OrderItem : DomainBase, IOrderStatusIDContainer { diff --git a/Orders.com.BLL/Domain/OrderStatus.cs b/Orders.com.BLL/Domain/OrderStatus.cs index 7383b96..1b4d7f7 100644 --- a/Orders.com.BLL/Domain/OrderStatus.cs +++ b/Orders.com.BLL/Domain/OrderStatus.cs @@ -1,5 +1,5 @@  -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class OrderStatus : DomainBase { diff --git a/Orders.com.BLL/Domain/Product.cs b/Orders.com.BLL/Domain/Product.cs index 18747d1..d7b4e98 100644 --- a/Orders.com.BLL/Domain/Product.cs +++ b/Orders.com.BLL/Domain/Product.cs @@ -2,7 +2,7 @@ using Peasy.Attributes; using System.ComponentModel.DataAnnotations; -namespace Orders.com.Domain +namespace Orders.com.BLL.Domain { public class Product : DomainBase { diff --git a/Orders.com.BLL/Extensions/DateExtensions.cs b/Orders.com.BLL/Extensions/DateExtensions.cs index cea5114..77c56a3 100644 --- a/Orders.com.BLL/Extensions/DateExtensions.cs +++ b/Orders.com.BLL/Extensions/DateExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Orders.com.Extensions +namespace Orders.com.BLL.Extensions { public static class DateExtensions { diff --git a/Orders.com.BLL/Extensions/IVersionContainerExtensions.cs b/Orders.com.BLL/Extensions/IVersionContainerExtensions.cs index 158218f..02d9d3a 100644 --- a/Orders.com.BLL/Extensions/IVersionContainerExtensions.cs +++ b/Orders.com.BLL/Extensions/IVersionContainerExtensions.cs @@ -1,7 +1,7 @@ using Peasy; using System; -namespace Orders.com.Extensions +namespace Orders.com.BLL.Extensions { public static class IVersionContainerExtensions { diff --git a/Orders.com.BLL/Extensions/OrderItemExtensions.cs b/Orders.com.BLL/Extensions/OrderItemExtensions.cs index 914f312..2c84eea 100644 --- a/Orders.com.BLL/Extensions/OrderItemExtensions.cs +++ b/Orders.com.BLL/Extensions/OrderItemExtensions.cs @@ -1,7 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using System; -namespace Orders.com.Extensions +namespace Orders.com.BLL.Extensions { public static class OrderItemExtensions { diff --git a/Orders.com.BLL/Extensions/OrderStates.cs b/Orders.com.BLL/Extensions/OrderStates.cs index bbdd781..f88c596 100644 --- a/Orders.com.BLL/Extensions/OrderStates.cs +++ b/Orders.com.BLL/Extensions/OrderStates.cs @@ -1,9 +1,8 @@ -using System; -using System.Linq; -using Orders.com.Domain; +using System.Linq; using System.Collections.Generic; +using Orders.com.BLL.Domain; -namespace Orders.com.Extensions +namespace Orders.com.BLL.Extensions { public class OrderStatusConstants { diff --git a/Orders.com.BLL/QueryData/OrderInfo.cs b/Orders.com.BLL/QueryData/OrderInfo.cs index f39eb70..34f4ac9 100644 --- a/Orders.com.BLL/QueryData/OrderInfo.cs +++ b/Orders.com.BLL/QueryData/OrderInfo.cs @@ -1,11 +1,6 @@ -using Orders.com.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; -namespace Orders.com.QueryData +namespace Orders.com.BLL.QueryData { public class OrderInfo { diff --git a/Orders.com.BLL/Rules/CanDeleteCategoryRule.cs b/Orders.com.BLL/Rules/CanDeleteCategoryRule.cs index 885049c..91d0b09 100644 --- a/Orders.com.BLL/Rules/CanDeleteCategoryRule.cs +++ b/Orders.com.BLL/Rules/CanDeleteCategoryRule.cs @@ -1,5 +1,4 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; using Peasy.Core; using System.Linq; using System.Threading.Tasks; diff --git a/Orders.com.BLL/Rules/CanDeleteCustomerRule.cs b/Orders.com.BLL/Rules/CanDeleteCustomerRule.cs index 2831947..8968820 100644 --- a/Orders.com.BLL/Rules/CanDeleteCustomerRule.cs +++ b/Orders.com.BLL/Rules/CanDeleteCustomerRule.cs @@ -1,4 +1,5 @@ -using Peasy.Core; +using Orders.com.BLL.Services; +using Peasy.Core; using System.Linq; using System.Threading.Tasks; diff --git a/Orders.com.BLL/Rules/CanDeleteProductRule.cs b/Orders.com.BLL/Rules/CanDeleteProductRule.cs index 5fc3079..cb9988e 100644 --- a/Orders.com.BLL/Rules/CanDeleteProductRule.cs +++ b/Orders.com.BLL/Rules/CanDeleteProductRule.cs @@ -1,4 +1,4 @@ -using Orders.com.DataProxy; +using Orders.com.BLL.DataProxy; using Peasy.Core; using System.Linq; using System.Threading.Tasks; diff --git a/Orders.com.BLL/Rules/CanShipOrderItemRule.cs b/Orders.com.BLL/Rules/CanShipOrderItemRule.cs index bb7767e..15fbf44 100644 --- a/Orders.com.BLL/Rules/CanShipOrderItemRule.cs +++ b/Orders.com.BLL/Rules/CanShipOrderItemRule.cs @@ -1,6 +1,6 @@ using Peasy.Core; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Rules/CanSubmitOrderItemRule.cs b/Orders.com.BLL/Rules/CanSubmitOrderItemRule.cs index 48be605..c025fdc 100644 --- a/Orders.com.BLL/Rules/CanSubmitOrderItemRule.cs +++ b/Orders.com.BLL/Rules/CanSubmitOrderItemRule.cs @@ -1,6 +1,6 @@ using Peasy.Core; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Rules/CannotEditPropertyRule.cs b/Orders.com.BLL/Rules/CannotEditPropertyRule.cs index 3af25b0..9e8ca3e 100644 --- a/Orders.com.BLL/Rules/CannotEditPropertyRule.cs +++ b/Orders.com.BLL/Rules/CannotEditPropertyRule.cs @@ -1,11 +1,11 @@ using Peasy.Core; using Peasy.Extensions; -using Orders.com; using System; using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Threading.Tasks; +using Orders.com.BLL.Domain; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Rules/OrderItemAmountValidityRule.cs b/Orders.com.BLL/Rules/OrderItemAmountValidityRule.cs index 5d10b5f..18af925 100644 --- a/Orders.com.BLL/Rules/OrderItemAmountValidityRule.cs +++ b/Orders.com.BLL/Rules/OrderItemAmountValidityRule.cs @@ -1,7 +1,7 @@ using Peasy.Core; -using Orders.com.Domain; +using Orders.com.BLL.Domain; -namespace Peasy.Rules +namespace Orders.com.BLL.Rules { public class OrderItemAmountValidityRule : RuleBase { diff --git a/Orders.com.BLL/Rules/OrderItemPriceValidityRule.cs b/Orders.com.BLL/Rules/OrderItemPriceValidityRule.cs index c26f551..b32f96f 100644 --- a/Orders.com.BLL/Rules/OrderItemPriceValidityRule.cs +++ b/Orders.com.BLL/Rules/OrderItemPriceValidityRule.cs @@ -1,8 +1,7 @@ using Peasy.Core; -using Orders.com.Domain; -using System.Threading.Tasks; +using Orders.com.BLL.Domain; -namespace Peasy.Rules +namespace Orders.com.BLL.Rules { public class OrderItemPriceValidityRule : RuleBase { diff --git a/Orders.com.BLL/Rules/ValidOrderItemStatusForDeleteRule.cs b/Orders.com.BLL/Rules/ValidOrderItemStatusForDeleteRule.cs index e7a35ac..9236b94 100644 --- a/Orders.com.BLL/Rules/ValidOrderItemStatusForDeleteRule.cs +++ b/Orders.com.BLL/Rules/ValidOrderItemStatusForDeleteRule.cs @@ -1,6 +1,6 @@ using Peasy.Core; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Rules/ValidOrderItemStatusForUpdateRule.cs b/Orders.com.BLL/Rules/ValidOrderItemStatusForUpdateRule.cs index e2cdb29..2e41269 100644 --- a/Orders.com.BLL/Rules/ValidOrderItemStatusForUpdateRule.cs +++ b/Orders.com.BLL/Rules/ValidOrderItemStatusForUpdateRule.cs @@ -1,6 +1,6 @@ using Peasy.Core; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Rules/ValidOrderStatusForUpdateRule.cs b/Orders.com.BLL/Rules/ValidOrderStatusForUpdateRule.cs index e098467..0ecb9fc 100644 --- a/Orders.com.BLL/Rules/ValidOrderStatusForUpdateRule.cs +++ b/Orders.com.BLL/Rules/ValidOrderStatusForUpdateRule.cs @@ -1,7 +1,8 @@ using Peasy.Core; -using Orders.com.Extensions; using System.Linq; using System.Threading.Tasks; +using Orders.com.BLL.Services; +using Orders.com.BLL.Extensions; namespace Orders.com.BLL.Rules { diff --git a/Orders.com.BLL/Services/CategoryService.cs b/Orders.com.BLL/Services/CategoryService.cs index 113f908..72ce76c 100644 --- a/Orders.com.BLL/Services/CategoryService.cs +++ b/Orders.com.BLL/Services/CategoryService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using Peasy.Core; -using Orders.com.DataProxy; -using Orders.com.Domain; using Orders.com.BLL.Rules; using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class CategoryService : OrdersDotComServiceBase, ICategoryService { diff --git a/Orders.com.BLL/Services/CustomerService.cs b/Orders.com.BLL/Services/CustomerService.cs index 5b0af96..6f58d58 100644 --- a/Orders.com.BLL/Services/CustomerService.cs +++ b/Orders.com.BLL/Services/CustomerService.cs @@ -1,11 +1,11 @@ using Peasy.Core; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Collections.Generic; using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class CustomerService : OrdersDotComServiceBase, ICustomerService { diff --git a/Orders.com.BLL/Services/ICategoryService.cs b/Orders.com.BLL/Services/ICategoryService.cs index e29c488..a1f8b88 100644 --- a/Orders.com.BLL/Services/ICategoryService.cs +++ b/Orders.com.BLL/Services/ICategoryService.cs @@ -1,12 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using Peasy.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface ICategoryService : IService { diff --git a/Orders.com.BLL/Services/ICustomerService.cs b/Orders.com.BLL/Services/ICustomerService.cs index d4110a9..83c9ff4 100644 --- a/Orders.com.BLL/Services/ICustomerService.cs +++ b/Orders.com.BLL/Services/ICustomerService.cs @@ -1,12 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using Peasy.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface ICustomerService : IService { diff --git a/Orders.com.BLL/Services/IInventoryItemService.cs b/Orders.com.BLL/Services/IInventoryItemService.cs index 7c61a5e..7845f4f 100644 --- a/Orders.com.BLL/Services/IInventoryItemService.cs +++ b/Orders.com.BLL/Services/IInventoryItemService.cs @@ -1,7 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using Peasy.Core; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface IInventoryItemService : IService { diff --git a/Orders.com.BLL/Services/IOrderItemService.cs b/Orders.com.BLL/Services/IOrderItemService.cs index c99abcf..7ba8450 100644 --- a/Orders.com.BLL/Services/IOrderItemService.cs +++ b/Orders.com.BLL/Services/IOrderItemService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Orders.com.Domain; using Peasy.Core; +using Orders.com.BLL.Domain; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface IOrderItemService : IService { diff --git a/Orders.com.BLL/Services/IOrderService.cs b/Orders.com.BLL/Services/IOrderService.cs index 4f7a0b7..beb933f 100644 --- a/Orders.com.BLL/Services/IOrderService.cs +++ b/Orders.com.BLL/Services/IOrderService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Orders.com.Domain; -using Orders.com.QueryData; using Peasy.Core; +using Orders.com.BLL.Domain; +using Orders.com.BLL.QueryData; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface IOrderService : IService { diff --git a/Orders.com.BLL/Services/IOrderStatusService.cs b/Orders.com.BLL/Services/IOrderStatusService.cs index 59db930..1e6d4a5 100644 --- a/Orders.com.BLL/Services/IOrderStatusService.cs +++ b/Orders.com.BLL/Services/IOrderStatusService.cs @@ -1,12 +1,7 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using Peasy.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface IOrderStatusService : IService { diff --git a/Orders.com.BLL/Services/IProductService.cs b/Orders.com.BLL/Services/IProductService.cs index 534637a..c732111 100644 --- a/Orders.com.BLL/Services/IProductService.cs +++ b/Orders.com.BLL/Services/IProductService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Orders.com.Domain; using Peasy.Core; +using Orders.com.BLL.Domain; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public interface IProductService : IService { diff --git a/Orders.com.BLL/Services/IntentoryItemService.cs b/Orders.com.BLL/Services/IntentoryItemService.cs index ec6d83a..f26182f 100644 --- a/Orders.com.BLL/Services/IntentoryItemService.cs +++ b/Orders.com.BLL/Services/IntentoryItemService.cs @@ -1,10 +1,8 @@ using Peasy.Core; -using Peasy.Core.Extensions; -using Peasy.Extensions; -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class InventoryItemService : OrdersDotComServiceBase, IInventoryItemService { diff --git a/Orders.com.BLL/Services/OrderItemClientService.cs b/Orders.com.BLL/Services/OrderItemClientService.cs index 5630f4a..4d1115b 100644 --- a/Orders.com.BLL/Services/OrderItemClientService.cs +++ b/Orders.com.BLL/Services/OrderItemClientService.cs @@ -1,17 +1,9 @@ using Peasy; using Peasy.Core; -using Peasy.Rules; -using Orders.com.BLL.Commands; -using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class OrderItemClientService : OrderItemService { diff --git a/Orders.com.BLL/Services/OrderItemService.cs b/Orders.com.BLL/Services/OrderItemService.cs index 1f95112..2a86182 100644 --- a/Orders.com.BLL/Services/OrderItemService.cs +++ b/Orders.com.BLL/Services/OrderItemService.cs @@ -1,18 +1,16 @@ using Peasy; using Peasy.Core; -using Peasy.Rules; using Orders.com.BLL.Commands; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Peasy.Exception; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Extensions; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class OrderItemService : OrdersDotComServiceBase, IOrderItemService { diff --git a/Orders.com.BLL/Services/OrderService.cs b/Orders.com.BLL/Services/OrderService.cs index faefdd2..db6948c 100644 --- a/Orders.com.BLL/Services/OrderService.cs +++ b/Orders.com.BLL/Services/OrderService.cs @@ -2,14 +2,14 @@ using Peasy.Core; using Orders.com.BLL.Commands; using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.QueryData; using System; using System.Collections.Generic; using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.QueryData; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class OrderService : OrdersDotComServiceBase, IOrderService { diff --git a/Orders.com.BLL/Services/OrderStatusService.cs b/Orders.com.BLL/Services/OrderStatusService.cs index eb27e58..613a93e 100644 --- a/Orders.com.BLL/Services/OrderStatusService.cs +++ b/Orders.com.BLL/Services/OrderStatusService.cs @@ -1,7 +1,7 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class OrderStatusService : OrdersDotComServiceBase, IOrderStatusService { diff --git a/Orders.com.BLL/Services/OrdersDotComServiceBase.cs b/Orders.com.BLL/Services/OrdersDotComServiceBase.cs index 17b76fd..56f7caa 100644 --- a/Orders.com.BLL/Services/OrdersDotComServiceBase.cs +++ b/Orders.com.BLL/Services/OrdersDotComServiceBase.cs @@ -1,8 +1,8 @@ using Peasy; using Peasy.Core; -using Orders.com.DataProxy; +using Orders.com.BLL.DataProxy; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public abstract class OrdersDotComServiceBase : BusinessServiceBase where T : IDomainObject, new() { diff --git a/Orders.com.BLL/Services/ProductClientService.cs b/Orders.com.BLL/Services/ProductClientService.cs index 6e285a4..bb7b7a3 100644 --- a/Orders.com.BLL/Services/ProductClientService.cs +++ b/Orders.com.BLL/Services/ProductClientService.cs @@ -1,12 +1,9 @@ using Peasy; using Peasy.Core; -using Orders.com.BLL.Commands; -using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; -using System.Collections.Generic; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class ProductClientService : ProductService, IProductService { diff --git a/Orders.com.BLL/Services/ProductService.cs b/Orders.com.BLL/Services/ProductService.cs index 5d86ff4..80af0b3 100644 --- a/Orders.com.BLL/Services/ProductService.cs +++ b/Orders.com.BLL/Services/ProductService.cs @@ -1,12 +1,11 @@ using Peasy; using Peasy.Core; using Orders.com.BLL.Commands; -using Orders.com.BLL.Rules; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Collections.Generic; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; -namespace Orders.com.BLL +namespace Orders.com.BLL.Services { public class ProductService : OrdersDotComServiceBase, IProductService { diff --git a/Orders.com.DAL.EF/CategoryRepository.cs b/Orders.com.DAL.EF/CategoryRepository.cs index 153fc5f..94f4846 100644 --- a/Orders.com.DAL.EF/CategoryRepository.cs +++ b/Orders.com.DAL.EF/CategoryRepository.cs @@ -1,10 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; namespace Orders.com.DAL.EF { diff --git a/Orders.com.DAL.EF/CustomerRepository.cs b/Orders.com.DAL.EF/CustomerRepository.cs index 94af30b..c8cd27c 100644 --- a/Orders.com.DAL.EF/CustomerRepository.cs +++ b/Orders.com.DAL.EF/CustomerRepository.cs @@ -1,5 +1,5 @@ -using Orders.com.Domain; -using Orders.com.DataProxy; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; namespace Orders.com.DAL.EF { diff --git a/Orders.com.DAL.EF/InventoryItemRepository.cs b/Orders.com.DAL.EF/InventoryItemRepository.cs index ab1b087..064c256 100644 --- a/Orders.com.DAL.EF/InventoryItemRepository.cs +++ b/Orders.com.DAL.EF/InventoryItemRepository.cs @@ -1,12 +1,10 @@ -using System; -using System.Linq; +using System.Linq; using System.Threading.Tasks; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Data.Entity; -using Peasy; using Peasy.Exception; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Extensions; namespace Orders.com.DAL.EF { diff --git a/Orders.com.DAL.EF/Migrations/Configuration.cs b/Orders.com.DAL.EF/Migrations/Configuration.cs index 52fe415..752075a 100644 --- a/Orders.com.DAL.EF/Migrations/Configuration.cs +++ b/Orders.com.DAL.EF/Migrations/Configuration.cs @@ -1,11 +1,9 @@ namespace Orders.com.DAL.EF.Migrations { - using Domain; + using BLL.Domain; using System; using System.Collections.Generic; - using System.Data.Entity; using System.Data.Entity.Migrations; - using System.Linq; public sealed class Configuration : DbMigrationsConfiguration { diff --git a/Orders.com.DAL.EF/OrderItemRepository.cs b/Orders.com.DAL.EF/OrderItemRepository.cs index e2c53b5..2477215 100644 --- a/Orders.com.DAL.EF/OrderItemRepository.cs +++ b/Orders.com.DAL.EF/OrderItemRepository.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Data.Entity; using System.Linq; diff --git a/Orders.com.DAL.EF/OrderRepository.cs b/Orders.com.DAL.EF/OrderRepository.cs index 8cf0810..3307db8 100644 --- a/Orders.com.DAL.EF/OrderRepository.cs +++ b/Orders.com.DAL.EF/OrderRepository.cs @@ -1,13 +1,11 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; -using Orders.com.QueryData; -using Orders.com.Extensions; +using Orders.com.BLL.Extensions; using System.Data.Entity; +using Orders.com.BLL.Domain; +using Orders.com.BLL.QueryData; +using Orders.com.BLL.DataProxy; namespace Orders.com.DAL.EF { diff --git a/Orders.com.DAL.EF/OrderStatusRepository.cs b/Orders.com.DAL.EF/OrderStatusRepository.cs index 8235da6..d2f13f8 100644 --- a/Orders.com.DAL.EF/OrderStatusRepository.cs +++ b/Orders.com.DAL.EF/OrderStatusRepository.cs @@ -1,10 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; namespace Orders.com.DAL.EF { diff --git a/Orders.com.DAL.EF/OrdersDotComContext.cs b/Orders.com.DAL.EF/OrdersDotComContext.cs index f1e982a..ffe97c0 100644 --- a/Orders.com.DAL.EF/OrdersDotComContext.cs +++ b/Orders.com.DAL.EF/OrdersDotComContext.cs @@ -1,4 +1,4 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using System.Data.Entity; namespace Orders.com.DAL.EF diff --git a/Orders.com.DAL.EF/OrdersDotComRepositoryBase.cs b/Orders.com.DAL.EF/OrdersDotComRepositoryBase.cs index 4d50565..593fcea 100644 --- a/Orders.com.DAL.EF/OrdersDotComRepositoryBase.cs +++ b/Orders.com.DAL.EF/OrdersDotComRepositoryBase.cs @@ -1,4 +1,4 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using Peasy; using Peasy.DataProxy.EF6; using System; diff --git a/Orders.com.DAL.EF/ProductRepository.cs b/Orders.com.DAL.EF/ProductRepository.cs index 200af71..99726b9 100644 --- a/Orders.com.DAL.EF/ProductRepository.cs +++ b/Orders.com.DAL.EF/ProductRepository.cs @@ -1,10 +1,8 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace Orders.com.DAL.EF diff --git a/Orders.com.DAL.Http/CategoriesHttpServiceProxy.cs b/Orders.com.DAL.Http/CategoriesHttpServiceProxy.cs index d26c005..f7d3844 100644 --- a/Orders.com.DAL.Http/CategoriesHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/CategoriesHttpServiceProxy.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; namespace Orders.com.DAL.Http { diff --git a/Orders.com.DAL.Http/CustomersHttpServiceProxy.cs b/Orders.com.DAL.Http/CustomersHttpServiceProxy.cs index cf01eef..32cbaa8 100644 --- a/Orders.com.DAL.Http/CustomersHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/CustomersHttpServiceProxy.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; namespace Orders.com.DAL.Http { diff --git a/Orders.com.DAL.Http/InventoryItemsHttpServiceProxy.cs b/Orders.com.DAL.Http/InventoryItemsHttpServiceProxy.cs index 5ae34a7..8806af6 100644 --- a/Orders.com.DAL.Http/InventoryItemsHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/InventoryItemsHttpServiceProxy.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Threading.Tasks; namespace Orders.com.DAL.Http diff --git a/Orders.com.DAL.Http/OrderItemsHttpServiceProxy.cs b/Orders.com.DAL.Http/OrderItemsHttpServiceProxy.cs index 18d5e8d..70ed332 100644 --- a/Orders.com.DAL.Http/OrderItemsHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/OrderItemsHttpServiceProxy.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/Orders.com.DAL.Http/OrdersHttpServiceProxy.cs b/Orders.com.DAL.Http/OrdersHttpServiceProxy.cs index 221464d..cf565d6 100644 --- a/Orders.com.DAL.Http/OrdersHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/OrdersHttpServiceProxy.cs @@ -1,8 +1,8 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; -using Orders.com.QueryData; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.QueryData; namespace Orders.com.DAL.Http { diff --git a/Orders.com.DAL.Http/ProductsHttpServiceProxy.cs b/Orders.com.DAL.Http/ProductsHttpServiceProxy.cs index 4846402..f04834d 100644 --- a/Orders.com.DAL.Http/ProductsHttpServiceProxy.cs +++ b/Orders.com.DAL.Http/ProductsHttpServiceProxy.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/Orders.com.DAL.InMemory/CategoryRepository.cs b/Orders.com.DAL.InMemory/CategoryRepository.cs index 953862d..520522b 100644 --- a/Orders.com.DAL.InMemory/CategoryRepository.cs +++ b/Orders.com.DAL.InMemory/CategoryRepository.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; namespace Orders.com.DAL.InMemory diff --git a/Orders.com.DAL.InMemory/CustomerRepository.cs b/Orders.com.DAL.InMemory/CustomerRepository.cs index d9d072e..8d54851 100644 --- a/Orders.com.DAL.InMemory/CustomerRepository.cs +++ b/Orders.com.DAL.InMemory/CustomerRepository.cs @@ -1,6 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; -using System; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; namespace Orders.com.DAL.InMemory diff --git a/Orders.com.DAL.InMemory/InventoryItemRepository.cs b/Orders.com.DAL.InMemory/InventoryItemRepository.cs index fc1d514..4cba91d 100644 --- a/Orders.com.DAL.InMemory/InventoryItemRepository.cs +++ b/Orders.com.DAL.InMemory/InventoryItemRepository.cs @@ -1,6 +1,6 @@ using AutoMapper; -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Diagnostics; using System.Linq; diff --git a/Orders.com.DAL.InMemory/OrderItemRepository.cs b/Orders.com.DAL.InMemory/OrderItemRepository.cs index bdfe61c..81442bc 100644 --- a/Orders.com.DAL.InMemory/OrderItemRepository.cs +++ b/Orders.com.DAL.InMemory/OrderItemRepository.cs @@ -1,11 +1,10 @@ using AutoMapper; -using Orders.com.DataProxy; -using Orders.com.Domain; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; -using System; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; namespace Orders.com.DAL.InMemory { diff --git a/Orders.com.DAL.InMemory/OrderRepository.cs b/Orders.com.DAL.InMemory/OrderRepository.cs index 1d8e34b..b81cd40 100644 --- a/Orders.com.DAL.InMemory/OrderRepository.cs +++ b/Orders.com.DAL.InMemory/OrderRepository.cs @@ -1,13 +1,13 @@ using AutoMapper; -using Orders.com.DataProxy; -using Orders.com.Domain; -using Orders.com.Extensions; -using Orders.com.QueryData; +using Orders.com.BLL.Extensions; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; +using Orders.com.BLL.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.QueryData; namespace Orders.com.DAL.InMemory { @@ -16,9 +16,22 @@ public class OrderRepository : OrdersDotComMockBase, IOrderDataProxy private ICustomerDataProxy _customerDataProxy; private IOrderItemDataProxy _orderItemDataProxy; + public ICustomerDataProxy CustomerDataProxy + { + get + { + return _customerDataProxy; + } + + set + { + _customerDataProxy = value; + } + } + public OrderRepository(ICustomerDataProxy customerDataProxy, IOrderItemDataProxy orderItemDataProxy) : base() { - _customerDataProxy = customerDataProxy; + CustomerDataProxy = customerDataProxy; _orderItemDataProxy = orderItemDataProxy; } @@ -30,7 +43,7 @@ protected override IEnumerable SeedDataProxy() public IEnumerable GetAll(int start, int pageSize) { var orders = GetAll(); - var customers = _customerDataProxy.GetAll().ToDictionary(c => c.CustomerID); + var customers = CustomerDataProxy.GetAll().ToDictionary(c => c.CustomerID); var orderItems = _orderItemDataProxy.GetAll().ToArray(); var results = orders.Skip(start) .Take(pageSize) diff --git a/Orders.com.DAL.InMemory/OrderStatusRepository.cs b/Orders.com.DAL.InMemory/OrderStatusRepository.cs index ef46b7f..7288a90 100644 --- a/Orders.com.DAL.InMemory/OrderStatusRepository.cs +++ b/Orders.com.DAL.InMemory/OrderStatusRepository.cs @@ -1,5 +1,5 @@ -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; namespace Orders.com.DAL.InMemory diff --git a/Orders.com.DAL.InMemory/OrdersDotComMockBase.cs b/Orders.com.DAL.InMemory/OrdersDotComMockBase.cs index 8a1e58f..2d73ea4 100644 --- a/Orders.com.DAL.InMemory/OrdersDotComMockBase.cs +++ b/Orders.com.DAL.InMemory/OrdersDotComMockBase.cs @@ -1,10 +1,10 @@ using Peasy.Core; -using Orders.com.Extensions; using System.Linq; using Peasy; using Peasy.DataProxy.InMemory; using System.Collections.Generic; using Peasy.Exception; +using Orders.com.BLL.Extensions; namespace Orders.com.DAL.InMemory { diff --git a/Orders.com.DAL.InMemory/ProductRepository.cs b/Orders.com.DAL.InMemory/ProductRepository.cs index 00a9364..5fd6d61 100644 --- a/Orders.com.DAL.InMemory/ProductRepository.cs +++ b/Orders.com.DAL.InMemory/ProductRepository.cs @@ -1,6 +1,6 @@ using AutoMapper; -using Orders.com.DataProxy; -using Orders.com.Domain; +using Orders.com.BLL.DataProxy; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Diagnostics; using System.Linq; diff --git a/Orders.com.WPF/CustomerOrderWindow.xaml.cs b/Orders.com.WPF/CustomerOrderWindow.xaml.cs index a1514e9..dac7b18 100644 --- a/Orders.com.WPF/CustomerOrderWindow.xaml.cs +++ b/Orders.com.WPF/CustomerOrderWindow.xaml.cs @@ -1,20 +1,7 @@ -using Orders.com.BLL; -using Orders.com.Domain; -using Orders.com.QueryData; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; using Orders.com.WPF.VM; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Orders.com.WPF { diff --git a/Orders.com.WPF/MainWindow.xaml.cs b/Orders.com.WPF/MainWindow.xaml.cs index 74cd013..8312f02 100644 --- a/Orders.com.WPF/MainWindow.xaml.cs +++ b/Orders.com.WPF/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using Orders.com.BLL; +using Orders.com.BLL.Services; using Orders.com.DAL.Http; using Orders.com.DAL.InMemory; using Orders.com.WPF.VM; diff --git a/Orders.com.WPF/OrderInsertedEvent.cs b/Orders.com.WPF/OrderInsertedEvent.cs index 0c99758..2db25f7 100644 --- a/Orders.com.WPF/OrderInsertedEvent.cs +++ b/Orders.com.WPF/OrderInsertedEvent.cs @@ -1,10 +1,4 @@ -using Orders.com.Domain; -using Orders.com.WPF.VM; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Orders.com.WPF.VM; namespace Orders.com.WPF { diff --git a/Orders.com.WPF/OrderUpdatedEvent.cs b/Orders.com.WPF/OrderUpdatedEvent.cs index f1c6e04..dc56e6c 100644 --- a/Orders.com.WPF/OrderUpdatedEvent.cs +++ b/Orders.com.WPF/OrderUpdatedEvent.cs @@ -1,10 +1,4 @@ -using Orders.com.Domain; -using Orders.com.WPF.VM; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Orders.com.WPF.VM; namespace Orders.com.WPF { diff --git a/Orders.com.WPF/VM/CategoriesVM.cs b/Orders.com.WPF/VM/CategoriesVM.cs index 1b83bcc..40ab4fc 100644 --- a/Orders.com.WPF/VM/CategoriesVM.cs +++ b/Orders.com.WPF/VM/CategoriesVM.cs @@ -1,10 +1,10 @@ using Peasy.Core.Extensions; -using Orders.com.BLL; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; using System.Windows.Input; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/CategoryVM.cs b/Orders.com.WPF/VM/CategoryVM.cs index 32fe032..7f7aa54 100644 --- a/Orders.com.WPF/VM/CategoryVM.cs +++ b/Orders.com.WPF/VM/CategoryVM.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/CustomerOrderVM.cs b/Orders.com.WPF/VM/CustomerOrderVM.cs index b411ebb..a746c90 100644 --- a/Orders.com.WPF/VM/CustomerOrderVM.cs +++ b/Orders.com.WPF/VM/CustomerOrderVM.cs @@ -1,12 +1,12 @@ using Peasy.Core.Extensions; -using Orders.com.BLL; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Extensions; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; using System.Windows.Input; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/CustomerVM.cs b/Orders.com.WPF/VM/CustomerVM.cs index e04a5ef..4bbbecd 100644 --- a/Orders.com.WPF/VM/CustomerVM.cs +++ b/Orders.com.WPF/VM/CustomerVM.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/CustomersVM.cs b/Orders.com.WPF/VM/CustomersVM.cs index 8ad73ed..df7f88d 100644 --- a/Orders.com.WPF/VM/CustomersVM.cs +++ b/Orders.com.WPF/VM/CustomersVM.cs @@ -1,10 +1,10 @@ using Peasy.Core.Extensions; -using Orders.com.BLL; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; using System.Windows.Input; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/InventoryItemVM.cs b/Orders.com.WPF/VM/InventoryItemVM.cs index 92131b8..0f48bed 100644 --- a/Orders.com.WPF/VM/InventoryItemVM.cs +++ b/Orders.com.WPF/VM/InventoryItemVM.cs @@ -1,6 +1,6 @@ using System.Linq; -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Services; +using Orders.com.BLL.Domain; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/InventoryItemsVM.cs b/Orders.com.WPF/VM/InventoryItemsVM.cs index eedf5c2..54b8ec8 100644 --- a/Orders.com.WPF/VM/InventoryItemsVM.cs +++ b/Orders.com.WPF/VM/InventoryItemsVM.cs @@ -1,4 +1,4 @@ -using Orders.com.BLL; +using Orders.com.BLL.Services; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; diff --git a/Orders.com.WPF/VM/MainWindowVM.cs b/Orders.com.WPF/VM/MainWindowVM.cs index 285a4d7..5af8972 100644 --- a/Orders.com.WPF/VM/MainWindowVM.cs +++ b/Orders.com.WPF/VM/MainWindowVM.cs @@ -1,4 +1,4 @@ -using Orders.com.BLL; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/OrderItemVM.cs b/Orders.com.WPF/VM/OrderItemVM.cs index 5e477b0..c282f61 100644 --- a/Orders.com.WPF/VM/OrderItemVM.cs +++ b/Orders.com.WPF/VM/OrderItemVM.cs @@ -1,7 +1,6 @@ -using MahApps.Metro.Controls.Dialogs; -using Orders.com.BLL; -using Orders.com.Domain; -using Orders.com.Extensions; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Extensions; +using Orders.com.BLL.Services; using System; using System.Collections.Generic; using System.Linq; diff --git a/Orders.com.WPF/VM/OrderVM.cs b/Orders.com.WPF/VM/OrderVM.cs index 64b41b6..bb9d05b 100644 --- a/Orders.com.WPF/VM/OrderVM.cs +++ b/Orders.com.WPF/VM/OrderVM.cs @@ -1,6 +1,6 @@ -using Orders.com.BLL; -using Orders.com.Extensions; -using Orders.com.QueryData; +using Orders.com.BLL.Extensions; +using Orders.com.BLL.QueryData; +using Orders.com.BLL.Services; using System; using System.Linq; diff --git a/Orders.com.WPF/VM/OrdersDotComVMBase.cs b/Orders.com.WPF/VM/OrdersDotComVMBase.cs index 38aa370..3cbe6aa 100644 --- a/Orders.com.WPF/VM/OrdersDotComVMBase.cs +++ b/Orders.com.WPF/VM/OrdersDotComVMBase.cs @@ -1,5 +1,7 @@ using Orders.com.BLL; using Orders.com; +using Orders.com.BLL.Services; +using Orders.com.BLL.Domain; namespace Orders.com.WPF.VM { diff --git a/Orders.com.WPF/VM/OrdersVM.cs b/Orders.com.WPF/VM/OrdersVM.cs index 88cf0f3..93d3166 100644 --- a/Orders.com.WPF/VM/OrdersVM.cs +++ b/Orders.com.WPF/VM/OrdersVM.cs @@ -1,4 +1,4 @@ -using Orders.com.BLL; +using Orders.com.BLL.Services; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; diff --git a/Orders.com.WPF/VM/ProductVM.cs b/Orders.com.WPF/VM/ProductVM.cs index 96deac6..118163b 100644 --- a/Orders.com.WPF/VM/ProductVM.cs +++ b/Orders.com.WPF/VM/ProductVM.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; using System.Collections.Generic; namespace Orders.com.WPF.VM diff --git a/Orders.com.WPF/VM/ProductsVM.cs b/Orders.com.WPF/VM/ProductsVM.cs index c5779f0..252deaa 100644 --- a/Orders.com.WPF/VM/ProductsVM.cs +++ b/Orders.com.WPF/VM/ProductsVM.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows.Input; +using Orders.com.BLL.Services; namespace Orders.com.WPF.VM { diff --git a/Orders.com.Web.Api/App_Start/NinjectWebCommon.cs b/Orders.com.Web.Api/App_Start/NinjectWebCommon.cs index dfd9913..e6bad71 100644 --- a/Orders.com.Web.Api/App_Start/NinjectWebCommon.cs +++ b/Orders.com.Web.Api/App_Start/NinjectWebCommon.cs @@ -12,7 +12,7 @@ namespace Orders.com.Web.Api using Configuration; using BLL; using DAL.InMemory; - using DataProxy; + using BLL.DataProxy; using Peasy; public static class NinjectWebCommon diff --git a/Orders.com.Web.Api/Controllers/CategoriesController.cs b/Orders.com.Web.Api/Controllers/CategoriesController.cs index afaedcd..63cdc38 100644 --- a/Orders.com.Web.Api/Controllers/CategoriesController.cs +++ b/Orders.com.Web.Api/Controllers/CategoriesController.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.Web.Api.Controllers { diff --git a/Orders.com.Web.Api/Controllers/CustomersController.cs b/Orders.com.Web.Api/Controllers/CustomersController.cs index 59bd914..d4176d6 100644 --- a/Orders.com.Web.Api/Controllers/CustomersController.cs +++ b/Orders.com.Web.Api/Controllers/CustomersController.cs @@ -1,6 +1,5 @@ -using System.Net.Http; -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.Web.Api.Controllers { diff --git a/Orders.com.Web.Api/Controllers/InventoryItemsController.cs b/Orders.com.Web.Api/Controllers/InventoryItemsController.cs index 287b99e..ee8ecf9 100644 --- a/Orders.com.Web.Api/Controllers/InventoryItemsController.cs +++ b/Orders.com.Web.Api/Controllers/InventoryItemsController.cs @@ -1,6 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; -using System.Collections.Generic; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; using System.Web.Http; namespace Orders.com.Web.Api.Controllers diff --git a/Orders.com.Web.Api/Controllers/OrderItemsController.cs b/Orders.com.Web.Api/Controllers/OrderItemsController.cs index f2dfef4..8a2d11d 100644 --- a/Orders.com.Web.Api/Controllers/OrderItemsController.cs +++ b/Orders.com.Web.Api/Controllers/OrderItemsController.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; using System.Collections.Generic; using System.Linq; using System.Web.Http; diff --git a/Orders.com.Web.Api/Controllers/OrdersController.cs b/Orders.com.Web.Api/Controllers/OrdersController.cs index 063398d..daa4e88 100644 --- a/Orders.com.Web.Api/Controllers/OrdersController.cs +++ b/Orders.com.Web.Api/Controllers/OrdersController.cs @@ -1,6 +1,6 @@ -using Orders.com.BLL; -using Orders.com.Domain; -using Orders.com.QueryData; +using Orders.com.BLL.Domain; +using Orders.com.BLL.QueryData; +using Orders.com.BLL.Services; using System.Collections.Generic; using System.Web.Http; diff --git a/Orders.com.Web.Api/Controllers/ProductsController.cs b/Orders.com.Web.Api/Controllers/ProductsController.cs index c6d4a15..cc7acb2 100644 --- a/Orders.com.Web.Api/Controllers/ProductsController.cs +++ b/Orders.com.Web.Api/Controllers/ProductsController.cs @@ -1,5 +1,5 @@ -using Orders.com.BLL; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; using System.Collections.Generic; using System.Web.Http; diff --git a/Orders.com.Web.MVC/Controllers/CategoriesController.cs b/Orders.com.Web.MVC/Controllers/CategoriesController.cs index 9621ff3..d918cb5 100644 --- a/Orders.com.Web.MVC/Controllers/CategoriesController.cs +++ b/Orders.com.Web.MVC/Controllers/CategoriesController.cs @@ -1,6 +1,6 @@ -using Orders.com.Domain; -using Orders.com.BLL; -using Orders.com.Web.MVC.ViewModels; +using Orders.com.Web.MVC.ViewModels; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.Web.MVC.Controllers { diff --git a/Orders.com.Web.MVC/Controllers/ControllerBase.cs b/Orders.com.Web.MVC/Controllers/ControllerBase.cs index 91fd8fe..8f2f20c 100644 --- a/Orders.com.Web.MVC/Controllers/ControllerBase.cs +++ b/Orders.com.Web.MVC/Controllers/ControllerBase.cs @@ -1,4 +1,5 @@ -using Orders.com.Web.MVC.ViewModels; +using Orders.com.BLL.Domain; +using Orders.com.Web.MVC.ViewModels; using Peasy.Core; using Peasy.Core.Extensions; using System.Linq; diff --git a/Orders.com.Web.MVC/Controllers/CustomersController.cs b/Orders.com.Web.MVC/Controllers/CustomersController.cs index 85ff1d1..6b97187 100644 --- a/Orders.com.Web.MVC/Controllers/CustomersController.cs +++ b/Orders.com.Web.MVC/Controllers/CustomersController.cs @@ -1,6 +1,6 @@ -using Orders.com.Domain; -using Orders.com.BLL; -using Orders.com.Web.MVC.ViewModels; +using Orders.com.Web.MVC.ViewModels; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.Web.MVC.Controllers { diff --git a/Orders.com.Web.MVC/Controllers/ProductsController.cs b/Orders.com.Web.MVC/Controllers/ProductsController.cs index e0f1640..f61049d 100644 --- a/Orders.com.Web.MVC/Controllers/ProductsController.cs +++ b/Orders.com.Web.MVC/Controllers/ProductsController.cs @@ -1,7 +1,7 @@ -using Orders.com.Domain; -using Orders.com.BLL; -using Orders.com.Web.MVC.ViewModels; +using Orders.com.Web.MVC.ViewModels; using System.Collections.Generic; +using Orders.com.BLL.Domain; +using Orders.com.BLL.Services; namespace Orders.com.Web.MVC.Controllers { diff --git a/Orders.com.Web.MVC/OrdersDotComDataInitializer.cs b/Orders.com.Web.MVC/OrdersDotComDataInitializer.cs index bc996cb..3d373ba 100644 --- a/Orders.com.Web.MVC/OrdersDotComDataInitializer.cs +++ b/Orders.com.Web.MVC/OrdersDotComDataInitializer.cs @@ -1,13 +1,11 @@ -using Orders.com.DAL.EF; -using Orders.com.Domain; +using Orders.com.BLL.Domain; +using Orders.com.DAL.EF; using System; using System.Collections.Generic; -using System.Linq; -using System.Web; namespace Orders.com.Web.MVC { - public class OrdersDotComDataInitializer : System.Data.Entity.DropCreateDatabaseIfModelChanges + public class OrdersDotComDataInitializer : System.Data.Entity.DropCreateDatabaseIfModelChanges { protected override void Seed(OrdersDotComContext context) { diff --git a/Orders.com.Web.MVC/ViewModels/CategoryViewModel.cs b/Orders.com.Web.MVC/ViewModels/CategoryViewModel.cs index 97cbbe4..4798aa1 100644 --- a/Orders.com.Web.MVC/ViewModels/CategoryViewModel.cs +++ b/Orders.com.Web.MVC/ViewModels/CategoryViewModel.cs @@ -1,4 +1,4 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; namespace Orders.com.Web.MVC.ViewModels { diff --git a/Orders.com.Web.MVC/ViewModels/CustomerViewModel.cs b/Orders.com.Web.MVC/ViewModels/CustomerViewModel.cs index 4e730cd..9b1c44e 100644 --- a/Orders.com.Web.MVC/ViewModels/CustomerViewModel.cs +++ b/Orders.com.Web.MVC/ViewModels/CustomerViewModel.cs @@ -1,4 +1,4 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; namespace Orders.com.Web.MVC.ViewModels { diff --git a/Orders.com.Web.MVC/ViewModels/ProductViewModel.cs b/Orders.com.Web.MVC/ViewModels/ProductViewModel.cs index ac95051..30ae7b9 100644 --- a/Orders.com.Web.MVC/ViewModels/ProductViewModel.cs +++ b/Orders.com.Web.MVC/ViewModels/ProductViewModel.cs @@ -1,4 +1,4 @@ -using Orders.com.Domain; +using Orders.com.BLL.Domain; using System.Collections.Generic; using System.Linq;