Merge branch 'refactor_user_updating' into dev

3 files changed, 318 insertions, 81 deletions

diff --git a/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj
index c96dfb8..ce5cb62 100644
--- a/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj
+++ b/src/DevHive.Tests/DevHive.Services.Tests/DevHive.Services.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1" />
-    <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.Services.Tests/LanguageService.Tests.cs b/src/DevHive.Tests/DevHive.Services.Tests/LanguageService.Tests.cs
new file mode 100644
index 0000000..67f1284
--- /dev/null
+++ b/src/DevHive.Tests/DevHive.Services.Tests/LanguageService.Tests.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Threading.Tasks;
+using AutoMapper;
+using DevHive.Data.Interfaces.Repositories;
+using DevHive.Data.Models;
+using DevHive.Services.Models.Language;
+using DevHive.Services.Services;
+using Moq;
+using NUnit.Framework;
+
+namespace DevHive.Services.Tests
+{
+	[TestFixture]
+	public class LanguageServiceTests
+	{
+		private Mock<ILanguageRepository> LanguageRepositoryMock { get; set; }
+		private Mock<IMapper> MapperMock { get; set; }
+		private LanguageService LanguageService { get; set; }
+
+		[SetUp]
+		public void SetUp()
+		{
+			this.LanguageRepositoryMock = new Mock<ILanguageRepository>();
+			this.MapperMock = new Mock<IMapper>();
+			this.LanguageService = new LanguageService(this.LanguageRepositoryMock.Object, this.MapperMock.Object);
+		}
+
+		#region Create
+		[Test]
+		public async Task CreateLanguage_ReturnsNonEmptyGuid_WhenEntityIsAddedSuccessfully()
+		{
+			string technologyName = "Gosho Trapov";
+			Guid id = Guid.NewGuid();
+			CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel
+			{
+				Name = technologyName
+			};
+			Language language = new Language
+			{
+				Name = technologyName,
+				Id = id
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.LanguageRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Language>())).Returns(Task.FromResult(true));
+			this.LanguageRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny<string>())).Returns(Task.FromResult(language));
+			this.MapperMock.Setup(p => p.Map<Language>(It.IsAny<CreateLanguageServiceModel>())).Returns(language);
+
+			Guid result = await this.LanguageService.CreateLanguage(createLanguageServiceModel);
+
+			Assert.AreEqual(id, result);
+		}
+
+		[Test]
+		public async Task CreateLanguage_ReturnsEmptyGuid_WhenEntityIsNotAddedSuccessfully()
+		{
+			string languageName = "Gosho Trapov";
+
+			CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel
+			{
+				Name = languageName
+			};
+			Language language = new Language
+			{
+				Name = languageName
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.LanguageRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Language>())).Returns(Task.FromResult(false));
+			this.MapperMock.Setup(p => p.Map<Language>(It.IsAny<CreateLanguageServiceModel>())).Returns(language);
+
+			Guid result = await this.LanguageService.CreateLanguage(createLanguageServiceModel);
+
+			Assert.IsTrue(result == Guid.Empty);
+
+		}
+
+		[Test]
+		public void CreateLanguage_ThrowsArgumentException_WhenEntityAlreadyExists()
+		{
+			string exceptionMessage = "Language already exists!";
+			string languageName = "Gosho Trapov";
+
+			CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel
+			{
+				Name = languageName
+			};
+			Language language = new Language
+			{
+				Name = languageName
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(true));
+
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.LanguageService.CreateLanguage(createLanguageServiceModel));
+
+			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
+		}
+		#endregion
+
+		#region Read
+		[Test]
+		public async Task GetLanguageById_ReturnsTheLanguage_WhenItExists()
+		{
+			Guid id = new Guid();
+			string name = "Gosho Trapov";
+			Language language = new Language()
+			{
+				Name = name
+			};
+			ReadLanguageServiceModel readLanguageServiceModel = new ReadLanguageServiceModel
+			{
+				Name = name
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(language));
+			this.MapperMock.Setup(p => p.Map<ReadLanguageServiceModel>(It.IsAny<Language>())).Returns(readLanguageServiceModel);
+
+			ReadLanguageServiceModel result = await this.LanguageService.GetLanguageById(id);
+
+			Assert.AreEqual(name, result.Name);
+		}
+
+		[Test]
+		public void GetLanguageById_ThrowsException_WhenLanguageDoesNotExist()
+		{
+			string exceptionMessage = "The language does not exist";
+			Guid id = new Guid();
+			this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult<Language>(null));
+
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.LanguageService.GetLanguageById(id));
+
+			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
+		}
+		#endregion
+
+		#region Update
+		[Test]
+		[TestCase(true)]
+		[TestCase(false)]
+		public async Task UpdateLanguage_ReturnsIfUpdateIsSuccessfull_WhenLanguageExistsy(bool shouldPass)
+		{
+			string name = "Gosho Trapov";
+			Language language = new Language
+			{
+				Name = name
+			};
+			UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel
+			{
+				Name = name,
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.LanguageRepositoryMock.Setup(p => p.EditAsync(It.IsAny<Language>())).Returns(Task.FromResult(shouldPass));
+			this.MapperMock.Setup(p => p.Map<Language>(It.IsAny<UpdateLanguageServiceModel>())).Returns(language);
+
+			bool result = await this.LanguageService.UpdateLanguage(updateLanguageServiceModel);
+
+			Assert.AreEqual(shouldPass, result);
+		}
+
+		[Test]
+		public void UpdateLanguage_ReturnsIfUpdateIsSuccessfull_WhenLanguageExistsy()
+		{
+			string exceptionMessage = "Language does not exist!";
+			UpdateLanguageServiceModel updateTechnologyServiceModel = new UpdateLanguageServiceModel
+			{
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.LanguageService.UpdateLanguage(updateTechnologyServiceModel));
+
+			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
+		}
+
+		[Test]
+		public void UpdateLanguage_ThrowsException_WhenLanguageNameAlreadyExists()
+		{
+			string exceptionMessage = "Language name already exists in our data base!";
+			UpdateLanguageServiceModel updateTechnologyServiceModel = new UpdateLanguageServiceModel
+			{
+			};
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(true));
+
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.LanguageService.UpdateLanguage(updateTechnologyServiceModel));
+
+			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
+		}
+		#endregion
+
+		#region Delete
+		[Test]
+		[TestCase(true)]
+		[TestCase(false)]
+		public async Task DeleteLanguage_ShouldReturnIfDeletionIsSuccessfull_WhenLanguageExists(bool shouldPass)
+		{
+			Guid id = new Guid();
+			Language language = new Language();
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(language));
+			this.LanguageRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny<Language>())).Returns(Task.FromResult(shouldPass));
+
+			bool result = await this.LanguageService.DeleteLanguage(id);
+
+			Assert.AreEqual(shouldPass, result);
+		}
+
+		[Test]
+		public void DeleteLanguage_ThrowsException_WhenLanguageDoesNotExist()
+		{
+			string exceptionMessage = "Language does not exist!";
+			Guid id = new Guid();
+
+			this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.LanguageService.DeleteLanguage(id));
+
+			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
+		}
+		#endregion
+		//Task.Run(async () =>
+		//{
+
+		//}).GetAwaiter().GetResult();
+	}
+}
diff --git a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
index d028957..abd43ed 100644
--- a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
@@ -26,33 +26,52 @@ namespace DevHive.Services.Tests
 		}
 
 		#region Create
-
 		[Test]
-		[TestCase(true)]
-		[TestCase(false)]
-		public void Create_ReturnsTrue_WhenEntityIsAddedSuccessfully(bool shouldFail)
+		public async Task Create_ReturnsNonEmptyGuid_WhenEntityIsAddedSuccessfully()
 		{
-			Task.Run(async () =>
+			string technologyName = "Gosho Trapov";
+			Guid id = Guid.NewGuid();
+			CreateTechnologyServiceModel createTechnologyServiceModel = new()
 			{
-				string technologyName = "Gosho Trapov";
+				Name = technologyName
+			};
+			Technology technology = new()
+			{
+				Name = technologyName,
+				Id = id
+			};
+
+			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(true));
+			this.TechnologyRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny<string>())).Returns(Task.FromResult(technology));
+			this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<CreateTechnologyServiceModel>())).Returns(technology);
+
+			Guid result = await this.TechnologyService.Create(createTechnologyServiceModel);
+
+			Assert.AreEqual(id, result);
+		}
 
-				CreateTechnologyServiceModel createTechnologyServiceModel = new()
-				{
-					Name = technologyName
-				};
-				Technology technology = new()
-				{
-					Name = technologyName
-				};
+		[Test]
+		public async Task Create_ReturnsEmptyGuid_WhenEntityIsNotAddedSuccessfully()
+		{
+			string technologyName = "Gosho Trapov";
+
+			CreateTechnologyServiceModel createTechnologyServiceModel = new()
+			{
+				Name = technologyName
+			};
+			Technology technology = new()
+			{
+				Name = technologyName
+			};
 
-				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
-				this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldFail));
-				this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<CreateTechnologyServiceModel>())).Returns(technology);
+			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(false));
+			this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<CreateTechnologyServiceModel>())).Returns(technology);
 
-				bool result = await this.TechnologyService.Create(createTechnologyServiceModel);
+			Guid result = await this.TechnologyService.Create(createTechnologyServiceModel);
 
-				Assert.AreEqual(shouldFail, result);
-			}).GetAwaiter().GetResult();
+			Assert.IsTrue(result == Guid.Empty);
 		}
 
 		[Test]
@@ -79,30 +98,26 @@ namespace DevHive.Services.Tests
 		#endregion
 
 		#region Read
-
 		[Test]
-		public void GetTechnologyById_ReturnsTheTechnology_WhenItExists()
+		public async Task GetTechnologyById_ReturnsTheTechnology_WhenItExists()
 		{
-			Task.Run(async () =>
+			Guid id = new Guid();
+			string name = "Gosho Trapov";
+			Technology technology = new()
 			{
-				Guid id = new Guid();
-				string name = "Gosho Trapov";
-				Technology technology = new()
-				{
-					Name = name
-				};
-				CreateTechnologyServiceModel createTechnologyServiceModel = new()
-				{
-					Name = name
-				};
-
-				this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(technology));
-				this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<Technology>())).Returns(createTechnologyServiceModel);
-
-				CreateTechnologyServiceModel result = await this.TechnologyService.GetTechnologyById(id);
-
-				Assert.AreEqual(name, result.Name);
-			}).GetAwaiter().GetResult();
+				Name = name
+			};
+			CreateTechnologyServiceModel createTechnologyServiceModel = new()
+			{
+				Name = name
+			};
+
+			this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(technology));
+			this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<Technology>())).Returns(createTechnologyServiceModel);
+
+			CreateTechnologyServiceModel result = await this.TechnologyService.GetTechnologyById(id);
+
+			Assert.AreEqual(name, result.Name);
 		}
 
 		[Test]
@@ -119,48 +134,42 @@ namespace DevHive.Services.Tests
 		#endregion
 
 		#region Update
-
 		[Test]
 		[TestCase(true)]
 		[TestCase(false)]
-		public void UpdateTechnology_ReturnsIfUpdateIsSuccessfull_WhenTechnologyExistsy(bool shouldPass)
+		public async Task UpdateTechnology_ReturnsIfUpdateIsSuccessfull_WhenTechnologyExistsy(bool shouldPass)
 		{
-			Task.Run(async () =>
+			string name = "Gosho Trapov";
+			Technology technology = new Technology
+			{
+				Name = name
+			};
+			UpdateTechnologyServiceModel updatetechnologyServiceModel = new UpdateTechnologyServiceModel
 			{
-				Guid id = new Guid();
-				string name = "Gosho Trapov";
-				Technology technology = new Technology
-				{
-					Name = name
-				};
-				UpdateTechnologyServiceModel updatetechnologyServiceModel = new UpdateTechnologyServiceModel
-				{
-					Name = name,
-				};
-
-				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
-				this.TechnologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldPass));
-				this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<UpdateTechnologyServiceModel>())).Returns(technology);
-
-				bool result = await this.TechnologyService.UpdateTechnology(id, updatetechnologyServiceModel);
-
-				Assert.AreEqual(shouldPass, result);
-			}).GetAwaiter().GetResult();
+				Name = name,
+			};
+
+			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+			this.TechnologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldPass));
+			this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<UpdateTechnologyServiceModel>())).Returns(technology);
+
+			bool result = await this.TechnologyService.UpdateTechnology(updatetechnologyServiceModel);
+
+			Assert.AreEqual(shouldPass, result);
 		}
 
 		[Test]
 		public void UpdateTechnology_ThrowsException_WhenTechnologyDoesNotExist()
 		{
 			string exceptionMessage = "Technology does not exist!";
-			Guid id = new Guid();
 			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
 			{
 			};
 
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(false));
 
-			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel));
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel));
 
 			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
 		}
@@ -169,7 +178,6 @@ namespace DevHive.Services.Tests
 		public void UpdateTechnology_ThrowsException_WhenTechnologyNameAlreadyExists()
 		{
 			string exceptionMessage = "Technology name already exists!";
-			Guid id = new Guid();
 			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
 			{
 			};
@@ -177,7 +185,7 @@ namespace DevHive.Services.Tests
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(true));
 
-			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel));
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel));
 
 			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
 		}
@@ -188,21 +196,18 @@ namespace DevHive.Services.Tests
 		[Test]
 		[TestCase(true)]
 		[TestCase(false)]
-		public void DeleteTechnology_ShouldReturnIfDeletionIsSuccessfull_WhenTechnologyExists(bool shouldPass)
+		public async Task DeleteTechnology_ShouldReturnIfDeletionIsSuccessfull_WhenTechnologyExists(bool shouldPass)
 		{
-			Task.Run(async () =>
-			{
-				Guid id = new Guid();
-				Technology technology = new Technology();
+			Guid id = new Guid();
+			Technology technology = new Technology();
 
-				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-				this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(technology));
-				this.TechnologyRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldPass));
+			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(technology));
+			this.TechnologyRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldPass));
 
-				bool result = await this.TechnologyService.DeleteTechnology(id);
+			bool result = await this.TechnologyService.DeleteTechnology(id);
 
-				Assert.AreEqual(shouldPass, result);
-			}).GetAwaiter().GetResult();
+			Assert.AreEqual(shouldPass, result);
 		}
 
 		[Test]
@@ -218,9 +223,10 @@ namespace DevHive.Services.Tests
 			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
 		}
 		#endregion
+
 		//Task.Run(async () =>
 		//{
-		//
+
 		//}).GetAwaiter().GetResult();
 	}
 }