Refactor ModelDTOs for a more consistent folder structure

mvelosop · mvelosop · commit 2717659a0d2b · 2019-03-04T13:31:29.000Z
diff --git a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
@@ -5,7 +5,7 @@
 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
@@ -3,7 +3,7 @@
 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
@@ -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
@@ -3,7 +3,7 @@
 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
@@ -6,7 +6,7 @@
 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
@@ -3,7 +3,7 @@
 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
@@ -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
@@ -3,7 +3,7 @@
 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
@@ -6,7 +6,7 @@
 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/Services/ModelDTOs/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/Services/ModelDTOs/LocationDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace WebMVC.Models
+namespace WebMVC.Services.ModelDTOs
 {
     public class LocationDTO
     {
diff --git a/src/Web/WebMVC/Services/ModelDTOs/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/Services/ModelDTOs/OrderProcessAction.cs b/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs
@@ -3,7 +3,7 @@
 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
@@ -6,7 +6,7 @@
 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
@@ -7,7 +7,7 @@
 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
@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using WebMVC.Models;
+using WebMVC.Services.ModelDTOs;
 using Xunit;
 
 namespace FunctionalTests.Services.Ordering

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers`
`2`	`2`	`{`
`3`	`3`	`using AspNetCore.Authorization;`
`4`	`4`	`using AspNetCore.Mvc;`
`5`		`- using global::WebMVC.Models;`
	`5`	`+ using global::WebMVC.Services.ModelDTOs;`
`6`	`6`	`using global::WebMVC.Services;`
`7`	`7`	`using global::WebMVC.ViewModels;`
`8`	`8`	`using Microsoft.Extensions.Options;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Net.Http;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using WebMVC.Infrastructure;`
`9`		`-using WebMVC.Models;`
	`9`	`+using WebMVC.Services.ModelDTOs;`
`10`	`10`
`11`	`11`	`namespace Microsoft.eShopOnContainers.WebMVC.Services`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using WebMVC.Models;`
	`6`	`+using WebMVC.Services.ModelDTOs;`
`7`	`7`
`8`	`8`	`namespace Microsoft.eShopOnContainers.WebMVC.Services`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`		`-using WebMVC.Models;`
	`2`	`+using WebMVC.Services.ModelDTOs;`
`3`	`3`
`4`	`4`	`namespace WebMVC.Services`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.ComponentModel.DataAnnotations;`
`3`	`3`
`4`		`-namespace WebMVC.Models`
	`4`	`+namespace WebMVC.Services.ModelDTOs`
`5`	`5`	`{`
`6`	`6`	`public class BasketDTO`
`7`	`7`	`{`