Merge pull request #6 from IliyanIlievPH/2

Closes #2
OpenMAVN · Apr 7, 2020 · d1d1014 · d1d1014
2 parents 7fbb2e9 + 9b6e0ea
commit d1d1014
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 46 deletions.
diff --git a/client/MAVN.Service.PartnersIntegration.Client/AutofacExtension.cs b/client/MAVN.Service.PartnersIntegration.Client/AutofacExtension.cs
@@ -1,4 +1,4 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using Lykke.HttpClientGenerator;
 using Lykke.HttpClientGenerator.Infrastructure;
@@ -30,7 +30,7 @@ public static class AutofacExtension
             if (string.IsNullOrWhiteSpace(settings.ServiceUrl))
                 throw new ArgumentException("Value cannot be null or whitespace.", nameof(PartnersIntegrationServiceClientSettings.ServiceUrl));
 
-            var clientBuilder = HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
+            var clientBuilder = HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
                 .WithAdditionalCallsWrapper(new ExceptionHandlerCallsWrapper());
 
             clientBuilder = builderConfigure?.Invoke(clientBuilder) ?? clientBuilder.WithoutRetries();

diff --git a/src/MAVN.Service.PartnersIntegration.DomainServices/Services/PaymentsService.cs b/src/MAVN.Service.PartnersIntegration.DomainServices/Services/PaymentsService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 using System.Net.Http;
@@ -19,9 +19,9 @@
 using Lykke.Service.PartnersPayments.Client.Enums;
 using Lykke.Service.PartnersPayments.Client.Models;
 using Lykke.Service.PartnersPayments.Contract;
-using PaymentRequestStatus = Lykke.Service.PartnersIntegration.Domain.Enums.PaymentRequestStatus;
+using PaymentRequestStatus = MAVN.Service.PartnersIntegration.Domain.Enums.PaymentRequestStatus;
 
-[assembly: InternalsVisibleTo("Lykke.Service.PartnersIntegration.Tests")]
+[assembly: InternalsVisibleTo("MAVN.Service.PartnersIntegration.Tests")]
 
 namespace MAVN.Service.PartnersIntegration.DomainServices.Services
 {
@@ -411,33 +411,33 @@ private async Task SendHttpRequestMessage(HttpMethod httpMethod, string url, str
             _log.Info("Successfully sent callback to partner", callbackInfo);
         }
 
-        private PaymentRequestStatus ProcessPaymentRequestStatus(PartnersPayments.Client.Enums.PaymentRequestStatus responseModelStatus)
+        private PaymentRequestStatus ProcessPaymentRequestStatus(Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus responseModelStatus)
         {
             switch (responseModelStatus)
             {
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.Created:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferStarted:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.Created:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferStarted:
                     return PaymentRequestStatus.PendingCustomerConfirmation;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.RejectedByCustomer:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.RejectedByCustomer:
                     return PaymentRequestStatus.RejectedByCustomer;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferSucceeded:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnStarted:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundStarted:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferSucceeded:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnStarted:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundStarted:
                     return PaymentRequestStatus.PendingPartnerConfirmation;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnSucceeded:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnSucceeded:
                     return PaymentRequestStatus.PaymentExecuted;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundSucceeded:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.CancelledByPartner:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundSucceeded:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.CancelledByPartner:
                     return PaymentRequestStatus.CancelledByPartner;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.RequestExpired:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.RequestExpired:
                     return PaymentRequestStatus.RequestExpired;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundStarted:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundSucceeded:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundStarted:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundSucceeded:
                     return PaymentRequestStatus.PaymentExpired;
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundFailed:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundFailed:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferFailed:
-                case PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnFailed:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.ExpirationTokensRefundFailed:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensRefundFailed:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensTransferFailed:
+                case Lykke.Service.PartnersPayments.Client.Enums.PaymentRequestStatus.TokensBurnFailed:
                 default:
                     return PaymentRequestStatus.OperationFailed;
             }

diff --git a/tests/MAVN.Service.PartnersIntegration.Tests/BonusServiceTests.cs b/tests/MAVN.Service.PartnersIntegration.Tests/BonusServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Lykke.Logs;
@@ -82,7 +82,7 @@ public async Task When_TriggerBonusToCustomersAsync_CalledWithValidData_ExpectGe
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByCustomerIdAsync(customerId, false, false))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile { Email = email }
+                    Profile = new CustomerProfile { Email = email }
                 }));
 
             _referralClientMock.Setup(x => x.ReferralHotelsApi.UseAsync(It.IsAny<ReferralHotelUseRequest>()))
@@ -357,7 +357,7 @@ public async Task When_TriggerBonusToCustomersAsync_AndCustomerProfileEmailDoesN
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByCustomerIdAsync(customerId, false, false))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile { Email = email + "Wrong"}
+                    Profile = new CustomerProfile { Email = email + "Wrong"}
                 }));
 
             //Act
@@ -396,7 +396,7 @@ public async Task When_TriggerBonusToCustomersAsync_AndEmailIsMissing_ExpectEmai
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByCustomerIdAsync(customerId, false, false))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile { Email =  email}
+                    Profile = new CustomerProfile { Email =  email}
                 }));
 
             _referralClientMock.Setup(x => x.ReferralHotelsApi.UseAsync(It.IsAny<ReferralHotelUseRequest>()))
@@ -525,7 +525,7 @@ public async Task When_TriggerBonusToCustomersAsync_AndCustomerIdIsMissing_Expec
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByEmailAsync(It.Is<GetByEmailRequestModel>(i => i.Email == email)))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile { CustomerId = customerId }
+                    Profile = new CustomerProfile { CustomerId = customerId }
                 }));
 
             _referralClientMock.Setup(x => x.ReferralHotelsApi.UseAsync(It.IsAny<ReferralHotelUseRequest>()))

diff --git a/tests/MAVN.Service.PartnersIntegration.Tests/CustomersServiceTests.cs b/tests/MAVN.Service.PartnersIntegration.Tests/CustomersServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using AutoMapper;
 using Lykke.Logs;
@@ -67,7 +67,7 @@ public async Task When_GetCustomerInformationAsync_CalledWithId_ExpectGetByCusto
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByCustomerIdAsync(customerIdString, false, false))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile {CustomerId = customerIdString }
+                    Profile = new CustomerProfile {CustomerId = customerIdString }
                 }));
             _tiersMock.Setup(x => x.Customers.GetTierAsync(customerId))
                 .Returns(Task.FromResult(new TierModel()));
@@ -110,7 +110,7 @@ public async Task When_GetCustomerInformationAsync_CalledWithEmail_ExpectGetByEm
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByEmailAsync(It.Is<GetByEmailRequestModel>(i => i.Email == email)))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile {CustomerId = customerIdString }
+                    Profile = new CustomerProfile {CustomerId = customerIdString }
                 }));
             _tiersMock.Setup(x => x.Customers.GetTierAsync(customerId))
                 .Returns(Task.FromResult(new TierModel()));
@@ -153,7 +153,7 @@ public async Task When_GetCustomerInformationAsync_CalledWithPhone_ExpectGetByPh
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByPhoneAsync(It.Is<GetByPhoneRequestModel>(i => i.Phone == phone)))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile {CustomerId = customerIdString }
+                    Profile = new CustomerProfile {CustomerId = customerIdString }
                 }));
             _tiersMock.Setup(x => x.Customers.GetTierAsync(customerId))
                 .Returns(Task.FromResult(new TierModel()));
@@ -204,7 +204,7 @@ public async Task When_GetCustomerBalanceAsync_CalledWithValidData_ExpectCorrect
             _customerProfileClientMock.Setup(x => x.CustomerProfiles.GetByCustomerIdAsync(customerId, false, false))
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile()
+                    Profile = new CustomerProfile()
                 }));
 
             _privateBlockchainFacadeClientMock.Setup(x => x.CustomersApi.GetBalanceAsync(customerIdGuid))

diff --git a/tests/MAVN.Service.PartnersIntegration.Tests/MessagesServiceTests.cs b/tests/MAVN.Service.PartnersIntegration.Tests/MessagesServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using AutoFixture;
 using Lykke.Logs;
@@ -103,7 +103,7 @@ public async Task When_Send_Message_Async_Is_Executed_For_Non_Existing_Customer_
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Error, CustomerBlockStatusError.CustomerNotFound)
                     .Create()));
 
@@ -121,7 +121,7 @@ public async Task When_Send_Message_Async_Is_Executed_For_Blocked_Customer_Then_
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Status, CustomerActivityStatus.Blocked)
                     .Create()));
 
@@ -139,7 +139,7 @@ public async Task When_Send_Message_Async_Is_Executed_For_Non_Existing_Partner_T
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .Create()));
 
             _partnerAndLocationHelperMock
@@ -163,7 +163,7 @@ public async Task When_Send_Message_Async_Is_Executed_For_Non_Existing_Location_
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Create<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()));
+                    .Create<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()));
 
             _partnerAndLocationHelperMock
                 .Setup(x => x.ValidatePartnerInfo(It.IsAny<string>(), It.IsAny<LocationInfoResponse>()))
@@ -186,7 +186,7 @@ public async Task When_Send_Message_Async_Is_Executed_Then_Messages_And_Message_
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Error, CustomerBlockStatusError.None)
                     .With(x => x.Status, CustomerActivityStatus.Active)
                     .Create()));
@@ -226,7 +226,7 @@ public async Task When_Send_Message_Async_Is_Executed_With_Send_Push_Notificatio
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Error, CustomerBlockStatusError.None)
                     .With(x => x.Status, CustomerActivityStatus.Active)
                     .Create()));
@@ -265,7 +265,7 @@ public async Task When_Send_Message_Async_Is_Executed_With_Send_Push_Notificatio
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Error, CustomerBlockStatusError.None)
                     .With(x => x.Status, CustomerActivityStatus.Active)
                     .Create()));
@@ -301,7 +301,7 @@ public async Task When_Send_Message_Async_Is_Executed_And_Content_Is_Not_Saved_D
             _customerManagementServiceClientMock
                 .Setup(x => x.CustomersApi.GetCustomerBlockStateAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult(_fixture
-                    .Build<CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
+                    .Build<Lykke.Service.CustomerManagement.Client.Models.Responses.CustomerBlockStatusResponse>()
                     .With(x => x.Error, CustomerBlockStatusError.None)
                     .With(x => x.Status, CustomerActivityStatus.Active)
                     .Create()));

diff --git a/tests/MAVN.Service.PartnersIntegration.Tests/PaymentsServiceTests.cs b/tests/MAVN.Service.PartnersIntegration.Tests/PaymentsServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using AutoFixture;
@@ -17,7 +17,7 @@
 using Lykke.Service.PartnersPayments.Client.Models;
 using Moq;
 using Xunit;
-using PaymentRequestStatus = Lykke.Service.PartnersIntegration.Domain.Enums.PaymentRequestStatus;
+using PaymentRequestStatus = MAVN.Service.PartnersIntegration.Domain.Enums.PaymentRequestStatus;
 
 namespace MAVN.Service.PartnersIntegration.Tests
 {

diff --git a/tests/MAVN.Service.PartnersIntegration.Tests/ReferralsServiceTests.cs b/tests/MAVN.Service.PartnersIntegration.Tests/ReferralsServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AutoMapper;
@@ -131,7 +131,7 @@ public async Task When_GetReferralInformationAsync_CalledWithCorrectData_ExpectV
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
                     ErrorCode = CustomerProfileErrorCodes.None,
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile
+                    Profile = new CustomerProfile
                     {
                         Email = referrerEmail,
                         FirstName = referrerFirstName,
@@ -143,7 +143,7 @@ public async Task When_GetReferralInformationAsync_CalledWithCorrectData_ExpectV
                 .Returns(Task.FromResult(new CustomerProfileResponse
                 {
                     ErrorCode = CustomerProfileErrorCodes.None,
-                    Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile
+                    Profile = new CustomerProfile
                     {
                         Email = refereeEmail
                     }