From 3edb4619a64e26883b752427b179d04ec30adef7 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Tue, 11 May 2021 11:56:44 +0300
Subject: Made service models structure resemble that of the web models (models
 for each "feature" are in their own folder)

---
 ExamTemplate/Services/Configurations/UserMappings.cs       |  2 +-
 ExamTemplate/Services/Models/EditUserServiceModel.cs       |  9 ---------
 ExamTemplate/Services/Models/LoginUserServiceModel.cs      |  8 --------
 ExamTemplate/Services/Models/RegisterUserServiceModel.cs   | 10 ----------
 ExamTemplate/Services/Models/User/EditUserServiceModel.cs  |  9 +++++++++
 ExamTemplate/Services/Models/User/LoginUserServiceModel.cs |  8 ++++++++
 .../Services/Models/User/RegisterUserServiceModel.cs       | 10 ++++++++++
 ExamTemplate/Services/Models/User/UserServiceModel.cs      |  9 +++++++++
 ExamTemplate/Services/Models/UserServiceModel.cs           |  9 ---------
 ExamTemplate/Services/UserService.cs                       |  2 +-
 ExamTemplate/Web/Configurations/UserMappings.cs            |  2 +-
 ExamTemplate/Web/Controllers/AccountController.cs          |  2 +-
 tools/add-feature-template.sh                              | 14 +++++++-------
 13 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 ExamTemplate/Services/Models/EditUserServiceModel.cs
 delete mode 100644 ExamTemplate/Services/Models/LoginUserServiceModel.cs
 delete mode 100644 ExamTemplate/Services/Models/RegisterUserServiceModel.cs
 create mode 100644 ExamTemplate/Services/Models/User/EditUserServiceModel.cs
 create mode 100644 ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
 create mode 100644 ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
 create mode 100644 ExamTemplate/Services/Models/User/UserServiceModel.cs
 delete mode 100644 ExamTemplate/Services/Models/UserServiceModel.cs

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/EditUserServiceModel.cs
deleted file mode 100644
index 80e5501..0000000
--- a/ExamTemplate/Services/Models/EditUserServiceModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ExamTemplate.Services.Models
-{
-	public class EditUserServiceModel
-	{
-		public string FirstName { get; set; }
-		public string LastName { get; set; }
-		public string Username { get; set; }
-	}
-}
diff --git a/ExamTemplate/Services/Models/LoginUserServiceModel.cs b/ExamTemplate/Services/Models/LoginUserServiceModel.cs
deleted file mode 100644
index 1d8a2f8..0000000
--- a/ExamTemplate/Services/Models/LoginUserServiceModel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace ExamTemplate.Services.Models
-{
-	public class LoginUserServiceModel
-	{
-		public string Username { get; set; }
-		public string Password { get; set; }
-	}
-}
diff --git a/ExamTemplate/Services/Models/RegisterUserServiceModel.cs b/ExamTemplate/Services/Models/RegisterUserServiceModel.cs
deleted file mode 100644
index 7a274ae..0000000
--- a/ExamTemplate/Services/Models/RegisterUserServiceModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ExamTemplate.Services.Models
-{
-	public class RegisterUserServiceModel
-	{
-		public string FirstName { get; set; }
-		public string LastName { get; set; }
-		public string Username { get; set; }
-		public string Password { get; set; }
-	}
-}
diff --git a/ExamTemplate/Services/Models/User/EditUserServiceModel.cs b/ExamTemplate/Services/Models/User/EditUserServiceModel.cs
new file mode 100644
index 0000000..c8b9971
--- /dev/null
+++ b/ExamTemplate/Services/Models/User/EditUserServiceModel.cs
@@ -0,0 +1,9 @@
+namespace ExamTemplate.Services.Models.User
+{
+	public class EditUserServiceModel
+	{
+		public string FirstName { get; set; }
+		public string LastName { get; set; }
+		public string Username { get; set; }
+	}
+}
diff --git a/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs b/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
new file mode 100644
index 0000000..20aaaeb
--- /dev/null
+++ b/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
@@ -0,0 +1,8 @@
+namespace ExamTemplate.Services.Models.User
+{
+	public class LoginUserServiceModel
+	{
+		public string Username { get; set; }
+		public string Password { get; set; }
+	}
+}
diff --git a/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs b/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
new file mode 100644
index 0000000..b08d5ba
--- /dev/null
+++ b/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
@@ -0,0 +1,10 @@
+namespace ExamTemplate.Services.Models.User
+{
+	public class RegisterUserServiceModel
+	{
+		public string FirstName { get; set; }
+		public string LastName { get; set; }
+		public string Username { get; set; }
+		public string Password { get; set; }
+	}
+}
diff --git a/ExamTemplate/Services/Models/User/UserServiceModel.cs b/ExamTemplate/Services/Models/User/UserServiceModel.cs
new file mode 100644
index 0000000..0e8b939
--- /dev/null
+++ b/ExamTemplate/Services/Models/User/UserServiceModel.cs
@@ -0,0 +1,9 @@
+namespace ExamTemplate.Services.Models.User
+{
+	public class UserServiceModel
+	{
+		public string FirstName { get; set; }
+		public string LastName { get; set; }
+		public string Username { get; set; }
+	}
+}
diff --git a/ExamTemplate/Services/Models/UserServiceModel.cs b/ExamTemplate/Services/Models/UserServiceModel.cs
deleted file mode 100644
index 8dcea69..0000000
--- a/ExamTemplate/Services/Models/UserServiceModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ExamTemplate.Services.Models
-{
-	public class UserServiceModel
-	{
-		public string FirstName { get; set; }
-		public string LastName { get; set; }
-		public string Username { get; set; }
-	}
-}
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
-- 
cgit v1.2.3