aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortranstrike <transtrike@gmail.com>2021-01-17 16:27:30 +0200
committertranstrike <transtrike@gmail.com>2021-01-17 16:27:30 +0200
commita47ea20ab91017da53437f750ed8e0f939f5cdba (patch)
treef901d9cbcb0a8e049b36814e19bf23684eaae281
parente037d611c7ba00d0126a8f954cdc56d7bfeb979e (diff)
downloadDevHive-a47ea20ab91017da53437f750ed8e0f939f5cdba.tar
DevHive-a47ea20ab91017da53437f750ed8e0f939f5cdba.tar.gz
DevHive-a47ea20ab91017da53437f750ed8e0f939f5cdba.zip
Fixed lang naming problem
-rw-r--r--src/DevHive.Data/Interfaces/Models/IUser.cs2
-rw-r--r--src/DevHive.Data/Migrations/20210112111416_User_Implements_Languages.Designer.cs4
-rw-r--r--src/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs4
-rw-r--r--src/DevHive.Data/Models/User.cs2
-rw-r--r--src/DevHive.Data/Repositories/UserRepository.cs16
-rw-r--r--src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs8
6 files changed, 18 insertions, 18 deletions
diff --git a/src/DevHive.Data/Interfaces/Models/IUser.cs b/src/DevHive.Data/Interfaces/Models/IUser.cs
index 0a770f0..ef8c927 100644
--- a/src/DevHive.Data/Interfaces/Models/IUser.cs
+++ b/src/DevHive.Data/Interfaces/Models/IUser.cs
@@ -8,7 +8,7 @@ namespace DevHive.Data.Interfaces.Models
string FirstName { get; set; }
string LastName { get; set; }
string ProfilePictureUrl { get; set; }
- IList<Language> Langauges { get; set; }
+ IList<Language> Languages { get; set; }
IList<Technology> Technologies { get; set; }
IList<Role> Roles { get; set; }
IList<User> Friends { get; set; }
diff --git a/src/DevHive.Data/Migrations/20210112111416_User_Implements_Languages.Designer.cs b/src/DevHive.Data/Migrations/20210112111416_User_Implements_Languages.Designer.cs
index 0f1aa80..1605b5b 100644
--- a/src/DevHive.Data/Migrations/20210112111416_User_Implements_Languages.Designer.cs
+++ b/src/DevHive.Data/Migrations/20210112111416_User_Implements_Languages.Designer.cs
@@ -307,7 +307,7 @@ namespace DevHive.Data.Migrations
modelBuilder.Entity("DevHive.Data.Models.Language", b =>
{
b.HasOne("DevHive.Data.Models.User", null)
- .WithMany("Langauges")
+ .WithMany("Languages")
.HasForeignKey("UserId");
});
@@ -395,7 +395,7 @@ namespace DevHive.Data.Migrations
{
b.Navigation("Friends");
- b.Navigation("Langauges");
+ b.Navigation("Languages");
b.Navigation("Technologies");
});
diff --git a/src/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs b/src/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs
index cc6d24d..7197c81 100644
--- a/src/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs
+++ b/src/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs
@@ -305,7 +305,7 @@ namespace DevHive.Data.Migrations
modelBuilder.Entity("DevHive.Data.Models.Language", b =>
{
b.HasOne("DevHive.Data.Models.User", null)
- .WithMany("Langauges")
+ .WithMany("Languages")
.HasForeignKey("UserId");
});
@@ -393,7 +393,7 @@ namespace DevHive.Data.Migrations
{
b.Navigation("Friends");
- b.Navigation("Langauges");
+ b.Navigation("Languages");
b.Navigation("Technologies");
});
diff --git a/src/DevHive.Data/Models/User.cs b/src/DevHive.Data/Models/User.cs
index 944bf6a..64e138f 100644
--- a/src/DevHive.Data/Models/User.cs
+++ b/src/DevHive.Data/Models/User.cs
@@ -18,7 +18,7 @@ namespace DevHive.Data.Models
/// <summary>
/// Languages that the user uses or is familiar with
/// </summary>
- public IList<Language> Langauges { get; set; }
+ public IList<Language> Languages { get; set; }
/// <summary>
/// Technologies that the user uses or is familiar with
diff --git a/src/DevHive.Data/Repositories/UserRepository.cs b/src/DevHive.Data/Repositories/UserRepository.cs
index 17ca93b..6d4a0bf 100644
--- a/src/DevHive.Data/Repositories/UserRepository.cs
+++ b/src/DevHive.Data/Repositories/UserRepository.cs
@@ -40,7 +40,7 @@ namespace DevHive.Data.Repositories
{
this._context.Update(user);
- user.Langauges.Add(language);
+ user.Languages.Add(language);
return await RepositoryMethods.SaveChangesAsync(this._context);
}
@@ -70,7 +70,7 @@ namespace DevHive.Data.Repositories
return await this._context.Users
.Include(x => x.Friends)
.Include(x => x.Roles)
- .Include(x => x.Langauges)
+ .Include(x => x.Languages)
.Include(x => x.Technologies)
.FirstOrDefaultAsync(x => x.Id == id);
}
@@ -84,12 +84,12 @@ namespace DevHive.Data.Repositories
public IList<Language> GetUserLanguages(User user)
{
- return user.Langauges;
+ return user.Languages;
}
public Language GetUserLanguage(User user, Language language)
{
- return user.Langauges
+ return user.Languages
.FirstOrDefault(x => x.Id == language.Id);
}
@@ -123,8 +123,8 @@ namespace DevHive.Data.Repositories
{
this._context.Update(user);
- user.Langauges.Remove(oldLang);
- user.Langauges.Add(newLang);
+ user.Languages.Remove(oldLang);
+ user.Languages.Add(newLang);
return await RepositoryMethods.SaveChangesAsync(this._context);
}
@@ -162,7 +162,7 @@ namespace DevHive.Data.Repositories
{
this._context.Update(user);
- user.Langauges.Remove(language);
+ user.Languages.Remove(language);
return await RepositoryMethods.SaveChangesAsync(this._context);
}
@@ -224,7 +224,7 @@ namespace DevHive.Data.Repositories
public bool DoesUserHaveThisLanguage(User user, Language language)
{
- return user.Langauges.Contains(language);
+ return user.Languages.Contains(language);
}
public bool DoesUserHaveThisTechnology(User user, Technology technology)
diff --git a/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs b/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
index 46f8aaf..b0a5b93 100644
--- a/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
+++ b/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
@@ -86,7 +86,7 @@ namespace DevHive.Data.Tests
//Assert
Assert.True(result, "The language isn't inserted properly to the database");
- Assert.True(dummyUser.Langauges.Contains(language), "The language doesn't get added properly to the user");
+ Assert.True(dummyUser.Languages.Contains(language), "The language doesn't get added properly to the user");
}
[Test]
@@ -165,7 +165,7 @@ namespace DevHive.Data.Tests
//Arrange
User dummyUser = CreateDummyUser();
await this._userRepository.AddAsync(dummyUser);
- IList<Language> dummyUserLanguages = dummyUser.Langauges;
+ IList<Language> dummyUserLanguages = dummyUser.Languages;
//Act
IList<Language> languages = this._userRepository.GetUserLanguages(dummyUser);
@@ -229,7 +229,7 @@ namespace DevHive.Data.Tests
FirstName = "Spas",
LastName = "Spasov",
Email = "abv@abv.bg",
- Langauges = languages,
+ Languages = languages,
Technologies = technologies,
Roles = roles
};
@@ -271,7 +271,7 @@ namespace DevHive.Data.Tests
FirstName = "Alex",
LastName = "Spiridonov",
Email = "a_spiridonov@abv.bg",
- Langauges = languages,
+ Languages = languages,
Technologies = technologies,
Roles = roles
};