Merge branch 'refactor_user_updating' into dev

4 files changed, 246 insertions, 13 deletions

diff --git a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj
index 47f40ee..a171e0b 100644
--- a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj
+++ b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.15.2" />
+    <PackageReference Include="Moq" Version="4.16.0" />
     <PackageReference Include="NUnit" Version="3.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs
new file mode 100644
index 0000000..913d9df
--- /dev/null
+++ b/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoMapper;
+using DevHive.Services.Interfaces;
+using DevHive.Services.Models.Language;
+using DevHive.Web.Controllers;
+using DevHive.Web.Models.Language;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+
+namespace DevHive.Web.Tests
+{
+	[TestFixture]
+	public class LanguageControllerTests
+	{
+		const string NAME = "Gosho Trapov";
+		private Mock<ILanguageService> LanguageServiceMock { get; set; }
+		private Mock<IMapper> MapperMock { get; set; }
+		private LanguageController LanguageController { get; set; }
+
+		[SetUp]
+		public void SetUp()
+		{
+			this.LanguageServiceMock = new Mock<ILanguageService>();
+			this.MapperMock = new Mock<IMapper>();
+			this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object);
+		}
+
+		#region Create
+		[Test]
+		public void CreateLanguage_ReturnsOkObjectResult_WhenLanguageIsSuccessfullyCreated()
+		{
+			CreateLanguageWebModel createLanguageWebModel = new CreateLanguageWebModel
+			{
+				Name = NAME
+			};
+			CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel
+			{
+				Name = NAME
+			};
+			Guid id = Guid.NewGuid();
+
+			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createLanguageServiceModel);
+			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+
+			IActionResult result = this.LanguageController.Create(createLanguageWebModel).Result;
+
+			Assert.IsInstanceOf<OkObjectResult>(result);
+
+			var splitted = (result as OkObjectResult).Value
+				.ToString()
+				.Split('{', '}', '=', ' ')
+				.Where(x => !string.IsNullOrEmpty(x))
+				.ToArray();
+
+			Guid resultId = Guid.Parse(splitted[1]);
+
+			Assert.AreEqual(id, resultId);
+		}
+
+		[Test]
+		public void CreateLanguage_ReturnsBadRequestObjectResult_WhenLanguageIsNotCreatedSuccessfully()
+		{
+			CreateLanguageWebModel createTechnologyWebModel = new CreateLanguageWebModel
+			{
+				Name = NAME
+			};
+			CreateLanguageServiceModel createTechnologyServiceModel = new CreateLanguageServiceModel
+			{
+				Name = NAME
+			};
+			Guid id = Guid.Empty;
+			string errorMessage = $"Could not create language {NAME}";
+
+			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createTechnologyServiceModel);
+			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+
+			IActionResult result = this.LanguageController.Create(createTechnologyWebModel).Result;
+
+			Assert.IsInstanceOf<BadRequestObjectResult>(result);
+
+			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
+			string resultMessage = badRequsetObjectResult.Value.ToString();
+
+			Assert.AreEqual(errorMessage, resultMessage);
+		}
+		#endregion
+
+		#region Read
+		[Test]
+		public void GetById_ReturnsTheLanguage_WhenItExists()
+		{
+			Guid id = Guid.NewGuid();
+
+			ReadLanguageServiceModel readLanguageServiceModel = new ReadLanguageServiceModel
+			{
+				Name = NAME
+			};
+			ReadLanguageWebModel readLanguageWebModel = new ReadLanguageWebModel
+			{
+				Name = NAME
+			};
+
+			this.LanguageServiceMock.Setup(p => p.GetLanguageById(It.IsAny<Guid>())).Returns(Task.FromResult(readLanguageServiceModel));
+			this.MapperMock.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>())).Returns(readLanguageWebModel);
+
+			IActionResult result = this.LanguageController.GetById(id).Result;
+
+			Assert.IsInstanceOf<OkObjectResult>(result);
+
+			OkObjectResult okObjectResult = result as OkObjectResult;
+			ReadLanguageWebModel resultModel = okObjectResult.Value as Models.Language.ReadLanguageWebModel;
+
+			Assert.AreEqual(NAME, resultModel.Name);
+		}
+		#endregion
+
+		#region Update
+		[Test]
+		public void Update_ShouldReturnOkResult_WhenLanguageIsUpdatedSuccessfully()
+		{
+			Guid id = Guid.NewGuid();
+			UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel
+			{
+				Name = NAME
+			};
+			UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel
+			{
+				Name = NAME
+			};
+
+			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(true));
+			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+
+			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
+
+			Assert.IsInstanceOf<OkResult>(result);
+		}
+
+		[Test]
+		public void Update_ShouldReturnOkResult_WhenLanguageIsNotUpdatedSuccessfully()
+		{
+			Guid id = Guid.NewGuid();
+			string message = "Could not update Language";
+			UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel
+			{
+				Name = NAME
+			};
+			UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel
+			{
+				Name = NAME
+			};
+
+			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(false));
+			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+
+			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
+			Assert.IsInstanceOf<BadRequestObjectResult>(result);
+
+			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
+			string resultModel = badRequestObjectResult.Value.ToString();
+
+			Assert.AreEqual(message, resultModel);
+		}
+		#endregion
+
+		#region Delete
+		[Test]
+		public void Delete_ReturnsOkResult_When_LanguageIsDeletedSuccessfully()
+		{
+			Guid id = Guid.NewGuid();
+
+			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+
+			IActionResult result = this.LanguageController.Delete(id).Result;
+
+			Assert.IsInstanceOf<OkResult>(result);
+		}
+
+		[Test]
+		public void Delet_ReturnsBadRequestObjectResult_WhenLanguageIsNotDeletedSuccessfully()
+		{
+			string message = "Could not delete Language";
+			Guid id = Guid.NewGuid();
+
+			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+
+			IActionResult result = this.LanguageController.Delete(id).Result;
+
+			Assert.IsInstanceOf<BadRequestObjectResult>(result);
+
+			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
+			string resultModel = badRequestObjectResult.Value.ToString();
+
+			Assert.AreEqual(message, resultModel);
+		}
+		#endregion
+	}
+}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs
new file mode 100644
index 0000000..18ed1b9
--- /dev/null
+++ b/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DevHive.Web.Tests
+{
+	class PostController
+	{
+	}
+}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
index 2709c9a..40434d6 100644
--- a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using DevHive.Common.Models.Misc;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Technology;
 using DevHive.Web.Controllers;
@@ -7,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 using Moq;
 using NUnit.Framework;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace DevHive.Web.Tests
@@ -30,7 +32,7 @@ namespace DevHive.Web.Tests
 		#region Create
 		[Test]
 		public void Create_ReturnsOkObjectResult_WhenTechnologyIsSuccessfullyCreated()
-		{			
+		{
 			CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel
 			{
 				Name = NAME
@@ -39,13 +41,24 @@ namespace DevHive.Web.Tests
 			{
 				Name = NAME
 			};
+			Guid id = Guid.NewGuid();
 
 			this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this.TechnologyServiceMock.Setup(p => p.Create(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(true));
+			this.TechnologyServiceMock.Setup(p => p.Create(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
 
 			IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result;
 
-			Assert.IsInstanceOf<OkResult>(result);
+			Assert.IsInstanceOf<OkObjectResult>(result);
+
+			var splitted = (result as OkObjectResult).Value
+				.ToString()
+				.Split('{', '}', '=', ' ')
+				.Where(x => !string.IsNullOrEmpty(x))
+				.ToArray();
+
+			Guid resultId = Guid.Parse(splitted[1]);
+
+			Assert.AreEqual(id, resultId);
 		}
 
 		[Test]
@@ -59,13 +72,20 @@ namespace DevHive.Web.Tests
 			{
 				Name = NAME
 			};
+			Guid id = Guid.Empty;
+			string errorMessage = $"Could not create technology {NAME}";
 
 			this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this.TechnologyServiceMock.Setup(p => p.Create(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(false));
+			this.TechnologyServiceMock.Setup(p => p.Create(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
 
 			IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result;
 
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
+
+			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
+			string resultMessage = badRequsetObjectResult.Value.ToString();
+
+			Assert.AreEqual(errorMessage, resultMessage);
 		}
 		#endregion
 
@@ -73,7 +93,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void GetById_ReturnsTheThecnology_WhenItExists()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel
 			{
@@ -102,7 +122,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void Update_ShouldReturnOkResult_WhenTechnologyIsUpdatedSuccessfully()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
 			{
 				Name = NAME
@@ -112,7 +132,7 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<Guid>(), It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(true));
+			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(true));
 			this.MapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
 
 			IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result;
@@ -121,9 +141,9 @@ namespace DevHive.Web.Tests
 		}
 
 		[Test]
-		public void Update_ShouldReturnOkResult_WhenTechnologyIsNotUpdatedSuccessfully ()
+		public void Update_ShouldReturnOkResult_WhenTechnologyIsNotUpdatedSuccessfully()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 			string message = "Could not update Technology";
 			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
 			{
@@ -134,7 +154,7 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<Guid>(), It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(false));
+			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(false));
 			this.MapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
 
 			IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result;
@@ -151,7 +171,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void Delete_ReturnsOkResult_When_TechnologyIsDeletedSuccessfully()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(true));
 
@@ -164,7 +184,7 @@ namespace DevHive.Web.Tests
 		public void Delet_ReturnsBadRequestObjectResult_WhenTechnologyIsNotDeletedSuccessfully()
 		{
 			string message = "Could not delete Technology";
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(false));