Skip to content

Commit

Permalink
Merge pull request #18 from IliyanIlievPH/17
Browse files Browse the repository at this point in the history 
Closes #17
  • Loading branch information
@thelittledevops
thelittledevops committed May 11, 2020
2 parents b6d4deb + 60c7686 commit 1eebeed
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 33 deletions.
3 changes: 2 additions & 1 deletion src/MAVN.Service.AdminManagement.Domain/MAVN.Service.AdminManagement.Domain.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Lykke.Common" Version="7.5.0" />
<PackageReference Include="Falcon.Service.NotificationSystem.SubscriberContract" Version="1.0.2" />
<PackageReference Include="MAVN.Common" Version="1.0.0" />
<PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/MAVN.Service.AdminManagement.DomainServices/AdminUserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
using System.Net;
using System.Threading.Tasks;
using Common.Log;
using Falcon.Common;
using MAVN.Common;
using Lykke.Common.ApiLibrary.Exceptions;
using Lykke.Common.Log;
using MAVN.Service.AdminManagement.Domain.Enums;
using MAVN.Service.AdminManagement.Domain.Models;
using MAVN.Service.AdminManagement.Domain.Repositories;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.Credentials.Client;
using Lykke.Service.Credentials.Client.Models.Requests;
using Lykke.Service.Credentials.Client.Models.Responses;
using MAVN.Service.Credentials.Client;
using MAVN.Service.Credentials.Client.Models.Requests;
using MAVN.Service.Credentials.Client.Models.Responses;
using MAVN.Service.CustomerProfile.Client;
using MAVN.Service.CustomerProfile.Client.Models.Enums;
using MAVN.Service.CustomerProfile.Client.Models.Requests;
Expand Down
10 changes: 5 additions & 5 deletions src/MAVN.Service.AdminManagement.DomainServices/AuthService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
using Common.Log;
using Lykke.Common.ApiLibrary.Exceptions;
using Lykke.Common.Log;
using Lykke.Service.Credentials.Client;
using MAVN.Service.Credentials.Client;
using MAVN.Service.AdminManagement.Domain.Enums;
using MAVN.Service.AdminManagement.Domain.Models;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.Credentials.Client.Models.Requests;
using Lykke.Service.Credentials.Client.Models.Responses;
using Lykke.Service.Sessions.Client;
using Lykke.Service.Sessions.Client.Models;
using MAVN.Service.Credentials.Client.Models.Requests;
using MAVN.Service.Credentials.Client.Models.Responses;
using MAVN.Service.Sessions.Client;
using MAVN.Service.Sessions.Client.Models;

namespace MAVN.Service.AdminManagement.DomainServices
{
Expand Down
7 changes: 4 additions & 3 deletions ...Service.AdminManagement.DomainServices/MAVN.Service.AdminManagement.DomainServices.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="9.0.0" />
<PackageReference Include="Falcon.Common" Version="0.2.2" />
<PackageReference Include="Falcon.Service.Credentials.Client" Version="7.10.0" />
<PackageReference Include="Falcon.Service.Sessions.Client" Version="4.0.0" />
<PackageReference Include="Lykke.Common.Redis" Version="1.0.2" />
<PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
<PackageReference Include="MAVN.Common" Version="1.0.0" />
<PackageReference Include="MAVN.Service.Credentials.Client" Version="1.0.1" />
<PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.1.0" />
<PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
<PackageReference Include="MAVN.Service.Sessions.Client" Version="1.0.1" />
<PackageReference Include="StackExchange.Redis" Version="2.1.30" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MAVN.Service.AdminManagement.DomainServices/NotificationsService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Lykke.Common;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.AdminManagement.Domain.Enums;
using MAVN.Service.AdminManagement.Domain.Models.Emails;

Expand Down
2 changes: 1 addition & 1 deletion ...e.AdminManagement.MsSqlRepositories/MAVN.Service.AdminManagement.MsSqlRepositories.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,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.Tools" Version="2.2.4">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/MAVN.Service.AdminManagement.MsSqlRepositories/Repositories/AdminUsersRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
using AutoMapper;
using Falcon.Common;
using MAVN.Common;
using Lykke.Common.MsSql;
using MAVN.Service.AdminManagement.Domain.Models;
using MAVN.Service.AdminManagement.Domain.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/MAVN.Service.AdminManagement/Managers/ShutdownManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Lykke.Sdk;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.AdminManagement.Contract.Events;

namespace MAVN.Service.AdminManagement.Managers
Expand Down
2 changes: 1 addition & 1 deletion src/MAVN.Service.AdminManagement/Managers/StartupManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Sdk;
using Lykke.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.AdminManagement.Contract.Events;

namespace MAVN.Service.AdminManagement.Managers
Expand Down
2 changes: 1 addition & 1 deletion src/MAVN.Service.AdminManagement/Modules/RabbitMqModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using MAVN.Service.AdminManagement.Domain.Services;
using MAVN.Service.AdminManagement.DomainServices;
using MAVN.Service.AdminManagement.Settings;
using Lykke.Service.NotificationSystem.SubscriberContract;
using MAVN.Service.NotificationSystem.SubscriberContract;
using Lykke.SettingsReader;
using MAVN.Service.AdminManagement.Contract.Events;

Expand Down
4 changes: 2 additions & 2 deletions src/MAVN.Service.AdminManagement/Modules/ServiceModule.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Autofac;
using JetBrains.Annotations;
using Lykke.Sdk;
using Lykke.Service.Credentials.Client;
using MAVN.Service.Credentials.Client;
using MAVN.Service.AdminManagement.Domain.Services;
using MAVN.Service.AdminManagement.DomainServices;
using MAVN.Service.AdminManagement.Managers;
using MAVN.Service.AdminManagement.Settings;
using MAVN.Service.CustomerProfile.Client;
using Lykke.Service.Sessions.Client;
using MAVN.Service.Sessions.Client;
using Lykke.SettingsReader;
using StackExchange.Redis;
using MAVN.Service.AdminManagement.Domain.Models;
Expand Down
6 changes: 3 additions & 3 deletions src/MAVN.Service.AdminManagement/Settings/AppSettings.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using JetBrains.Annotations;
using JetBrains.Annotations;
using Lykke.Sdk.Settings;
using Lykke.Service.Credentials.Client;
using MAVN.Service.Credentials.Client;
using MAVN.Service.CustomerProfile.Client;
using Lykke.Service.Sessions.Client;
using MAVN.Service.Sessions.Client;

namespace MAVN.Service.AdminManagement.Settings
{
Expand Down
8 changes: 4 additions & 4 deletions tests/MAVN.Service.AdminManagement.DomainServices.Tests/AdminUsersServiceTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Falcon.Common;
using MAVN.Common;
using Lykke.Logs;
using MAVN.Service.AdminManagement.Domain.Enums;
using MAVN.Service.AdminManagement.Domain.Models;
using MAVN.Service.AdminManagement.Domain.Repositories;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.Credentials.Client;
using Lykke.Service.Credentials.Client.Models.Requests;
using Lykke.Service.Credentials.Client.Models.Responses;
using MAVN.Service.Credentials.Client;
using MAVN.Service.Credentials.Client.Models.Requests;
using MAVN.Service.Credentials.Client.Models.Responses;
using MAVN.Service.CustomerProfile.Client;
using MAVN.Service.CustomerProfile.Client.Models.Enums;
using MAVN.Service.CustomerProfile.Client.Models.Requests;
Expand Down
10 changes: 5 additions & 5 deletions tests/MAVN.Service.AdminManagement.DomainServices.Tests/AuthServiceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
using MAVN.Service.AdminManagement.Domain.Enums;
using MAVN.Service.AdminManagement.Domain.Models;
using MAVN.Service.AdminManagement.Domain.Services;
using Lykke.Service.Credentials.Client;
using Lykke.Service.Credentials.Client.Models.Requests;
using Lykke.Service.Credentials.Client.Models.Responses;
using Lykke.Service.Sessions.Client;
using Lykke.Service.Sessions.Client.Models;
using MAVN.Service.Credentials.Client;
using MAVN.Service.Credentials.Client.Models.Requests;
using MAVN.Service.Credentials.Client.Models.Responses;
using MAVN.Service.Sessions.Client;
using MAVN.Service.Sessions.Client.Models;
using Moq;
using Xunit;

Expand Down

0 comments on commit 1eebeed

Please sign in to comment.