Moved the Guid Id to it's own base models

4 files changed, 50 insertions, 9 deletions

diff --git a/ExamTemplate/Data/Models/BaseModel.cs b/ExamTemplate/Data/Models/BaseModel.cs
new file mode 100644
index 0000000..6a9bec8
--- /dev/null
+++ b/ExamTemplate/Data/Models/BaseModel.cs
@@ -0,0 +1,13 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace ExamTemplate.Data.Models
+{
+    public abstract class BaseModel
+	{
+		[Key]
+		[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+		public Guid Id { get; set; }
+	}
+}
diff --git a/ExamTemplate/Services/Models/BaseServiceModel.cs b/ExamTemplate/Services/Models/BaseServiceModel.cs
new file mode 100644
index 0000000..8b09f40
--- /dev/null
+++ b/ExamTemplate/Services/Models/BaseServiceModel.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace ExamTemplate.Services.Models
+{
+    public abstract class BaseServiceModel
+	{
+		public Guid Id { get; set; }
+	}
+}
diff --git a/ExamTemplate/Web/Models/BaseWebModel.cs b/ExamTemplate/Web/Models/BaseWebModel.cs
new file mode 100644
index 0000000..3c8c1ed
--- /dev/null
+++ b/ExamTemplate/Web/Models/BaseWebModel.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace ExamTemplate.Web.Models
+{
+    public abstract class BaseWebModel
+	{
+		public Guid Id { get; set; }
+	}
+}
diff --git a/tools/add-feature-template.sh b/tools/add-feature-template.sh
index bf9d8ac..edce00d 100755
--- a/tools/add-feature-template.sh
+++ b/tools/add-feature-template.sh
@@ -26,9 +26,8 @@ using System;
 
 namespace $project_name.Data.Models
 {
-	public class $feature_name
+	public class $feature_name : BaseModel
 	{
-		public Guid Id { get; set; }
 $(
 for feature in "${features[@]}"; do
 echo -e "\t\tpublic $feature { get; set; }"
@@ -145,17 +144,20 @@ models=("View" "" "Edit")
 for model in "${models[@]}"
 do
 cat > $subdir/$model${feature_name}ServiceModel.cs<< EOF
-using System;
+using System;$(
+if [ ! -z $model ]; then
+echo -e "\nusing $project_name.Services.Models;"
+fi
+)
 
 namespace $project_name.Services.Models.$feature_name
 {
-	public class $model${feature_name}ServiceModel
-	{$(
+	public class $model${feature_name}ServiceModel$(
 if [ ! -z $model ]; then
-echo -e "\n\t\tpublic Guid Id { get; set; }"
+echo -e ' : BaseServiceModel'
 fi
 )
-$(
+	{$(
 for feature in "${features[@]}"; do
 echo -e "\t\tpublic $feature { get; set; }"
 done
@@ -224,11 +226,19 @@ models=("View" "" "Edit")
 for model in "${models[@]}"
 do
 cat > $subdir/$model${feature_name}WebModel.cs<< EOF
-using System;
+using System;$(
+if [ ! -z $model ]; then
+echo -e "\nusing $project_name.Web.Models;"
+fi
+)
 
 namespace $project_name.Web.Models.$feature_name
 {
-	public class $model${feature_name}WebModel
+	public class $model${feature_name}WebModel$(
+if [ ! -z $model ]; then
+echo -e ' : BaseWebModel'
+fi
+)
 	{$(
 if [ ! -z $model ]; then
 echo -e "\n\t\tpublic Guid Id { get; set; }"