Merge pull request #8 from IliyanIlievPH/2

update nuget and adjust namespaces
OpenMAVN · May 12, 2020 · d13e70d · d13e70d
2 parents 5820c9c + bea5ae6
commit d13e70d
Show file tree

Hide file tree

Showing 35 changed files with 82 additions and 83 deletions.
diff --git a/client/MAVN.Service.SmsProviderMock.Client/AutofacExtension.cs b/client/MAVN.Service.SmsProviderMock.Client/AutofacExtension.cs
@@ -1,10 +1,10 @@
+using System;
 using Autofac;
 using JetBrains.Annotations;
 using Lykke.HttpClientGenerator;
 using Lykke.HttpClientGenerator.Infrastructure;
-using System;
 
-namespace Lykke.Service.SmsProviderMock.Client
+namespace MAVN.Service.SmsProviderMock.Client
 {
     /// <summary>
     /// Extension for client registration
@@ -30,7 +30,7 @@ public static class AutofacExtension
             if (string.IsNullOrWhiteSpace(settings.ServiceUrl))
                 throw new ArgumentException("Value cannot be null or whitespace.", nameof(SmsProviderMockServiceClientSettings.ServiceUrl));
 
-            var clientBuilder = HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
+            var clientBuilder = Lykke.HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
                 .WithAdditionalCallsWrapper(new ExceptionHandlerCallsWrapper());
 
             clientBuilder = builderConfigure?.Invoke(clientBuilder) ?? clientBuilder.WithoutRetries();

diff --git a/client/MAVN.Service.SmsProviderMock.Client/ISmsProviderMockApi.cs b/client/MAVN.Service.SmsProviderMock.Client/ISmsProviderMockApi.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Lykke.Service.SmsProviderMock.Client.Models;
+using MAVN.Service.SmsProviderMock.Client.Models;
 using Refit;
 
-namespace Lykke.Service.SmsProviderMock.Client
+namespace MAVN.Service.SmsProviderMock.Client
 {
     /// <summary>
     /// SmsProviderMock client API interface.

diff --git a/client/MAVN.Service.SmsProviderMock.Client/ISmsProviderMockClient.cs b/client/MAVN.Service.SmsProviderMock.Client/ISmsProviderMockClient.cs
@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
-namespace Lykke.Service.SmsProviderMock.Client
+namespace MAVN.Service.SmsProviderMock.Client
 {
     /// <summary>
     /// SmsProviderMock client interface.

diff --git a/client/MAVN.Service.SmsProviderMock.Client/MAVN.Service.SmsProviderMock.Client.csproj b/client/MAVN.Service.SmsProviderMock.Client/MAVN.Service.SmsProviderMock.Client.csproj
@@ -14,8 +14,8 @@
     <None Remove="Lykke.Service.SmsProviderMock.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.NotificationSystemBroker.SmsProviderClient" Version="1.0.1" />
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
     <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="MAVN.Service.NotificationSystemBroker.SmsProviderClient" Version="1.1.1" />
   </ItemGroup>
 </Project>
diff --git a/client/MAVN.Service.SmsProviderMock.Client/Models/PaginatedSmsRequestModel.cs b/client/MAVN.Service.SmsProviderMock.Client/Models/PaginatedSmsRequestModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Lykke.Service.SmsProviderMock.Client.Models
+namespace MAVN.Service.SmsProviderMock.Client.Models
 {
     /// <summary>
     /// Model used for requesting paginated data for sms

diff --git a/client/MAVN.Service.SmsProviderMock.Client/Models/PaginatedSmsResponseModel.cs b/client/MAVN.Service.SmsProviderMock.Client/Models/PaginatedSmsResponseModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Lykke.Service.SmsProviderMock.Client.Models
+namespace MAVN.Service.SmsProviderMock.Client.Models
 {
     /// <summary>
     /// Gives the List of Sms on the desired Page and information about the Page

diff --git a/client/MAVN.Service.SmsProviderMock.Client/Models/SmsResponseModel.cs b/client/MAVN.Service.SmsProviderMock.Client/Models/SmsResponseModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Lykke.Service.SmsProviderMock.Client.Models
+namespace MAVN.Service.SmsProviderMock.Client.Models
 {
     /// <summary>
     /// Represents an sms

diff --git a/client/MAVN.Service.SmsProviderMock.Client/SmsProviderMockClient.cs b/client/MAVN.Service.SmsProviderMock.Client/SmsProviderMockClient.cs
@@ -1,7 +1,7 @@
-using Lykke.HttpClientGenerator;
-using Lykke.Service.NotificationSystemBroker.SmsProviderClient;
+using Lykke.HttpClientGenerator;
+using MAVN.Service.NotificationSystemBroker.SmsProviderClient;
 
-namespace Lykke.Service.SmsProviderMock.Client
+namespace MAVN.Service.SmsProviderMock.Client
 {
     /// <summary>
     /// SmsProviderMock API aggregating interface.
@@ -16,7 +16,7 @@ public class SmsProviderMockClient : ISmsProviderMockClient
         /// <summary>
         /// Interface to SmsProvider Api.
         /// </summary>
-        public ISmsProvider Api { get; private set; }
+        public ISmsProviderApi Api { get; private set; }
 
         /// <summary>C-tor</summary>
         public SmsProviderMockClient(IHttpClientGenerator httpClientGenerator)

diff --git a/client/MAVN.Service.SmsProviderMock.Client/SmsProviderMockServiceClientSettings.cs b/client/MAVN.Service.SmsProviderMock.Client/SmsProviderMockServiceClientSettings.cs
@@ -1,6 +1,6 @@
 using Lykke.SettingsReader.Attributes;
 
-namespace Lykke.Service.SmsProviderMock.Client 
+namespace MAVN.Service.SmsProviderMock.Client 
 {
     /// <summary>
     /// SmsProviderMock client settings.

diff --git a/src/MAVN.Service.SmsProviderMock.Domain/Entities/ISms.cs b/src/MAVN.Service.SmsProviderMock.Domain/Entities/ISms.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Lykke.Service.SmsProviderMock.Domain.Entities
+namespace MAVN.Service.SmsProviderMock.Domain.Entities
 {
     public interface ISms
     {

diff --git a/src/MAVN.Service.SmsProviderMock.Domain/Models/PaginatedSmsModel.cs b/src/MAVN.Service.SmsProviderMock.Domain/Models/PaginatedSmsModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Lykke.Service.SmsProviderMock.Domain.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Entities;
 
-namespace Lykke.Service.SmsProviderMock.Domain.Models
+namespace MAVN.Service.SmsProviderMock.Domain.Models
 {
     public class PaginatedSmsModel
     {

diff --git a/src/MAVN.Service.SmsProviderMock.Domain/Repositories/ISmsRepository.cs b/src/MAVN.Service.SmsProviderMock.Domain/Repositories/ISmsRepository.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Lykke.Service.SmsProviderMock.Domain.Entities;
-using Lykke.Service.SmsProviderMock.Domain.Models;
+using MAVN.Service.SmsProviderMock.Domain.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Models;
 
-namespace Lykke.Service.SmsProviderMock.Domain.Repositories
+namespace MAVN.Service.SmsProviderMock.Domain.Repositories
 {
     public interface ISmsRepository
     {

diff --git a/src/MAVN.Service.SmsProviderMock.Domain/Services/ISmsService.cs b/src/MAVN.Service.SmsProviderMock.Domain/Services/ISmsService.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using Lykke.Service.SmsProviderMock.Domain.Models;
+using MAVN.Service.SmsProviderMock.Domain.Models;
 
-namespace Lykke.Service.SmsProviderMock.Domain.Services
+namespace MAVN.Service.SmsProviderMock.Domain.Services
 {
     public interface ISmsService
     {

diff --git a/src/MAVN.Service.SmsProviderMock.DomainServices/AutofacModule.cs b/src/MAVN.Service.SmsProviderMock.DomainServices/AutofacModule.cs
@@ -1,8 +1,8 @@
 using Autofac;
-using Lykke.Service.SmsProviderMock.Domain.Services;
-using Lykke.Service.SmsProviderMock.DomainServices.Services;
+using MAVN.Service.SmsProviderMock.Domain.Services;
+using MAVN.Service.SmsProviderMock.DomainServices.Services;
 
-namespace Lykke.Service.SmsProviderMock.DomainServices
+namespace MAVN.Service.SmsProviderMock.DomainServices
 {
     public class AutofacModule : Module
     {

diff --git a/src/MAVN.Service.SmsProviderMock.DomainServices/Services/SmsService.cs b/src/MAVN.Service.SmsProviderMock.DomainServices/Services/SmsService.cs
@@ -3,11 +3,11 @@
 using AutoMapper;
 using Common.Log;
 using Lykke.Common.Log;
-using Lykke.Service.SmsProviderMock.Domain.Models;
-using Lykke.Service.SmsProviderMock.Domain.Repositories;
-using Lykke.Service.SmsProviderMock.Domain.Services;
+using MAVN.Service.SmsProviderMock.Domain.Models;
+using MAVN.Service.SmsProviderMock.Domain.Repositories;
+using MAVN.Service.SmsProviderMock.Domain.Services;
 
-namespace Lykke.Service.SmsProviderMock.DomainServices.Services
+namespace MAVN.Service.SmsProviderMock.DomainServices.Services
 {
     public class SmsService : ISmsService
     {

diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Entities/SmsEntity.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Entities/SmsEntity.cs
@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Lykke.Service.SmsProviderMock.Domain.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Entities;
 
-namespace Lykke.Service.SmsProviderMock.MsSqlRepositories.Entities
+namespace MAVN.Service.SmsProviderMock.MsSqlRepositories.Entities
 {
     [Table("sms")]
     public class SmsEntity : ISms

diff --git a/....SmsProviderMock.MsSqlRepositories/Migrations/20190611125621_InitialMigration.Designer.cs b/....SmsProviderMock.MsSqlRepositories/Migrations/20190611125621_InitialMigration.Designer.cs
diff --git a/...derMock.MsSqlRepositories/Migrations/20190722124119_IncreaseMaxLengthForPhone.Designer.cs b/...derMock.MsSqlRepositories/Migrations/20190722124119_IncreaseMaxLengthForPhone.Designer.cs
diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Migrations/SmsContextModelSnapshot.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Migrations/SmsContextModelSnapshot.cs
@@ -1,12 +1,11 @@
 // <auto-generated />
+
 using System;
-using Lykke.Service.SmsProviderMock.MsSqlRepositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace Lykke.Service.SmsProviderMock.MsSqlRepositories.Migrations
+namespace MAVN.Service.SmsProviderMock.MsSqlRepositories.Migrations
 {
     [DbContext(typeof(SmsContext))]
     partial class SmsContextModelSnapshot : ModelSnapshot

diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Repositories/SmsRepository.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Repositories/SmsRepository.cs
@@ -5,13 +5,13 @@
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.Common.MsSql;
-using Lykke.Service.SmsProviderMock.Domain.Entities;
-using Lykke.Service.SmsProviderMock.Domain.Models;
-using Lykke.Service.SmsProviderMock.Domain.Repositories;
-using Lykke.Service.SmsProviderMock.MsSqlRepositories.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Models;
+using MAVN.Service.SmsProviderMock.Domain.Repositories;
+using MAVN.Service.SmsProviderMock.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace Lykke.Service.SmsProviderMock.MsSqlRepositories.Repositories
+namespace MAVN.Service.SmsProviderMock.MsSqlRepositories.Repositories
 {
     public class SmsRepository : ISmsRepository
     {

diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/SmsContext.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/SmsContext.cs
@@ -1,10 +1,10 @@
 using System.Data.Common;
 using JetBrains.Annotations;
 using Lykke.Common.MsSql;
-using Lykke.Service.SmsProviderMock.MsSqlRepositories.Entities;
+using MAVN.Service.SmsProviderMock.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace Lykke.Service.SmsProviderMock.MsSqlRepositories
+namespace MAVN.Service.SmsProviderMock.MsSqlRepositories
 {
     public class SmsContext : MsSqlContext
     {

diff --git a/src/MAVN.Service.SmsProviderMock/Controllers/SmsProviderMockController.cs b/src/MAVN.Service.SmsProviderMock/Controllers/SmsProviderMockController.cs
@@ -1,20 +1,20 @@
-using System;
+using System;
 using System.Net;
 using System.Threading.Tasks;
 using AutoMapper;
-using Lykke.Service.NotificationSystemBroker.SmsProviderClient;
-using Lykke.Service.NotificationSystemBroker.SmsProviderClient.Enums;
-using Lykke.Service.SmsProviderMock.Client;
-using Lykke.Service.SmsProviderMock.Client.Models;
-using Lykke.Service.SmsProviderMock.Domain.Services;
+using MAVN.Service.NotificationSystemBroker.SmsProviderClient;
+using MAVN.Service.NotificationSystemBroker.SmsProviderClient.Enums;
+using MAVN.Service.SmsProviderMock.Client;
+using MAVN.Service.SmsProviderMock.Client.Models;
+using MAVN.Service.SmsProviderMock.Domain.Services;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 
-namespace Lykke.Service.SmsProviderMock.Controllers
+namespace MAVN.Service.SmsProviderMock.Controllers
 {
     [Route("/api/")]
     [ApiController]
-    public class SmsProviderMockController : Controller, ISmsProviderMockApi, ISmsProvider
+    public class SmsProviderMockController : Controller, ISmsProviderMockApi, ISmsProviderApi
     {
         private readonly ISmsService _smsService;
         private readonly IMapper _mapper;

diff --git a/src/MAVN.Service.SmsProviderMock/Controllers/SmsVisualizationController.cs b/src/MAVN.Service.SmsProviderMock/Controllers/SmsVisualizationController.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Lykke.Service.SmsProviderMock.Domain.Repositories;
+using MAVN.Service.SmsProviderMock.Domain.Repositories;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Lykke.Service.SmsProviderMock.Controllers
+namespace MAVN.Service.SmsProviderMock.Controllers
 {
     [Route("/sentsms")]
     [ApiExplorerSettings(IgnoreApi = true)]

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

diff --git a/src/MAVN.Service.SmsProviderMock/Modules/ServiceModule.cs b/src/MAVN.Service.SmsProviderMock/Modules/ServiceModule.cs
@@ -1,7 +1,7 @@
 using Autofac;
 using JetBrains.Annotations;
 
-namespace Lykke.Service.SmsProviderMock.Modules
+namespace MAVN.Service.SmsProviderMock.Modules
 {
     [UsedImplicitly]
     public class ServiceModule : Module

diff --git a/src/MAVN.Service.SmsProviderMock/Profiles/ServiceProfile.cs b/src/MAVN.Service.SmsProviderMock/Profiles/ServiceProfile.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
-using Lykke.Service.SmsProviderMock.Client.Models;
-using Lykke.Service.SmsProviderMock.Domain.Entities;
-using Lykke.Service.SmsProviderMock.Domain.Models;
+using MAVN.Service.SmsProviderMock.Client.Models;
+using MAVN.Service.SmsProviderMock.Domain.Entities;
+using MAVN.Service.SmsProviderMock.Domain.Models;
 
-namespace Lykke.Service.SmsProviderMock.Profiles
+namespace MAVN.Service.SmsProviderMock.Profiles
 {
     public class ServiceProfile : Profile
     {

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

diff --git a/src/MAVN.Service.SmsProviderMock/Settings/AppSettings.cs b/src/MAVN.Service.SmsProviderMock/Settings/AppSettings.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Lykke.Sdk.Settings;
 
-namespace Lykke.Service.SmsProviderMock.Settings
+namespace MAVN.Service.SmsProviderMock.Settings
 {
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public class AppSettings : BaseAppSettings

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

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

diff --git a/src/MAVN.Service.SmsProviderMock/Startup.cs b/src/MAVN.Service.SmsProviderMock/Startup.cs
@@ -3,12 +3,12 @@
 using JetBrains.Annotations;
 using Lykke.Common.ApiLibrary.Filters;
 using Lykke.Sdk;
-using Lykke.Service.SmsProviderMock.Profiles;
-using Lykke.Service.SmsProviderMock.Settings;
+using MAVN.Service.SmsProviderMock.Profiles;
+using MAVN.Service.SmsProviderMock.Settings;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Lykke.Service.SmsProviderMock
+namespace MAVN.Service.SmsProviderMock
 {
     [UsedImplicitly]
     public class Startup

diff --git a/src/MAVN.Service.SmsProviderMock/Views/SmsVisualization/Details.cshtml b/src/MAVN.Service.SmsProviderMock/Views/SmsVisualization/Details.cshtml
@@ -1,4 +1,4 @@
-@model Lykke.Service.SmsProviderMock.Domain.Entities.ISms
+@model MAVN.Service.SmsProviderMock.Domain.Entities.ISms
 
 <h1>
     @Model.PhoneNumber