diff --git a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs index 5c7ecdef5..41e60bab5 100644 --- a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs +++ b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs @@ -5,7 +5,7 @@ using System; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.ServicesModelDTOs; using Xunit; namespace Basket.FunctionalTests diff --git a/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs b/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs index b544ea221..3b840b1c8 100644 --- a/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs +++ b/src/Services/Ordering/Ordering.FunctionalTests/OrderingScenarios.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.ServicesModelDTOs; using Xunit; namespace Ordering.FunctionalTests diff --git a/src/Web/WebMVC/Controllers/CampaignsController.cs b/src/Web/WebMVC/Controllers/CampaignsController.cs index 058012d26..d26e60f94 100644 --- a/src/Web/WebMVC/Controllers/CampaignsController.cs +++ b/src/Web/WebMVC/Controllers/CampaignsController.cs @@ -2,7 +2,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers { using AspNetCore.Authorization; using AspNetCore.Mvc; - using global::WebMVC.Models; + using global::WebMVC.Services.ModelDTOs; using global::WebMVC.Services; using global::WebMVC.ViewModels; using Microsoft.Extensions.Options; diff --git a/src/Web/WebMVC/Controllers/OrderManagementController.cs b/src/Web/WebMVC/Controllers/OrderManagementController.cs index abd0b21ab..7d61b0221 100644 --- a/src/Web/WebMVC/Controllers/OrderManagementController.cs +++ b/src/Web/WebMVC/Controllers/OrderManagementController.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; using Microsoft.eShopOnContainers.WebMVC.Services; using Microsoft.eShopOnContainers.WebMVC.ViewModels; using Microsoft.AspNetCore.Authorization; diff --git a/src/Web/WebMVC/Services/BasketService.cs b/src/Web/WebMVC/Services/BasketService.cs index 7dffd934b..dd0a50feb 100644 --- a/src/Web/WebMVC/Services/BasketService.cs +++ b/src/Web/WebMVC/Services/BasketService.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using WebMVC.Infrastructure; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace Microsoft.eShopOnContainers.WebMVC.Services { diff --git a/src/Web/WebMVC/Services/IBasketService.cs b/src/Web/WebMVC/Services/IBasketService.cs index cfbea5ff0..8c096bfaf 100644 --- a/src/Web/WebMVC/Services/IBasketService.cs +++ b/src/Web/WebMVC/Services/IBasketService.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace Microsoft.eShopOnContainers.WebMVC.Services { diff --git a/src/Web/WebMVC/Services/ILocationService.cs b/src/Web/WebMVC/Services/ILocationService.cs index ac2295e10..d5f7b7224 100644 --- a/src/Web/WebMVC/Services/ILocationService.cs +++ b/src/Web/WebMVC/Services/ILocationService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace WebMVC.Services { diff --git a/src/Web/WebMVC/Services/IOrderingService.cs b/src/Web/WebMVC/Services/IOrderingService.cs index 1de2c631c..480ea4119 100644 --- a/src/Web/WebMVC/Services/IOrderingService.cs +++ b/src/Web/WebMVC/Services/IOrderingService.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace Microsoft.eShopOnContainers.WebMVC.Services { diff --git a/src/Web/WebMVC/Services/LocationService.cs b/src/Web/WebMVC/Services/LocationService.cs index 3e58ef125..8d81cbd22 100644 --- a/src/Web/WebMVC/Services/LocationService.cs +++ b/src/Web/WebMVC/Services/LocationService.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using System.Net.Http; using System.Threading.Tasks; using WebMVC.Infrastructure; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace WebMVC.Services { diff --git a/src/Web/WebMVC/Models/BasketDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/BasketDTO.cs similarity index 95% rename from src/Web/WebMVC/Models/BasketDTO.cs rename to src/Web/WebMVC/Services/ModelDTOs/BasketDTO.cs index 4609c8533..130a729f5 100644 --- a/src/Web/WebMVC/Models/BasketDTO.cs +++ b/src/Web/WebMVC/Services/ModelDTOs/BasketDTO.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace WebMVC.Models +namespace WebMVC.Services.ModelDTOs { public class BasketDTO { diff --git a/src/Web/WebMVC/Models/LocationDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs similarity index 86% rename from src/Web/WebMVC/Models/LocationDTO.cs rename to src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs index 88169c421..40c9f07a8 100644 --- a/src/Web/WebMVC/Models/LocationDTO.cs +++ b/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace WebMVC.Models +namespace WebMVC.Services.ModelDTOs { public class LocationDTO { diff --git a/src/Web/WebMVC/Models/OrderDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs similarity index 82% rename from src/Web/WebMVC/Models/OrderDTO.cs rename to src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs index 13646ea38..5f925a8ee 100644 --- a/src/Web/WebMVC/Models/OrderDTO.cs +++ b/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace WebMVC.Models +namespace WebMVC.Services.ModelDTOs { public class OrderDTO { diff --git a/src/Web/WebMVC/Models/OrderProcessAction.cs b/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs similarity index 93% rename from src/Web/WebMVC/Models/OrderProcessAction.cs rename to src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs index bd746bb36..c1309d59b 100644 --- a/src/Web/WebMVC/Models/OrderProcessAction.cs +++ b/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace WebMVC.Models +namespace WebMVC.Services.ModelDTOs { public class OrderProcessAction { diff --git a/src/Web/WebMVC/Services/OrderingService.cs b/src/Web/WebMVC/Services/OrderingService.cs index e3d24422f..489946db5 100644 --- a/src/Web/WebMVC/Services/OrderingService.cs +++ b/src/Web/WebMVC/Services/OrderingService.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using WebMVC.Infrastructure; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace Microsoft.eShopOnContainers.WebMVC.Services { diff --git a/src/Web/WebMVC/ViewModels/Order.cs b/src/Web/WebMVC/ViewModels/Order.cs index 28dbe9968..2beaf43b1 100644 --- a/src/Web/WebMVC/ViewModels/Order.cs +++ b/src/Web/WebMVC/ViewModels/Order.cs @@ -7,7 +7,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; namespace Microsoft.eShopOnContainers.WebMVC.ViewModels { diff --git a/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs index b09526bf3..179717583 100644 --- a/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs +++ b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using WebMVC.Models; +using WebMVC.Services.ModelDTOs; using Xunit; namespace FunctionalTests.Services.Ordering