Merge pull request #203 from StoyanShopov/CompanyIntegrationTests

Company integration tests

Author: Ivailo369369

Data/UpSkill.Data.Models/Course.cs

@@ -20,7 +20,7 @@ public Course()
 
         public int CategoryId { get; set; }
 
-        public decimal Price { get; set; }  
+        public decimal Price { get; set; }
 
         public Category Category { get; set; }
 

Data/UpSkill.Data.Models/Message.cs

@@ -10,8 +10,7 @@ public class Message
 
         public string Time { get; set; }
 
-        //public string GroupChatId { get; init; }
-
+        // public string GroupChatId { get; init; }
         public string OwnerName { get; init; }
     }
 }

Services/UpSkill.Services.Data/Category/CategoriesService.cs

@@ -4,9 +4,9 @@
 
     using Microsoft.EntityFrameworkCore;
 
-    using Contracts.Category;
     using UpSkill.Data.Common.Repositories;
     using UpSkill.Data.Models;
+    using UpSkill.Services.Data.Contracts.Category;
 
     public class CategoriesService : ICategoriesService
     {

Services/UpSkill.Services.Data/Coach/CoachesService.cs

@@ -48,8 +48,8 @@ public async Task<Result> CreateAsync(CreateCoachRequestModel model)
             {
                 FirstName = model.FirstName,
                 LastName = model.LastName,
-                Field=model.Field,
-                Price=model.Price,
+                Field = model.Field,
+                Price = model.Price,
                 FileId = file,
                 CalendlyUrl = model.CalendlyUrl,
             };

Services/UpSkill.Services.Data/Course/CoursesService.cs

@@ -187,7 +187,6 @@ public async Task<BaseDeletableModel<int>> GetDbModelByIdAsync(int id)
             .Where(x => x.Id == id)
             .FirstOrDefaultAsync();
 
-
         public async Task<ICollection<UserInCourse>> GetAllUsersInCourse(int id) => await this.usersInCourses
               .AllAsNoTracking()
               .Where(uc => uc.CourseId == id)

Services/UpSkill.Services/Hubs/ChatHub.cs

@@ -6,15 +6,15 @@
     using System.Threading.Tasks;
 
     using Microsoft.AspNetCore.SignalR;
+
     using UpSkill.Data.Common.Repositories;
     using UpSkill.Data.Models;
     using UpSkill.Web.ViewModels.Chat;
 
     public class ChatHub : Hub
     {
+        private const string Room = "devs";
         private readonly string bot;
-        private const string room = "devs";
-
 
         private readonly IRepository<Message> messages;
 
@@ -32,13 +32,13 @@ public ChatHub(
         public async Task JoinRoom(UserConnection userConnection)
         {
             await this.Groups
-                .AddToGroupAsync(this.Context.ConnectionId, room);
+                .AddToGroupAsync(this.Context.ConnectionId, Room);
 
             this.connections[this.Context.ConnectionId] = userConnection;
 
             await this.Clients
-                .Group(room)
-                .SendAsync("ReceiveMessage", this.bot, $"{userConnection.Name} has joined the {room} room!", DateTime.UtcNow.ToString(), userConnection.Name);
+                .Group(Room)
+                .SendAsync("ReceiveMessage", this.bot, $"{userConnection.Name} has joined the {Room} room!", DateTime.UtcNow.ToString(), userConnection.Name);
         }
 
         public async Task Send(string message, string user)
@@ -56,7 +56,7 @@ public async Task Send(string message, string user)
                 await this.messages.AddAsync(messageDb);
                 await this.messages.SaveChangesAsync();
 
-                await this.Clients.Group(room)
+                await this.Clients.Group(Room)
                     .SendAsync("ReceiveMessage", userConnection.Name, message, currentTime.ToString("H:mm"), user);
             }
         }
@@ -83,12 +83,11 @@ public override async Task OnDisconnectedAsync(Exception exception)
             {
                 this.connections.Remove(this.Context.ConnectionId);
 
-                await this.Clients.Group(room)
+                await this.Clients.Group(Room)
                        .SendAsync("ReceiveMessage", this.bot, $"{userConnection.Name} has left!", DateTime.UtcNow.ToString(), this.bot);
             }
 
             await base.OnDisconnectedAsync(exception);
         }
-
     }
 }

Services/UpSkill.Services/Identity/IdentityService.cs

@@ -9,7 +9,7 @@
     using System.Threading.Tasks;
 
     using Microsoft.AspNetCore.Identity;
-	using Microsoft.EntityFrameworkCore;
+    using Microsoft.EntityFrameworkCore;
     using Microsoft.Extensions.Options;
     using Microsoft.IdentityModel.Tokens;
 

Tests/UpSkill.Services.Data.Tests/Common/TestWithData.cs

@@ -1,31 +1,37 @@
 namespace UpSkill.Services.Data.Tests.Common
 {
-    using System.Threading.Tasks;
-
     using UpSkill.Data;
     using UpSkill.Data.Models;
     using UpSkill.Services.Data.Tests.Fakes;
 
     public abstract class TestWithData
     {
-        protected async Task InitializeDatabase(string databaseName)
+        protected void InitializeDatabase(string databaseName)
         {
             var fakeDatabase = new FakeUpSkillDbContext(databaseName);
 
-            await AddFakeData(fakeDatabase);
+            AddFakeData(fakeDatabase);
 
             this.Database = fakeDatabase.Data;
         }
 
         protected ApplicationDbContext Database { get; private set; }
 
-        private static async Task AddFakeData(FakeUpSkillDbContext dbContext)
-            => await dbContext.AddFakeDataAsync(
+        private static void AddFakeData(FakeUpSkillDbContext dbContext)
+            => dbContext.AddFakeData(
                 new Company()
             {
                 Id = 1,
                 Name = "TestCompany",
             },
+                new Coach()
+                {
+                    Id = 1,
+                    FirstName = "TestFirstName",
+                    LastName = "TestLastName",
+                    Field = "1",
+                    Price = 100,
+                },
                 new ApplicationUser()
             {
                 Id = "1",

Tests/UpSkill.Services.Data.Tests/Fakes/FakeUpSkillDbContext.cs

@@ -1,7 +1,5 @@
 namespace UpSkill.Services.Data.Tests.Fakes
 {
-    using System.Threading.Tasks;
-
     using Microsoft.EntityFrameworkCore;
 
     using UpSkill.Data;
@@ -19,10 +17,10 @@ public FakeUpSkillDbContext(string name)
 
         public ApplicationDbContext Data { get; }
 
-        public async Task AddFakeDataAsync(params object[] data)
+        public void AddFakeData(params object[] data)
         {
             this.Data.AddRange(data);
-            await this.Data.SaveChangesAsync();
+            this.Data.SaveChanges();
         }
     }
 }

Tests/UpSkill.Services.Data.Tests/Services/CoursesServicesTest.cs

@@ -53,7 +53,7 @@ public async Task DeleteAsyncShouldDeleteCourse()
             const int Id = 1;
             const string DatabaseName = "DeleteCourse";
 
-            await this.InitializeDatabase(DatabaseName);
+            this.InitializeDatabase(DatabaseName);
 
             var repository = new Mock<IDeletableEntityRepository<Course>>();
 
@@ -79,7 +79,7 @@ public async Task EditAsyncShouldEditCourse()
 
             const string DatabaseName = "EditCourse";
 
-            await this.InitializeDatabase(DatabaseName);
+            this.InitializeDatabase(DatabaseName);
 
             var repository = new Mock<IDeletableEntityRepository<Course>>();
 
@@ -112,7 +112,7 @@ public async Task GetByIdAsyncShouldGetCourseById()
 
             const int Id = 1;
 
-            await this.InitializeDatabase(DatabaseName);
+            this.InitializeDatabase(DatabaseName);
 
             var repository = new Mock<IDeletableEntityRepository<Course>>();
 
@@ -130,7 +130,7 @@ public async Task GetAllAsyncShouldGetAllCourses()
             const string DatabaseName = "GetAllCourses";
             const int DatabaseRecordsCount = 2;
 
-            await this.InitializeDatabase(DatabaseName);
+            this.InitializeDatabase(DatabaseName);
 
             var repository = new Mock<IDeletableEntityRepository<Course>>();