Merge pull request #18 from IliyanIlievPH/16

Closes #16
OpenMAVN · May 8, 2020 · b13c6e6 · b13c6e6
2 parents c15b5ec + be71e30
commit b13c6e6
Show file tree

Hide file tree

Showing 32 changed files with 46 additions and 47 deletions.
diff --git a/src/MAVN.Service.CustomerProfile.DomainServices/CustomerProfileService.cs b/src/MAVN.Service.CustomerProfile.DomainServices/CustomerProfileService.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Common;
 using Common.Log;
-using Falcon.Common;
+using MAVN.Common;
 using Lykke.Common.Log;
 using Lykke.Common.MsSql;
 using Lykke.RabbitMqBroker.Publisher;
@@ -13,7 +13,7 @@
 using MAVN.Service.CustomerProfile.Domain.Models;
 using MAVN.Service.CustomerProfile.Domain.Repositories;
 using MAVN.Service.CustomerProfile.Domain.Services;
-using Lykke.Service.Dictionaries.Client;
+using MAVN.Service.Dictionaries.Client;
 
 namespace MAVN.Service.CustomerProfile.DomainServices
 {

diff --git a/...Service.CustomerProfile.DomainServices/MAVN.Service.CustomerProfile.DomainServices.csproj b/...Service.CustomerProfile.DomainServices/MAVN.Service.CustomerProfile.DomainServices.csproj
@@ -9,14 +9,14 @@
     <ProjectReference Include="..\MAVN.Service.CustomerProfile.Domain\MAVN.Service.CustomerProfile.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Common" Version="0.2.2" />
-    <PackageReference Include="Falcon.Service.CustomerManagement.Contract" Version="6.0.0" />
-    <PackageReference Include="Falcon.Service.Dictionaries.Client" Version="1.3.0" />
-    <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Contract" Version="2.13.0" />
-    <PackageReference Include="Falcon.Service.Tiers.Contract" Version="1.0.0" />
     <PackageReference Include="Lykke.Common.MsSql" Version="2.3.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
     <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
+    <PackageReference Include="MAVN.Common" Version="1.0.0" />
     <PackageReference Include="MAVN.Service.AdminManagement.Contract" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.CustomerManagement.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.Dictionaries.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.Tiers.Contract" Version="1.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.CustomerProfile.DomainServices/Subscribers/CodeVerifiedSubscriber.cs b/src/MAVN.Service.CustomerProfile.DomainServices/Subscribers/CodeVerifiedSubscriber.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Subscriber;
-using Lykke.Service.CustomerManagement.Contract.Events;
+using MAVN.Service.CustomerManagement.Contract.Events;
 using MAVN.Service.CustomerProfile.Domain.Services;
 
 namespace MAVN.Service.CustomerProfile.DomainServices.Subscribers

diff --git a/src/MAVN.Service.CustomerProfile.DomainServices/Subscribers/CustomerTierChangedSubscriber.cs b/src/MAVN.Service.CustomerProfile.DomainServices/Subscribers/CustomerTierChangedSubscriber.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.CustomerProfile.Domain.Services;
-using Lykke.Service.Tiers.Contract;
+using MAVN.Service.Tiers.Contract;
 
 namespace MAVN.Service.CustomerProfile.DomainServices.Subscribers
 {

diff --git a/...CustomerProfile.DomainServices/Subscribers/SeizeBalanceFromCustomerCompletedSubscriber.cs b/...CustomerProfile.DomainServices/Subscribers/SeizeBalanceFromCustomerCompletedSubscriber.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.CustomerProfile.Domain.Services;
-using Lykke.Service.PrivateBlockchainFacade.Contract.Events;
+using MAVN.Service.PrivateBlockchainFacade.Contract.Events;
 
 namespace MAVN.Service.CustomerProfile.DomainServices.Subscribers
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/AdminProfileArchiveEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/AdminProfileArchiveEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/AdminProfileEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/AdminProfileEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Models;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/CustomerProfileArchiveEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/CustomerProfileArchiveEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/CustomerProfileEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/CustomerProfileEntity.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;
 

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PartnerContactBaseEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PartnerContactBaseEntity.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PaymentProviderDetailsEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/PaymentProviderDetailsEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Models;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities

diff --git a/....Service.CustomerProfile.MsSqlRepositories/Entities/ReferralFriendProfileArchiveEntity.cs b/....Service.CustomerProfile.MsSqlRepositories/Entities/ReferralFriendProfileArchiveEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralFriendProfileEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralFriendProfileEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Models;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities

diff --git a/...N.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralHotelProfileArchiveEntity.cs b/...N.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralHotelProfileArchiveEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralHotelProfileEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralHotelProfileEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Models;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities

diff --git a/...VN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralLeadProfileArchiveEntity.cs b/...VN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralLeadProfileArchiveEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralLeadProfileEntity.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Entities/ReferralLeadProfileEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using MAVN.Service.CustomerProfile.Domain.Models;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Entities

diff --git a/...e.CustomerProfile.MsSqlRepositories/MAVN.Service.CustomerProfile.MsSqlRepositories.csproj b/...e.CustomerProfile.MsSqlRepositories/MAVN.Service.CustomerProfile.MsSqlRepositories.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="Falcon.Common" Version="0.2.2" />
     <PackageReference Include="Lykke.Common.MsSql" Version="2.3.0" />
+    <PackageReference Include="MAVN.Common" Version="1.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/AdminProfileRepository.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/AdminProfileRepository.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/CustomerProfileRepository.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/CustomerProfileRepository.cs
@@ -4,8 +4,8 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Common.Log;
-using Falcon.Common;
-using Falcon.Common.Encryption;
+using MAVN.Common;
+using MAVN.Common.Encryption;
 using Lykke.Common.Log;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Enums;

diff --git a/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/PartnerContactRepository.cs b/src/MAVN.Service.CustomerProfile.MsSqlRepositories/Repositories/PartnerContactRepository.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Common.Log;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.Log;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Enums;

diff --git a/...ervice.CustomerProfile.MsSqlRepositories/Repositories/PaymentProviderDetailsRepository.cs b/...ervice.CustomerProfile.MsSqlRepositories/Repositories/PaymentProviderDetailsRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Models;
 using MAVN.Service.CustomerProfile.Domain.Repositories;

diff --git a/...Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralFriendProfileRepository.cs b/...Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralFriendProfileRepository.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories.Repositories
 {

diff --git a/....Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralHotelProfileRepository.cs b/....Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralHotelProfileRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;

diff --git a/...N.Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralLeadProfileRepository.cs b/...N.Service.CustomerProfile.MsSqlRepositories/Repositories/ReferralLeadProfileRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.MsSql;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;

diff --git a/src/MAVN.Service.CustomerProfile/Controllers/EncryptionKeyController.cs b/src/MAVN.Service.CustomerProfile/Controllers/EncryptionKeyController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 using Common.Log;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Lykke.Common.ApiLibrary.Exceptions;
 using Lykke.Common.Extensions;
 using Lykke.Common.Log;

diff --git a/src/MAVN.Service.CustomerProfile/Middleware/EncryptionKeyMiddleware.cs b/src/MAVN.Service.CustomerProfile/Middleware/EncryptionKeyMiddleware.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Common;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using JetBrains.Annotations;
 using Lykke.Common.Api.Contract.Responses;
 using Microsoft.AspNetCore.Builder;

diff --git a/src/MAVN.Service.CustomerProfile/Modules/ClientsModule.cs b/src/MAVN.Service.CustomerProfile/Modules/ClientsModule.cs
@@ -1,7 +1,7 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using MAVN.Service.CustomerProfile.Settings;
-using Lykke.Service.Dictionaries.Client;
+using MAVN.Service.Dictionaries.Client;
 using Lykke.SettingsReader;
 
 namespace MAVN.Service.CustomerProfile.Modules

diff --git a/src/MAVN.Service.CustomerProfile/Modules/ServiceModule.cs b/src/MAVN.Service.CustomerProfile/Modules/ServiceModule.cs
@@ -1,6 +1,6 @@
 using System;
 using Autofac;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using JetBrains.Annotations;
 using Lykke.Sdk;
 using MAVN.Service.CustomerProfile.Domain.Services;

diff --git a/src/MAVN.Service.CustomerProfile/Settings/AppSettings.cs b/src/MAVN.Service.CustomerProfile/Settings/AppSettings.cs
@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Lykke.Sdk.Settings;
-using Lykke.Service.Dictionaries.Client;
+using MAVN.Service.Dictionaries.Client;
 
 namespace MAVN.Service.CustomerProfile.Settings
 {

diff --git a/tests/MAVN.Service.CustomerProfile.Tests/CustomerProfileServiceTests.cs b/tests/MAVN.Service.CustomerProfile.Tests/CustomerProfileServiceTests.cs
@@ -1,19 +1,18 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Lykke.Common.MsSql;
 using Lykke.Logs;
-using Lykke.Logs.Loggers.LykkeConsole;
 using Lykke.RabbitMqBroker.Publisher;
 using MAVN.Service.CustomerProfile.Contract;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;
 using MAVN.Service.CustomerProfile.Domain.Repositories;
 using MAVN.Service.CustomerProfile.DomainServices;
 using MAVN.Service.CustomerProfile.MsSqlRepositories;
-using Lykke.Service.Dictionaries.Client;
-using Lykke.Service.Dictionaries.Client.Models.Salesforce;
+using MAVN.Service.Dictionaries.Client;
+using MAVN.Service.Dictionaries.Client.Models.Salesforce;
 using Moq;
 using Xunit;
 

diff --git a/tests/MAVN.Service.CustomerProfile.Tests/EncryptionServiceTests.cs b/tests/MAVN.Service.CustomerProfile.Tests/EncryptionServiceTests.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Common.Encryption;
+using MAVN.Common.Encryption;
 using Moq;
 using Xunit;