LykkeBusiness · tarurar · Nov 11, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 15, 2024
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,7 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageVersion Include="Autofac.Extras.Moq" Version="6.1.0" />
         <PackageVersion Include="Autofac" Version="8.0.0" />
         <PackageVersion Include="AutoMapper" Version="13.0.1" />
@@ -15,31 +15,29 @@
         <PackageVersion Include="FluentScheduler" Version="5.5.1" />
         <PackageVersion Include="FsCheck.NUnit" Version="2.16.5" />
         <PackageVersion Include="Lykke.AzureStorage" Version="8.13.4" />
-        <PackageVersion Include="Lykke.Contracts" Version="3.0.0" />
-        <PackageVersion Include="Lykke.MarginTrading.AccountsManagement.Contracts" Version="7.16.0" />
-        <PackageVersion Include="Lykke.MarginTrading.AssetService.Contracts" Version="11.7.6" />
-        <PackageVersion Include="Lykke.MarginTrading.BookKeeper.Contracts" Version="1.6.1" />
-        <PackageVersion Include="Lykke.MarginTrading.OrderbookAggregator.Contracts" Version="1.0.1" />
-        <PackageVersion Include="Lykke.MarginTrading.OrderBookService.Contracts" Version="1.6.1" />
+        <PackageVersion Include="Lykke.Contracts" Version="4.0.1" />
+        <PackageVersion Include="Lykke.MarginTrading.AccountsManagement.Contracts" Version="8.0.1" />
+        <PackageVersion Include="Lykke.MarginTrading.AssetService.Contracts" Version="13.0.2" />
+        <PackageVersion Include="Lykke.MarginTrading.BookKeeper.Contracts" Version="2.0.0" />
+        <PackageVersion Include="Lykke.MarginTrading.OrderBookService.Contracts" Version="2.0.0" />
         <PackageVersion Include="Lykke.Rocks.Caching" Version="1.0.0" />
         <PackageVersion Include="Lykke.Service.ClientAccount.Client" Version="3.2.0" />
         <PackageVersion Include="Lykke.Service.EmailSender" Version="1.1.0" />
         <PackageVersion Include="Lykke.Service.Session" Version="16.0.0" />
         <PackageVersion Include="Lykke.Snow.Common.Startup" Version="4.0.0" />
-        <PackageVersion Include="Lykke.Snow.Common" Version="4.0.3" />
-        <PackageVersion Include="Lykke.Snow.Domain" Version="3.0.0" />
-        <PackageVersion Include="Lykke.Snow.Mdm.Contracts" Version="4.3.6" />
+        <PackageVersion Include="Lykke.Snow.Common" Version="5.0.1" />
+        <PackageVersion Include="Lykke.Snow.Domain" Version="4.0.0" />
+        <PackageVersion Include="Lykke.Snow.Mdm.Contracts" Version="5.0.2" />
         <PackageVersion Include="LykkeBiz.HttpClientGenerator" Version="6.0.0" />
         <PackageVersion Include="LykkeBiz.Logs.MsSql" Version="4.0.0" />
         <PackageVersion Include="LykkeBiz.Logs.Serilog" Version="3.3.3" />
-        <PackageVersion Include="LykkeBiz.MarginTrading.BrokerBase" Version="8.6.0" />
-        <PackageVersion Include="LykkeBiz.Messaging.RabbitMq" Version="9.0.0" />
-        <PackageVersion Include="LykkeBiz.RabbitMqBroker" Version="14.0.0" />
-        <PackageVersion Include="LykkeBiz.SettingsReader" Version="9.0.0" />
-        <PackageVersion Include="LykkeBiz.Snow.Cqrs" Version="5.1.0" />
-        <PackageVersion Include="MessagePack" Version="1.9.11" />
+        <PackageVersion Include="LykkeBiz.MarginTrading.BrokerBase" Version="8.7.0" />
+        <PackageVersion Include="LykkeBiz.Messaging.RabbitMq" Version="10.0.1" />
+        <PackageVersion Include="LykkeBiz.RabbitMqBroker" Version="16.0.0" />
+        <PackageVersion Include="LykkeBiz.SettingsReader" Version="9.0.1" />
+        <PackageVersion Include="LykkeBiz.Snow.Cqrs" Version="7.0.1" />
         <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-        <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.7" />
+        <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
         <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
         <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
@@ -62,10 +60,9 @@
         <PackageVersion Include="Refit" Version="5.2.4" />
         <PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
         <PackageVersion Include="StackExchange.Redis" Version="2.6.66" />
-        <PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.6.2" />
+        <PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.7.0" />
         <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
         <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
-        <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
         <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     </ItemGroup>

diff --git a/src/MarginTrading.Backend.Contracts/MarginTrading.Backend.Contracts.csproj b/src/MarginTrading.Backend.Contracts/MarginTrading.Backend.Contracts.csproj
@@ -14,11 +14,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.Contracts" />
-    <PackageReference Include="MessagePack" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Refit" />
-    <PackageReference Include="System.ComponentModel.Annotations" />
   </ItemGroup>
 </Project>
diff --git a/src/MarginTrading.Backend.Core/MarginTrading.Backend.Core.csproj b/src/MarginTrading.Backend.Core/MarginTrading.Backend.Core.csproj
@@ -14,7 +14,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.MarginTrading.AssetService.Contracts" />
-    <PackageReference Include="Lykke.MarginTrading.OrderbookAggregator.Contracts" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Refit" />

diff --git a/...rginTrading.Backend.Services/Events/ExternalContracts/ExternalExchangeOrderBookMessage.cs b/...rginTrading.Backend.Services/Events/ExternalContracts/ExternalExchangeOrderBookMessage.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+using JetBrains.Annotations;
+
+using MessagePack;
+
+using Newtonsoft.Json;
+
+namespace MarginTrading.Backend.Services.Events.ExternalContracts;
+
+[MessagePackObject]
+public class ExternalExchangeOrderbookMessage
+{
+    [JsonProperty("source"), Key(0), CanBeNull]
+    public string ExchangeName { get; set; }
+
+    [JsonProperty("asset"), Key(1), CanBeNull]
+    public string AssetPairId { get; set; }
+
+    [JsonProperty("timestamp"), Key(2)]
+    public DateTime Timestamp { get; set; }
+
+    [JsonProperty("asks"), Key(3), ItemCanBeNull]
+    public List<VolumePrice> Asks { get; set; }
+
+    [JsonProperty("bids"), Key(4), ItemCanBeNull]
+    public List<VolumePrice> Bids { get; set; }
+}
diff --git a/src/MarginTrading.Backend.Services/Events/ExternalContracts/VolumePrice.cs b/src/MarginTrading.Backend.Services/Events/ExternalContracts/VolumePrice.cs
@@ -0,0 +1,15 @@
+using MessagePack;
+
+using Newtonsoft.Json;
+
+namespace MarginTrading.Backend.Services.Events.ExternalContracts;
+
+[MessagePackObject]
+public class VolumePrice
+{
+    [JsonProperty("volume"), Key(0)]
+    public decimal Volume { get; set; }
+
+    [JsonProperty("price"), Key(1)]
+    public decimal Price { get; set; }
+}
diff --git a/src/MarginTrading.Backend.Services/Events/FxRateExternalExchangeOrderbookMessage.cs b/src/MarginTrading.Backend.Services/Events/FxRateExternalExchangeOrderbookMessage.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2019 Lykke Corp.
 // See the LICENSE file in the project root for more information.
 
-using MarginTrading.OrderbookAggregator.Contracts.Messages;
+using MarginTrading.Backend.Services.Events.ExternalContracts;
 
 namespace MarginTrading.Backend.Services.Events
 {

diff --git a/src/MarginTrading.Backend.Services/Events/StpAggregatorExternalExchangeOrderbookMessage.cs b/src/MarginTrading.Backend.Services/Events/StpAggregatorExternalExchangeOrderbookMessage.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2019 Lykke Corp.
 // See the LICENSE file in the project root for more information.
 
-using MarginTrading.OrderbookAggregator.Contracts.Messages;
+using MarginTrading.Backend.Services.Events.ExternalContracts;
 
 namespace MarginTrading.Backend.Services.Events
 {

diff --git a/src/MarginTrading.Backend.Services/MarginTrading.Backend.Services.csproj b/src/MarginTrading.Backend.Services/MarginTrading.Backend.Services.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="Lykke.MarginTrading.AccountsManagement.Contracts" />
     <PackageReference Include="Lykke.MarginTrading.AssetService.Contracts" />
     <PackageReference Include="Lykke.MarginTrading.BookKeeper.Contracts" />
-    <PackageReference Include="Lykke.MarginTrading.OrderbookAggregator.Contracts" />
     <PackageReference Include="Lykke.MarginTrading.OrderBookService.Contracts" />
     <PackageReference Include="Lykke.Rocks.Caching" />
     <PackageReference Include="Lykke.Snow.Domain" />

diff --git a/src/MarginTrading.Backend.Services/Services/ConvertService.cs b/src/MarginTrading.Backend.Services/Services/ConvertService.cs
@@ -55,7 +55,7 @@ private static IMapper CreateMapper()
 
                 cfg.CreateMap<VolumePriceContract, VolumePrice>();
                 cfg.CreateMap<ExternalOrderBookContract, ExternalOrderBook>();
-                cfg.CreateMap<MarginTrading.OrderbookAggregator.Contracts.Messages.VolumePrice, VolumePrice>();
+                cfg.CreateMap<Events.ExternalContracts.VolumePrice, VolumePrice>();
                 cfg.CreateMap<StpAggregatorExternalExchangeOrderbookMessage, ExternalOrderBook>();
 
                 cfg.CreateMap<IAccountMarginFreezing, AccountMarginFreezingEntity>();

diff --git a/src/MarginTrading.Backend/MessageHandlers/FxRateExternalExchangeOrderbookHandler.cs b/src/MarginTrading.Backend/MessageHandlers/FxRateExternalExchangeOrderbookHandler.cs
@@ -17,9 +17,9 @@
 using MarginTrading.Backend.Core.Settings;
 using MarginTrading.Backend.Services.AssetPairs;
 using MarginTrading.Backend.Services.Events;
+using MarginTrading.Backend.Services.Events.ExternalContracts;
 using MarginTrading.Backend.Services.Stp;
 using MarginTrading.Common.Extensions;
-using MarginTrading.OrderbookAggregator.Contracts.Messages;
 
 using Microsoft.Extensions.Logging;
 

diff --git a/src/MarginTrading.Backend/Startup.cs b/src/MarginTrading.Backend/Startup.cs
@@ -200,14 +200,14 @@ await ApplicationContainer
                         .Resolve<IConfigurationValidator>()
                         .WarnIfInvalidAsync();
 
-                    ApplicationContainer
+                    await ApplicationContainer
                         .Resolve<IClientProfileSettingsCache>()
-                        .Start();
+                        .StartAsync();
 
                     ApplicationContainer
                         .Resolve<ICqrsEngine>()
                         .StartAll();
-
+                    
                     Program.AppHost.WriteLogs(Environment, LogLocator.CommonLog);
                     LogLocator.CommonLog?.WriteMonitorAsync("", "", $"{Configuration.ServerType()} Started");
                 }
@@ -366,11 +366,11 @@ private StartupDeduplicationService RunHealthChecks(IConnectionMultiplexer redis
 
             return deduplicationService;
         }
-
+        
         private static void OverrideEmptyRabbitMqConnectionStrings(MtBackendSettings cfg)
         {
             var defaultRabbitMqConnString = cfg.MtBackend.MtRabbitMqConnString;
-
+            
             // set main RabbitMq connection string if it was not configured on
             // particular publisher/subscriber level
             cfg.GetPropertiesOfType<RabbitMqConfigurationBase>()

diff --git a/tests/MarginTradingTests/FxRateExternalExchangeOrderbookHandlerTests.cs b/tests/MarginTradingTests/FxRateExternalExchangeOrderbookHandlerTests.cs
@@ -12,8 +12,8 @@
 using MarginTrading.Backend.MessageHandlers;
 using MarginTrading.Backend.Services.AssetPairs;
 using MarginTrading.Backend.Services.Events;
+using MarginTrading.Backend.Services.Events.ExternalContracts;
 using MarginTrading.Backend.Services.Stp;
-using MarginTrading.OrderbookAggregator.Contracts.Messages;
 
 using Microsoft.Extensions.Logging;