delete MangoCommandExecutor.cs | delete MangoCompositionRoot.cs | del…

MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommandHandler.cs

@@ -45,7 +45,7 @@
  var user = await dbContext.Users.AsNoTracking()
  .Select(x => new
  {
  x.DisplayName, x.DisplayNameColour, Image = x.ImageFileName, x.Id,
  }).FirstOrDefaultAsync(
  x => x.Id == request.UserId, cancellationToken);
 
@@ -57,7 +57,7 @@
  return responseFactory.ConflictResponse(errorMessage, errorDescription);
  }
 
- var userChat = await dbContext.UserChats.AsNoTracking()
+ var userChat = await dbContext.UserChats
  .Select(x => new { x.ChatId, x.RoleId, x.Chat, }).FirstOrDefaultAsync(
  x => x.ChatId == request.ChatId,
  cancellationToken);
@@ -105,9 +105,9 @@
  user.DisplayNameColour,
  messageEntity.Text,
  messageEntity.CreatedAt,
  messageEntity.UpdatedAt, 
  messageEntity.InReplyToUser, 
  messageEntity.InReplyToText, 
  authorImageUrl,
  attachmentUrl);
 

MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationCommandHandler.cs

@@ -32,7 +32,7 @@ public async Task<Result<UpdatePersonalInformationResponse>> Handle(
  UpdatePersonalInformationCommand request,
  CancellationToken cancellationToken)
  {
- var user = await dbContext.Users.AsNoTracking()
+ var user = await dbContext.Users
  .Include(x => x.PersonalInformation)
  .FirstOrDefaultAsync(x => x.Id == request.UserId, cancellationToken);
 

MangoAPI.IntegrationTests/ApiCommandsTests/AddContactCommandHandlerTests/AddContactShouldThrowCannotAddSelf.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Contacts;
 using MangoAPI.BusinessLogic.Responses;
@@ -19,11 +18,10 @@ public async Task AddContactCommandHandlerTestShouldThrowCannotAddSelfAsync()
  const string expectedMessage = ResponseMessageCodes.CannotAddSelfToContacts;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
  var registerPetroCommand = CommandHelper.RegisterPetroCommand();
- var user =
- await MangoModule.RequestAsync(registerPetroCommand, CancellationToken.None);
-
+ var user = await RequestAsync(registerPetroCommand, CancellationToken.None);
+
  var command = new AddContactCommand(user.Response.Tokens.UserId, user.Response.Tokens.UserId);
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/AddContactCommandHandlerTests/AddContactShouldThrowContactExists.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Contacts;
 using MangoAPI.BusinessLogic.Responses;
@@ -18,12 +17,12 @@ public async Task AddContactCommandHandlerTestShouldThrowContactExistsAsync()
  {
  const string expectedMessage = ResponseMessageCodes.ContactAlreadyExist;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var sender = await MangoModule.RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
- var receiver = await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var sender = await RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
+ var receiver = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new AddContactCommand(sender.Response.Tokens.UserId, receiver.Response.Tokens.UserId);
- await MangoModule.RequestAsync(command, CancellationToken.None);
+ await RequestAsync(command, CancellationToken.None);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/AddContactCommandHandlerTests/AddContactShouldThrowUserNotFound.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Contacts;
@@ -19,13 +18,12 @@ public async Task AddContactCommandHandlerTestShouldThrowUserNotFoundAsync()
  {
  const string expectedMessage = ResponseMessageCodes.UserNotFound;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new AddContactCommand(
  UserId: user.Response.Tokens.UserId,
  ContactId: Guid.Empty);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/AddContactCommandHandlerTests/AddContactSuccess.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Contacts;
 using MangoAPI.BusinessLogic.Responses;
@@ -15,13 +14,13 @@ public class AddContactSuccess : IntegrationTestBase
  [Fact]
  public async Task AddContactsCommandHandlerTestSuccessAsync()
  {
- var sender = await MangoModule.RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
- var receiver = await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var sender = await RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
+ var receiver = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new AddContactCommand(
  UserId: sender.Response.Tokens.UserId,
  ContactId: receiver.Response.Tokens.UserId);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Pass(result);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ArchiveChatCommandHandlerTests/ArchiveChatTestShouldThrowChatNotFound.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Communities;
@@ -19,11 +18,10 @@ public async Task ArchiveChatTestShouldThrowChatNotFoundAsync()
  {
  const string expectedMessage = ResponseMessageCodes.ChatNotFound;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new ArchiveChatCommand(ChatId: Guid.NewGuid(), UserId: user.Response.Tokens.UserId);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ArchiveChatCommandHandlerTests/ArchiveChatTestSuccess.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Communities;
 using MangoAPI.BusinessLogic.Responses;
@@ -15,15 +14,13 @@ public class ArchiveChatTestSuccess : IntegrationTestBase
  [Fact]
  public async Task ArchiveChatTestSuccessAsync()
  {
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
- var chat =
- await MangoModule.RequestAsync(
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var chat = await RequestAsync(
  CommandHelper.CreateExtremeCodeMainChatCommand(user.Response.Tokens.UserId),
  CancellationToken.None);
  var command = new ArchiveChatCommand(ChatId: chat.Response.ChatId, UserId: user.Response.Tokens.UserId);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Pass(result);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ChangePasswordCommandHandlerTests/ChangePasswordTestShouldThrowInvalidCredentials.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Users;
 using MangoAPI.BusinessLogic.Responses;
@@ -18,15 +17,14 @@ public async Task ChangePasswordTestShouldThrowInvalidCredentialsAsync()
  {
  const string expectedMessage = ResponseMessageCodes.InvalidCredentials;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new ChangePasswordCommand(
  UserId: user.Response.Tokens.UserId,
  CurrentPassword: "Gm3-`xPRr-/q#6)rgf^925",
  NewPassword: "Gm3-`xPRr-/q#6)re^94",
  RepeatNewPassword: "Gm3-`xPRr-/q#6)re^94");
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ChangePasswordCommandHandlerTests/ChangePasswordTestShouldThrowUserNotFound.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Users;
@@ -24,7 +23,7 @@ public async Task ChangePasswordTestShouldThrowUserNotFoundAsync()
  NewPassword: "Gm3-`xPRr-/q#6)re^94",
  RepeatNewPassword: "Gm3-`xPRr-/q#6)re^94");
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ChangePasswordCommandHandlerTests/ChangePasswordTestSuccess.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Users;
 using MangoAPI.BusinessLogic.Responses;
@@ -15,15 +14,14 @@ public class ChangePasswordTestSuccess : IntegrationTestBase
  [Fact]
  public async Task ChangePasswordTestSuccessAsync()
  {
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new ChangePasswordCommand(
  UserId: user.Response.Tokens.UserId,
  CurrentPassword: "Bm3-`dPRv-/w#3)cw^97",
  NewPassword: "Gm3-`xPRr-/q#6)re^94",
  RepeatNewPassword: "Gm3-`xPRr-/q#6)re^94");
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Pass(result);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ConfirmKeyExchangeCommandHandlerTests/ConfirmKeyExchangeShouldThrowKeyExchangeRequestNotFound.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.DiffieHellmanKeyExchanges;
@@ -19,14 +18,13 @@ public async Task ConfirmKeyExchangeShouldThrowKeyExchangeRequestNotFoundAsync()
  {
  const string expectedMessage = ResponseMessageCodes.KeyExchangeRequestNotFound;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var requestedUser =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var requestedUser = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new ConfirmKeyExchangeCommand(
  RequestId: Guid.NewGuid(),
  UserId: requestedUser.Response.Tokens.UserId,
  ReceiverPublicKey: MangoFilesHelper.GetTestImage());
 
- var response = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var response = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(response, expectedMessage, expectedDetails);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/ConfirmKeyExchangeCommandHandlerTests/ConfirmKeyExchangeSuccess.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.DiffieHellmanKeyExchanges;
 using MangoAPI.BusinessLogic.Responses;
@@ -15,11 +14,9 @@ public class ConfirmKeyExchangeSuccess : IntegrationTestBase
  [Fact]
  public async Task ConfirmKeyExchangeSuccessAsync()
  {
- var sender =
- await MangoModule.RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
- var receiver =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
- var keyExchange = await MangoModule.RequestAsync(
+ var sender = await RequestAsync(CommandHelper.RegisterKhachaturCommand(), CancellationToken.None);
+ var receiver = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var keyExchange = await RequestAsync(
  request: CommandHelper.CreateOpenSslCreateKeyExchangeCommand(
  receiver.Response.Tokens.UserId,
  sender.Response.Tokens.UserId,
@@ -30,7 +27,7 @@ public async Task ConfirmKeyExchangeSuccessAsync()
  UserId: receiver.Response.Tokens.UserId,
  ReceiverPublicKey: MangoFilesHelper.GetTestImage());
 
- var response = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var response = await RequestAsync(command, CancellationToken.None);
 
  assert.Pass(response);
  }

MangoAPI.IntegrationTests/ApiCommandsTests/CreateChannelCommandHandlerTests/CreateChannelTestSuccess.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Communities;
 using MangoAPI.IntegrationTests.Helpers;
@@ -14,11 +13,9 @@ public class CreateChannelTestSuccess : IntegrationTestBase
  [Fact]
  public async Task CreateChannelTestSuccessAsync()
  {
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
 
- var result =
- await MangoModule.RequestAsync(
+ var result = await RequestAsync(
  CommandHelper.CreateExtremeCodeMainChatCommand(user.Response.Tokens.UserId),
  CancellationToken.None);
 

MangoAPI.IntegrationTests/ApiCommandsTests/CreateChatCommandHandlerTests/CreateChatShouldThrowCannotCreateSelfChat.cs

@@ -1,5 +1,4 @@
-using MangoAPI.BusinessLogic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.ApiCommands.Communities;
 using MangoAPI.Domain.Constants;
@@ -17,13 +16,12 @@ public async Task CreateChatShouldThrowCannotCreateSelfChatAsync()
  {
  const string expectedMessage = ResponseMessageCodes.CannotCreateSelfChat;
  var expectedDetails = ResponseMessageCodes.ErrorDictionary[expectedMessage];
- var user =
- await MangoModule.RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
+ var user = await RequestAsync(CommandHelper.RegisterPetroCommand(), CancellationToken.None);
  var command = new CreateChatCommand(
  UserId: user.Response.Tokens.UserId,
  PartnerId: user.Response.Tokens.UserId);
 
- var result = await MangoModule.RequestAsync(command, CancellationToken.None);
+ var result = await RequestAsync(command, CancellationToken.None);
 
  assert.Fail(result, expectedMessage, expectedDetails);
  }