Merge pull request #9 from IliyanIlievPH/8

Closes #8
OpenMAVN · May 5, 2020 · 09682b3 · 09682b3
2 parents 456554f + 26ef7b4
commit 09682b3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/src/MAVN.Service.NotificationSystemAdapter.DomainServices/KeysService.cs b/src/MAVN.Service.NotificationSystemAdapter.DomainServices/KeysService.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.Dictionaries.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.Dictionaries.Client;
 using MAVN.Service.NotificationSystemAdapter.Domain.Services;
-using Lykke.Service.PushNotifications.Client;
+using MAVN.Service.PushNotifications.Client;
 using Newtonsoft.Json;
 
 namespace MAVN.Service.NotificationSystemAdapter.DomainServices

diff --git a/...SystemAdapter.DomainServices/MAVN.Service.NotificationSystemAdapter.DomainServices.csproj b/...SystemAdapter.DomainServices/MAVN.Service.NotificationSystemAdapter.DomainServices.csproj
@@ -4,9 +4,9 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.CustomerProfile.Client" Version="7.7.0" />
-    <PackageReference Include="Falcon.Service.PushNotifications.Client" Version="2.0.0" />
-    <PackageReference Include="Falcon.Service.Dictionaries.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.2.0" />
+    <PackageReference Include="MAVN.Service.Dictionaries.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.PushNotifications.Client" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.NotificationSystemAdapter.Domain\MAVN.Service.NotificationSystemAdapter.Domain.csproj" />

diff --git a/src/MAVN.Service.NotificationSystemAdapter/MAVN.Service.NotificationSystemAdapter.csproj b/src/MAVN.Service.NotificationSystemAdapter/MAVN.Service.NotificationSystemAdapter.csproj
@@ -21,8 +21,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.PushNotifications.Client" Version="2.0.0" />
-    <PackageReference Include="Falcon.Service.Sessions.Client" Version="4.0.0" />
     <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />

diff --git a/src/MAVN.Service.NotificationSystemAdapter/Modules/ServiceModule.cs b/src/MAVN.Service.NotificationSystemAdapter/Modules/ServiceModule.cs
@@ -1,11 +1,11 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.Dictionaries.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.Dictionaries.Client;
 using MAVN.Service.NotificationSystemAdapter.Infrastructure;
 using MAVN.Service.NotificationSystemAdapter.Infrastructure.Authentication;
 using MAVN.Service.NotificationSystemAdapter.Settings;
-using Lykke.Service.PushNotifications.Client;
+using MAVN.Service.PushNotifications.Client;
 using Lykke.SettingsReader;
 
 namespace MAVN.Service.NotificationSystemAdapter.Modules

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

diff --git a/tests/MAVN.Service.NotificationSystemAdapter.Tests/KeysServiceTests.cs b/tests/MAVN.Service.NotificationSystemAdapter.Tests/KeysServiceTests.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Castle.Core.Internal;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.CustomerProfile.Client.Models.Responses;
-using Lykke.Service.Dictionaries.Client;
-using Lykke.Service.Dictionaries.Client.Models.Notifications;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client.Models.Responses;
+using MAVN.Service.Dictionaries.Client;
+using MAVN.Service.Dictionaries.Client.Models.Notifications;
 using MAVN.Service.NotificationSystemAdapter.Domain.Services;
 using MAVN.Service.NotificationSystemAdapter.DomainServices;
-using Lykke.Service.PushNotifications.Client;
-using Lykke.Service.PushNotifications.Client.Models.Responses;
+using MAVN.Service.PushNotifications.Client;
+using MAVN.Service.PushNotifications.Client.Models.Responses;
 using Moq;
 using Newtonsoft.Json;
 using Xunit;
@@ -45,7 +45,7 @@ public async Task
                 .ReturnsAsync(
                     new CustomerProfileResponse
                     {
-                        Profile = new CustomerProfile
+                        Profile = new CustomerProfile.Client.Models.Responses.CustomerProfile
                         {
                             FirstName = "test", LastName = "test", Email = "test", PhoneNumber = "test"
                         }