Tech & Lang read models return ids

7 files changed, 20 insertions, 18 deletions

diff --git a/src/DevHive.Services/Interfaces/ITechnologyService.cs b/src/DevHive.Services/Interfaces/ITechnologyService.cs
index 4f75dbe..8f9510c 100644
--- a/src/DevHive.Services/Interfaces/ITechnologyService.cs
+++ b/src/DevHive.Services/Interfaces/ITechnologyService.cs
@@ -9,7 +9,7 @@ namespace DevHive.Services.Interfaces
 	{
 		Task<Guid> CreateTechnology(CreateTechnologyServiceModel technologyServiceModel);
 
-		Task<CreateTechnologyServiceModel> GetTechnologyById(Guid id);
+		Task<ReadTechnologyServiceModel> GetTechnologyById(Guid id);
 		HashSet<ReadTechnologyServiceModel> GetTechnologies();
 
 		Task<bool> UpdateTechnology(UpdateTechnologyServiceModel updateTechnologyServiceModel);
diff --git a/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs b/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs
index 653444e..651dc6d 100644
--- a/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs
+++ b/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs
@@ -1,7 +1,11 @@
+using System;
+
 namespace DevHive.Services.Models.Language
 {
 	public class ReadLanguageServiceModel
 	{
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Technology/ReadTechnologyServiceModel.cs b/src/DevHive.Services/Models/Technology/ReadTechnologyServiceModel.cs
index cbfdc7d..99f4750 100644
--- a/src/DevHive.Services/Models/Technology/ReadTechnologyServiceModel.cs
+++ b/src/DevHive.Services/Models/Technology/ReadTechnologyServiceModel.cs
@@ -1,7 +1,11 @@
+using System;
+
 namespace DevHive.Services.Models.Technology
 {
 	public class ReadTechnologyServiceModel
 	{
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Services/TechnologyService.cs b/src/DevHive.Services/Services/TechnologyService.cs
index 3e7678e..6dd6286 100644
--- a/src/DevHive.Services/Services/TechnologyService.cs
+++ b/src/DevHive.Services/Services/TechnologyService.cs
@@ -40,14 +40,14 @@ namespace DevHive.Services.Services
 		#endregion
 
 		#region Read
-		public async Task<CreateTechnologyServiceModel> GetTechnologyById(Guid id)
+		public async Task<ReadTechnologyServiceModel> GetTechnologyById(Guid id)
 		{
 			Technology technology = await this._technologyRepository.GetByIdAsync(id);
 
 			if (technology == null)
 				throw new ArgumentException("The technology does not exist");
 
-			return this._technologyMapper.Map<CreateTechnologyServiceModel>(technology);
+			return this._technologyMapper.Map<ReadTechnologyServiceModel>(technology);
 		}
 
 		public HashSet<ReadTechnologyServiceModel> GetTechnologies()
diff --git a/src/DevHive.Web/Controllers/TechnologyController.cs b/src/DevHive.Web/Controllers/TechnologyController.cs
index 8898ec9..e507899 100644
--- a/src/DevHive.Web/Controllers/TechnologyController.cs
+++ b/src/DevHive.Web/Controllers/TechnologyController.cs
@@ -40,10 +40,10 @@ namespace DevHive.Web.Controllers
 		[AllowAnonymous]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			CreateTechnologyServiceModel createTechnologyServiceModel = await this._technologyService.GetTechnologyById(id);
-			CreateTechnologyWebModel createTechnologyWebModel = this._technologyMapper.Map<CreateTechnologyWebModel>(createTechnologyServiceModel);
+			ReadTechnologyServiceModel readTechnologyServiceModel = await this._technologyService.GetTechnologyById(id);
+			ReadTechnologyWebModel readTechnologyWebModel = this._technologyMapper.Map<ReadTechnologyWebModel>(readTechnologyServiceModel);
 
-			return new OkObjectResult(createTechnologyWebModel);
+			return new OkObjectResult(readTechnologyWebModel);
 		}
 
 		[HttpGet]
diff --git a/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs b/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs
index ab4a089..3d9d5b6 100644
--- a/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs
+++ b/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs
@@ -1,14 +1,11 @@
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
+using System;
 
 namespace DevHive.Web.Models.Language
 {
 	public class ReadLanguageWebModel
 	{
-		[NotNull]
-		[Required]
-		[MinLength(3)]
-		[MaxLength(50)]
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs b/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs
index edaaaef..94542d7 100644
--- a/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs
+++ b/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs
@@ -1,14 +1,11 @@
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
+using System;
 
 namespace DevHive.Web.Models.Technology
 {
 	public class ReadTechnologyWebModel
 	{
-		[NotNull]
-		[Required]
-		[MinLength(3)]
-		[MaxLength(50)]
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }