Made service models structure resemble that of the web models (models for each "feature" are in their own folder)

9 files changed, 15 insertions, 15 deletions

diff --git a/ExamTemplate/Services/Configurations/UserMappings.cs b/ExamTemplate/Services/Configurations/UserMappings.cs
index 1852139..acb3ae4 100644
--- a/ExamTemplate/Services/Configurations/UserMappings.cs
+++ b/ExamTemplate/Services/Configurations/UserMappings.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using ExamTemplate.Data.Models;
-using ExamTemplate.Services.Models;
+using ExamTemplate.Services.Models.User;
 
 namespace ExamTemplate.Services.Configurations
 {
diff --git a/ExamTemplate/Services/Models/EditUserServiceModel.cs b/ExamTemplate/Services/Models/User/EditUserServiceModel.cs
index 80e5501..c8b9971 100644
--- a/ExamTemplate/Services/Models/EditUserServiceModel.cs
+++ b/ExamTemplate/Services/Models/User/EditUserServiceModel.cs
@@ -1,4 +1,4 @@
-namespace ExamTemplate.Services.Models
+namespace ExamTemplate.Services.Models.User
 {
 	public class EditUserServiceModel
 	{
diff --git a/ExamTemplate/Services/Models/LoginUserServiceModel.cs b/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
index 1d8a2f8..20aaaeb 100644
--- a/ExamTemplate/Services/Models/LoginUserServiceModel.cs
+++ b/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
@@ -1,4 +1,4 @@
-namespace ExamTemplate.Services.Models
+namespace ExamTemplate.Services.Models.User
 {
 	public class LoginUserServiceModel
 	{
diff --git a/ExamTemplate/Services/Models/RegisterUserServiceModel.cs b/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
index 7a274ae..b08d5ba 100644
--- a/ExamTemplate/Services/Models/RegisterUserServiceModel.cs
+++ b/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
@@ -1,4 +1,4 @@
-namespace ExamTemplate.Services.Models
+namespace ExamTemplate.Services.Models.User
 {
 	public class RegisterUserServiceModel
 	{
diff --git a/ExamTemplate/Services/Models/UserServiceModel.cs b/ExamTemplate/Services/Models/User/UserServiceModel.cs
index 8dcea69..0e8b939 100644
--- a/ExamTemplate/Services/Models/UserServiceModel.cs
+++ b/ExamTemplate/Services/Models/User/UserServiceModel.cs
@@ -1,4 +1,4 @@
-namespace ExamTemplate.Services.Models
+namespace ExamTemplate.Services.Models.User
 {
 	public class UserServiceModel
 	{
diff --git a/ExamTemplate/Services/UserService.cs b/ExamTemplate/Services/UserService.cs
index 0dfc4b4..8c54e0f 100644
--- a/ExamTemplate/Services/UserService.cs
+++ b/ExamTemplate/Services/UserService.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using AutoMapper;

 using ExamTemplate.Data;

 using ExamTemplate.Data.Models;

-using ExamTemplate.Services.Models;

+using ExamTemplate.Services.Models.User;

 using Microsoft.AspNetCore.Identity;

 using Microsoft.EntityFrameworkCore;

 

diff --git a/ExamTemplate/Web/Configurations/UserMappings.cs b/ExamTemplate/Web/Configurations/UserMappings.cs
index 93b5107..3f0f22c 100644
--- a/ExamTemplate/Web/Configurations/UserMappings.cs
+++ b/ExamTemplate/Web/Configurations/UserMappings.cs
@@ -1,5 +1,5 @@
 using AutoMapper;
-using ExamTemplate.Services.Models;
+using ExamTemplate.Services.Models.User;
 using ExamTemplate.Web.Models.User;
 
 namespace ExamTemplate.Services.Configurations
diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/Controllers/AccountController.cs
index 373dd4b..f970a2c 100644
--- a/ExamTemplate/Web/Controllers/AccountController.cs
+++ b/ExamTemplate/Web/Controllers/AccountController.cs
@@ -2,7 +2,7 @@ using ExamTemplate.Services;
 using Microsoft.AspNetCore.Mvc;
 using ExamTemplate.Web.Models.User;
 using AutoMapper;
-using ExamTemplate.Services.Models;
+using ExamTemplate.Services.Models.User;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 
diff --git a/tools/add-feature-template.sh b/tools/add-feature-template.sh
index c1f59d9..9fea26a 100755
--- a/tools/add-feature-template.sh
+++ b/tools/add-feature-template.sh
@@ -71,7 +71,7 @@ using System.Threading.Tasks;
 using AutoMapper;
 using $project_name.Data;
 using $project_name.Data.Models;
-using $project_name.Services.Models;
+using $project_name.Services.Models.$feature_name;
 
 namespace $project_name.Services
 {
@@ -136,7 +136,8 @@ EOF
 # {{{ --------------------------->
 # Create Service Models
 
-subdir="$dir/Models"
+subdir="$dir/Models/$feature_name"
+mkdir -p $subdir
 
 models=("" "Create" "Edit")
 for model in "${models[@]}"
@@ -144,7 +145,7 @@ do
 cat > $subdir/$model${feature_name}ServiceModel.cs<< EOF
 using System;
 
-namespace $project_name.Services.Models {
+namespace $project_name.Services.Models.$feature_name {
 	public class $model${feature_name}ServiceModel {$(
 if [ ! -z $model ]; then
 echo -e "\n\t\tpublic Guid Id { get; set; }"
@@ -171,7 +172,7 @@ mappings=("Create${feature_name}ServiceModel, $feature_name" "$feature_name, ${f
 cat > $subdir/${feature_name}Mappings.cs<< EOF
 using AutoMapper;
 using $project_name.Data.Models;
-using $project_name.Services.Models;
+using $project_name.Services.Models.$feature_name;
 
 namespace $project_name.Services.Configurations
 {
@@ -239,7 +240,6 @@ done
 
 # }}} ---------------------------<
 
-
 # {{{ --------------------------->
 # Update View Imports
 
@@ -338,7 +338,7 @@ using System;
 using System.Threading.Tasks;
 using AutoMapper;
 using $project_name.Services;
-using $project_name.Services.Models;
+using $project_name.Services.Models.$feature_name;
 using $project_name.Web.Models.$feature_name;
 using Microsoft.AspNetCore.Mvc;
 
@@ -441,7 +441,7 @@ subdir="${dir}/Configurations"
 mappings=("${feature_name}ServiceModel, ${feature_name}ViewModel" "Create${feature_name}ViewModel, Create${feature_name}ServiceModel" "${feature_name}ServiceModel, Edit${feature_name}ViewModel" "Edit${feature_name}ViewModel, Edit${feature_name}ServiceModel")
 cat > $subdir/${feature_name}Mappings.cs<< EOF
 using AutoMapper;
-using $project_name.Services.Models;
+using $project_name.Services.Models.$feature_name;
 using $project_name.Web.Models.$feature_name;
 
 namespace $project_name.Web.Configurations