Merge pull request #9 from IliyanIlievPH/8

Closes #8
OpenMAVN · May 11, 2020 · 7f21e3d · 7f21e3d
2 parents dd4e69e + 4ef9cbb
commit 7f21e3d
Show file tree

Hide file tree

Showing 44 changed files with 136 additions and 138 deletions.
diff --git a/client/MAVN.Service.PartnersPayments.Client/MAVN.Service.PartnersPayments.Client.csproj b/client/MAVN.Service.PartnersPayments.Client/MAVN.Service.PartnersPayments.Client.csproj
@@ -14,9 +14,9 @@
     <None Remove="MAVN.Service.PartnersPayments.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
     <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/client/MAVN.Service.PartnersPayments.Client/Models/CustomerApprovePaymentRequest.cs b/client/MAVN.Service.PartnersPayments.Client/Models/CustomerApprovePaymentRequest.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.PartnersPayments.Client.Models
 {

diff --git a/client/MAVN.Service.PartnersPayments.Client/Models/PaymentDetailsResponseModel.cs b/client/MAVN.Service.PartnersPayments.Client/Models/PaymentDetailsResponseModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.PartnersPayments.Client.Enums;
 
 namespace MAVN.Service.PartnersPayments.Client.Models

diff --git a/client/MAVN.Service.PartnersPayments.Client/Models/PaymentRequestModel.cs b/client/MAVN.Service.PartnersPayments.Client/Models/PaymentRequestModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.PartnersPayments.Client.Models
 {

diff --git a/client/MAVN.Service.PartnersPayments.Client/Models/PaymentResponseModel.cs b/client/MAVN.Service.PartnersPayments.Client/Models/PaymentResponseModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.PartnersPayments.Client.Enums;
 
 namespace MAVN.Service.PartnersPayments.Client.Models

diff --git a/...ract/MAVN.Service.PartnersPayments.Contract/MAVN.Service.PartnersPayments.Contract.csproj b/...ract/MAVN.Service.PartnersPayments.Contract/MAVN.Service.PartnersPayments.Contract.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
       <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
+      <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/contract/MAVN.Service.PartnersPayments.Contract/PartnersPaymentProcessedEvent.cs b/contract/MAVN.Service.PartnersPayments.Contract/PartnersPaymentProcessedEvent.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 
 namespace MAVN.Service.PartnersPayments.Contract

diff --git a/contract/MAVN.Service.PartnersPayments.Contract/PartnersPaymentTokensReservedEvent.cs b/contract/MAVN.Service.PartnersPayments.Contract/PartnersPaymentTokensReservedEvent.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 
 namespace MAVN.Service.PartnersPayments.Contract

diff --git a/src/MAVN.Job.PartnersPayments/Modules/DataLayerModule.cs b/src/MAVN.Job.PartnersPayments/Modules/DataLayerModule.cs
@@ -1,14 +1,14 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
-using Lykke.Common.MsSql;
+using Lykke.SettingsReader;
+using MAVN.Common.MsSql;
+using MAVN.Job.PartnersPayments.Settings;
+using MAVN.Job.PartnersPayments.Settings.JobSettings;
 using MAVN.Service.PartnersPayments.Domain.Repositories;
 using MAVN.Service.PartnersPayments.MsSqlRepositories;
 using MAVN.Service.PartnersPayments.MsSqlRepositories.Repositories;
-using Lykke.Job.PartnersPayments.Settings;
-using Lykke.SettingsReader;
-using Lykke.Job.PartnersPayments.Settings.JobSettings;
 
-namespace Lykke.Job.PartnersPayments.Modules
+namespace MAVN.Job.PartnersPayments.Modules
 {
     [UsedImplicitly]
     public class DataLayerModule : Module

diff --git a/src/MAVN.Job.PartnersPayments/Modules/JobModule.cs b/src/MAVN.Job.PartnersPayments/Modules/JobModule.cs
@@ -1,24 +1,24 @@
-using Autofac;
+using Autofac;
 using Common;
 using JetBrains.Annotations;
-using Lykke.Job.PartnersPayments.Services;
-using Lykke.Job.PartnersPayments.Settings;
 using Lykke.Sdk;
 using Lykke.Sdk.Health;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PartnerManagement.Client;
+using Lykke.SettingsReader;
+using MAVN.Job.PartnersPayments.Services;
+using MAVN.Job.PartnersPayments.Settings;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.EligibilityEngine.Client;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PartnersPayments.Domain.Common;
 using MAVN.Service.PartnersPayments.Domain.RabbitMq.Handlers;
 using MAVN.Service.PartnersPayments.Domain.Services;
 using MAVN.Service.PartnersPayments.DomainServices;
 using MAVN.Service.PartnersPayments.DomainServices.Common;
 using MAVN.Service.PartnersPayments.DomainServices.RabbitMq.Handlers;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.SettingsReader;
-using Lykke.Service.EligibilityEngine.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.WalletManagement.Client;
 
-namespace Lykke.Job.PartnersPayments.Modules
+namespace MAVN.Job.PartnersPayments.Modules
 {
     [UsedImplicitly]
     public class JobModule : Module

diff --git a/src/MAVN.Job.PartnersPayments/Modules/RabbitMqModule.cs b/src/MAVN.Job.PartnersPayments/Modules/RabbitMqModule.cs
@@ -1,12 +1,12 @@
 using Autofac;
 using JetBrains.Annotations;
-using Lykke.Job.PartnersPayments.Settings;
 using Lykke.RabbitMqBroker.Publisher;
-using MAVN.Service.PartnersPayments.Contract;
-
 using Lykke.SettingsReader;
+using MAVN.Job.PartnersPayments.Settings;
+using MAVN.Job.PartnersPayments.Settings.JobSettings;
+using MAVN.Service.PartnersPayments.Contract;
 
-namespace Lykke.Job.PartnersPayments.Modules
+namespace MAVN.Job.PartnersPayments.Modules
 {
     [UsedImplicitly]
     public class RabbitMqModule : Module

diff --git a/src/MAVN.Job.PartnersPayments/Program.cs b/src/MAVN.Job.PartnersPayments/Program.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Lykke.Sdk;
 
-namespace Lykke.Job.PartnersPayments
+namespace MAVN.Job.PartnersPayments
 {
     internal sealed class Program
     {

diff --git a/src/MAVN.Job.PartnersPayments/Services/ExpiredRequestsManager.cs b/src/MAVN.Job.PartnersPayments/Services/ExpiredRequestsManager.cs
@@ -1,13 +1,13 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Autofac;
 using Common;
 using Common.Log;
 using Lykke.Common.Log;
 using MAVN.Service.PartnersPayments.Domain.Services;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace Lykke.Job.PartnersPayments.Services
+namespace MAVN.Job.PartnersPayments.Services
 {
     public class ExpiredRequestsManager : IStartable, IStopable
     {

diff --git a/src/MAVN.Job.PartnersPayments/Services/ShutdownManager.cs b/src/MAVN.Job.PartnersPayments/Services/ShutdownManager.cs
@@ -8,7 +8,7 @@
 using Lykke.Common.Log;
 using Lykke.Sdk;
 
-namespace Lykke.Job.PartnersPayments.Services
+namespace MAVN.Job.PartnersPayments.Services
 {
     public class ShutdownManager : IShutdownManager
     {

diff --git a/src/MAVN.Job.PartnersPayments/Services/StartupManager.cs b/src/MAVN.Job.PartnersPayments/Services/StartupManager.cs
@@ -3,7 +3,7 @@
 using Lykke.Common;
 using Lykke.Sdk;
 
-namespace Lykke.Job.PartnersPayments.Services
+namespace MAVN.Job.PartnersPayments.Services
 {
     public class StartupManager : IStartupManager
     {

diff --git a/src/MAVN.Job.PartnersPayments/Settings/AppSettings.cs b/src/MAVN.Job.PartnersPayments/Settings/AppSettings.cs
@@ -1,13 +1,13 @@
-using System;
-using Lykke.Job.PartnersPayments.Settings.JobSettings;
+using System;
 using Lykke.Sdk.Settings;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.EligibilityEngine.Client;
-using Lykke.Service.PartnerManagement.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.WalletManagement.Client;
-
-namespace Lykke.Job.PartnersPayments.Settings
+using MAVN.Job.PartnersPayments.Settings.JobSettings;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.EligibilityEngine.Client;
+using MAVN.Service.PartnerManagement.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.WalletManagement.Client;
+
+namespace MAVN.Job.PartnersPayments.Settings
 {
     public class AppSettings : BaseAppSettings
     {

diff --git a/src/MAVN.Job.PartnersPayments/Settings/JobSettings/Constants.cs b/src/MAVN.Job.PartnersPayments/Settings/JobSettings/Constants.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Lykke.Job.PartnersPayments.Settings.JobSettings
+namespace MAVN.Job.PartnersPayments.Settings.JobSettings
 {
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public class Constants

diff --git a/src/MAVN.Job.PartnersPayments/Settings/JobSettings/DbSettings.cs b/src/MAVN.Job.PartnersPayments/Settings/JobSettings/DbSettings.cs
@@ -1,6 +1,6 @@
 using Lykke.SettingsReader.Attributes;
 
-namespace Lykke.Job.PartnersPayments.Settings.JobSettings
+namespace MAVN.Job.PartnersPayments.Settings.JobSettings
 {
     public class DbSettings
     {

diff --git a/src/MAVN.Job.PartnersPayments/Settings/JobSettings/PartnersPaymentsJobSettings.cs b/src/MAVN.Job.PartnersPayments/Settings/JobSettings/PartnersPaymentsJobSettings.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Lykke.Job.PartnersPayments.Settings.JobSettings
+namespace MAVN.Job.PartnersPayments.Settings.JobSettings
 {
     public class PartnersPaymentsJobSettings
     {

diff --git a/src/MAVN.Job.PartnersPayments/Settings/JobSettings/RabbitMqSettings.cs b/src/MAVN.Job.PartnersPayments/Settings/JobSettings/RabbitMqSettings.cs
@@ -1,6 +1,6 @@
 using Lykke.SettingsReader.Attributes;
 
-namespace Lykke.Job.PartnersPayments.Settings
+namespace MAVN.Job.PartnersPayments.Settings.JobSettings
 {
     public class RabbitMqSettings
     {

diff --git a/src/MAVN.Job.PartnersPayments/Startup.cs b/src/MAVN.Job.PartnersPayments/Startup.cs
@@ -1,11 +1,11 @@
 using System;
 using JetBrains.Annotations;
-using Lykke.Job.PartnersPayments.Settings;
 using Lykke.Sdk;
+using MAVN.Job.PartnersPayments.Settings;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Lykke.Job.PartnersPayments
+namespace MAVN.Job.PartnersPayments
 {
     [UsedImplicitly]
     public class Startup

diff --git a/src/MAVN.Service.PartnersPayments.Domain/MAVN.Service.PartnersPayments.Domain.csproj b/src/MAVN.Service.PartnersPayments.Domain/MAVN.Service.PartnersPayments.Domain.csproj
@@ -4,8 +4,8 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.PartnersPayments.Contract\MAVN.Service.PartnersPayments.Contract.csproj" />

diff --git a/src/MAVN.Service.PartnersPayments.Domain/Models/IPaymentRequest.cs b/src/MAVN.Service.PartnersPayments.Domain/Models/IPaymentRequest.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.PartnersPayments.Domain.Models
 {

diff --git a/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentModel.cs b/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.PartnersPayments.Domain.Enums;
 
 namespace MAVN.Service.PartnersPayments.Domain.Models

diff --git a/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentProcessedByPartnerModel.cs b/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentProcessedByPartnerModel.cs
@@ -1,4 +1,4 @@
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.PartnersPayments.Domain.Models
 {

diff --git a/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentRequest.cs b/src/MAVN.Service.PartnersPayments.Domain/Models/PaymentRequest.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.PartnersPayments.Domain.Models
 {

diff --git a/src/MAVN.Service.PartnersPayments.Domain/Services/IPaymentsStatusUpdater.cs b/src/MAVN.Service.PartnersPayments.Domain/Services/IPaymentsStatusUpdater.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.PartnersPayments.Domain.Enums;
 
 namespace MAVN.Service.PartnersPayments.Domain.Services

diff --git a/...rvice.PartnersPayments.DomainServices/MAVN.Service.PartnersPayments.DomainServices.csproj b/...rvice.PartnersPayments.DomainServices/MAVN.Service.PartnersPayments.DomainServices.csproj
@@ -6,16 +6,15 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Falcon.Job.QuorumTransactionWatcher.Contract" Version="4.8.0" />
     <PackageReference Include="Falcon.PrivateBlockchain.HospitalityRedeemGateway" Version="2.0.0" />
-    <PackageReference Include="Falcon.Service.CurrencyConvertor.Client" Version="4.0.0" />
-    <PackageReference Include="Falcon.Service.CustomerProfile.Client" Version="7.7.0" />
-    <PackageReference Include="Falcon.Service.EligibilityEngine.Client" Version="3.0.0" />
-    <PackageReference Include="Falcon.Service.PartnerManagement.Client" Version="3.0.0" />
-    <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Client" Version="2.9.0" />
-    <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Contract" Version="2.13.0" />
-    <PackageReference Include="Falcon.Service.WalletManagement.Client" Version="3.5.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="MAVN.Job.QuorumTransactionWatcher.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.EligibilityEngine.Client" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.4.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.PartnersPayments.Contract\MAVN.Service.PartnersPayments.Contract.csproj" />

diff --git a/src/MAVN.Service.PartnersPayments.DomainServices/PaymentsService.cs b/src/MAVN.Service.PartnersPayments.DomainServices/PaymentsService.cs
@@ -1,23 +1,23 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.CustomerProfile.Client.Models.Enums;
-using Lykke.Service.EligibilityEngine.Client;
-using Lykke.Service.EligibilityEngine.Client.Enums;
-using Lykke.Service.EligibilityEngine.Client.Models.ConversionRate.Requests;
-using Lykke.Service.PartnerManagement.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client.Models.Enums;
+using MAVN.Service.EligibilityEngine.Client;
+using MAVN.Service.EligibilityEngine.Client.Enums;
+using MAVN.Service.EligibilityEngine.Client.Models.ConversionRate.Requests;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PartnersPayments.Contract;
 using MAVN.Service.PartnersPayments.Domain.Enums;
 using MAVN.Service.PartnersPayments.Domain.Models;
 using MAVN.Service.PartnersPayments.Domain.Repositories;
 using MAVN.Service.PartnersPayments.Domain.Services;
 using MAVN.Service.PartnersPayments.DomainServices.Utils;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
 
 namespace MAVN.Service.PartnersPayments.DomainServices
 {

diff --git a/src/MAVN.Service.PartnersPayments.DomainServices/PaymentsStatusUpdater.cs b/src/MAVN.Service.PartnersPayments.DomainServices/PaymentsStatusUpdater.cs
@@ -1,22 +1,22 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.EligibilityEngine.Client;
-using Lykke.Service.EligibilityEngine.Client.Enums;
-using Lykke.Service.EligibilityEngine.Client.Models.ConversionRate.Requests;
-using Lykke.Service.EligibilityEngine.Client.Models.ConversionRate.Responses;
+using MAVN.Service.EligibilityEngine.Client;
+using MAVN.Service.EligibilityEngine.Client.Enums;
+using MAVN.Service.EligibilityEngine.Client.Models.ConversionRate.Requests;
+using MAVN.Service.EligibilityEngine.Client.Models.ConversionRate.Responses;
 using MAVN.Service.PartnersPayments.Contract;
 using MAVN.Service.PartnersPayments.Domain.Common;
 using MAVN.Service.PartnersPayments.Domain.Enums;
 using MAVN.Service.PartnersPayments.Domain.Extensions;
 using MAVN.Service.PartnersPayments.Domain.Models;
 using MAVN.Service.PartnersPayments.Domain.Repositories;
 using MAVN.Service.PartnersPayments.Domain.Services;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client.Models;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client.Models;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
 
 namespace MAVN.Service.PartnersPayments.DomainServices
 {

diff --git a/...rvice.PartnersPayments.DomainServices/RabbitMq/Subscribers/TransactionFailedSubscriber.cs b/...rvice.PartnersPayments.DomainServices/RabbitMq/Subscribers/TransactionFailedSubscriber.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Subscriber;
 using MAVN.Service.PartnersPayments.Domain.RabbitMq.Handlers;
-using Lykke.Service.PrivateBlockchainFacade.Contract.Events;
+using MAVN.Service.PrivateBlockchainFacade.Contract.Events;
 
 namespace MAVN.Service.PartnersPayments.DomainServices.RabbitMq.Subscribers
 {