Merge pull request #9 from IliyanIlievPH/8

Closes #8
OpenMAVN · May 8, 2020 · b54f9fb · b54f9fb
2 parents e327f4c + 748dab8
commit b54f9fb
Show file tree

Hide file tree

Showing 35 changed files with 67 additions and 64 deletions.
diff --git a/client/MAVN.Service.Campaign.Client/MAVN.Service.Campaign.Client.csproj b/client/MAVN.Service.Campaign.Client/MAVN.Service.Campaign.Client.csproj
@@ -14,10 +14,10 @@
     <None Remove="MAVN.Service.Campaign.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
-    <PackageReference Include="Falcon.Service.BonusTriggerAgent.Contract" Version="3.1.0" />
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
     <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.3.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/client/MAVN.Service.Campaign.Client/Models/BonusType/BonusTypeEditModel.cs b/client/MAVN.Service.Campaign.Client/Models/BonusType/BonusTypeEditModel.cs
@@ -1,5 +1,5 @@
-using JetBrains.Annotations;
-using Lykke.Service.PartnerManagement.Client.Models;
+using JetBrains.Annotations;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/client/MAVN.Service.Campaign.Client/Models/BonusType/BonusTypeModel.cs b/client/MAVN.Service.Campaign.Client/Models/BonusType/BonusTypeModel.cs
@@ -1,5 +1,5 @@
-using JetBrains.Annotations;
-using Lykke.Service.PartnerManagement.Client.Models;
+using JetBrains.Annotations;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/client/MAVN.Service.Campaign.Client/Models/BurnRule/BurnRuleBase.cs b/client/MAVN.Service.Campaign.Client/Models/BurnRule/BurnRuleBase.cs
@@ -1,6 +1,6 @@
-using System;
-using Falcon.Numerics;
-using Lykke.Service.PartnerManagement.Client.Models;
+using System;
+using MAVN.Numerics;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/client/MAVN.Service.Campaign.Client/Models/BurnRule/Responses/BurnRuleInfoResponse.cs b/client/MAVN.Service.Campaign.Client/Models/BurnRule/Responses/BurnRuleInfoResponse.cs
@@ -1,7 +1,7 @@
-using System;
-using Falcon.Numerics;
+using System;
+using MAVN.Numerics;
 using JetBrains.Annotations;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/client/MAVN.Service.Campaign.Client/Models/BurnRule/Responses/BurnRuleLocalizedResponse.cs b/client/MAVN.Service.Campaign.Client/Models/BurnRule/Responses/BurnRuleLocalizedResponse.cs
@@ -1,7 +1,7 @@
-using System;
-using Falcon.Numerics;
+using System;
+using MAVN.Numerics;
 using JetBrains.Annotations;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/client/MAVN.Service.Campaign.Client/Models/Campaign/Requests/CampaignBaseModel.cs b/client/MAVN.Service.Campaign.Client/Models/Campaign/Requests/CampaignBaseModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Client.Models.Enums;
 
 namespace MAVN.Service.Campaign.Client.Models.Campaign.Requests

diff --git a/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/CampaignDetailResponseModel.cs b/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/CampaignDetailResponseModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 using MAVN.Service.Campaign.Client.Models.Condition;
 using MAVN.Service.Campaign.Client.Models.EarnRuleContent;

diff --git a/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/CampaignResponse.cs b/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/CampaignResponse.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 using MAVN.Service.Campaign.Client.Models.Condition;
 using MAVN.Service.Campaign.Client.Models.Enums;

diff --git a/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/EarnRuleLocalizedResponse.cs b/client/MAVN.Service.Campaign.Client/Models/Campaign/Responses/EarnRuleLocalizedResponse.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 using MAVN.Service.Campaign.Client.Models.Condition;
 using MAVN.Service.Campaign.Client.Models.Enums;

diff --git a/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionBaseModel.cs b/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionBaseModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Client.Models.Enums;
 
 namespace MAVN.Service.Campaign.Client.Models.Condition

diff --git a/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionLocalizedResponse.cs b/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionLocalizedResponse.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Client.Models.Enums;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.Client.Models.Condition
 {

diff --git a/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionModel.cs b/client/MAVN.Service.Campaign.Client/Models/Condition/ConditionModel.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
 using JetBrains.Annotations;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.Client.Models.Condition
 {

diff --git a/contract/MAVN.Service.Campaign.Contract/Events/SpendRuleChangedEvent.cs b/contract/MAVN.Service.Campaign.Contract/Events/SpendRuleChangedEvent.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 using MAVN.Service.Campaign.Contract.Enums;
 

diff --git a/contract/MAVN.Service.Campaign.Contract/MAVN.Service.Campaign.Contract.csproj b/contract/MAVN.Service.Campaign.Contract/MAVN.Service.Campaign.Contract.csproj
@@ -12,6 +12,6 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.Campaign.Domain/MAVN.Service.Campaign.Domain.csproj b/src/MAVN.Service.Campaign.Domain/MAVN.Service.Campaign.Domain.csproj
@@ -4,9 +4,9 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
-    <PackageReference Include="Falcon.Service.BonusTriggerAgent.Contract" Version="3.1.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.3.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Extensions\" />

diff --git a/src/MAVN.Service.Campaign.Domain/Models/BonusType.cs b/src/MAVN.Service.Campaign.Domain/Models/BonusType.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.Service.PartnerManagement.Client.Models;
+using System;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.Domain.Models
 {

diff --git a/src/MAVN.Service.Campaign.Domain/Models/BurnRules/BurnRuleLocalizedModel.cs b/src/MAVN.Service.Campaign.Domain/Models/BurnRules/BurnRuleLocalizedModel.cs
@@ -1,6 +1,6 @@
-using System;
-using Falcon.Numerics;
-using Lykke.Service.PartnerManagement.Client.Models;
+using System;
+using MAVN.Numerics;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

diff --git a/src/MAVN.Service.Campaign.Domain/Models/BurnRules/BurnRuleModel.cs b/src/MAVN.Service.Campaign.Domain/Models/BurnRules/BurnRuleModel.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Domain.Enums;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.Domain.Models.BurnRules
 {

diff --git a/src/MAVN.Service.Campaign.Domain/Models/Campaign.cs b/src/MAVN.Service.Campaign.Domain/Models/Campaign.cs
@@ -1,7 +1,7 @@
 using MAVN.Service.Campaign.Domain.Enums;
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Campaign.Domain.Models
 {

diff --git a/src/MAVN.Service.Campaign.Domain/Models/Condition.cs b/src/MAVN.Service.Campaign.Domain/Models/Condition.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using JetBrains.Annotations;
 using MAVN.Service.Campaign.Domain.Enums;
 

diff --git a/src/MAVN.Service.Campaign.Domain/Models/ConditionLocalizedModel.cs b/src/MAVN.Service.Campaign.Domain/Models/ConditionLocalizedModel.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Domain.Enums;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.Domain.Models
 {

diff --git a/src/MAVN.Service.Campaign.Domain/Models/EarnRules/EarnRuleLocalizedModel.cs b/src/MAVN.Service.Campaign.Domain/Models/EarnRules/EarnRuleLocalizedModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Security.AccessControl;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Domain.Enums;
 
 namespace MAVN.Service.Campaign.Domain.Models.EarnRules

diff --git a/src/MAVN.Service.Campaign.DomainServices/MAVN.Service.Campaign.DomainServices.csproj b/src/MAVN.Service.Campaign.DomainServices/MAVN.Service.Campaign.DomainServices.csproj
@@ -6,8 +6,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="Falcon.Service.Scheduler.Contract" Version="1.0.1" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="MAVN.Service.BonusTriggerAgent.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.Scheduler.Contract" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.Campaign.Contract\MAVN.Service.Campaign.Contract.csproj" />

diff --git a/src/MAVN.Service.Campaign.DomainServices/Services/CampaignService.cs b/src/MAVN.Service.Campaign.DomainServices/Services/CampaignService.cs
@@ -6,7 +6,7 @@
 using Common;
 using Common.Log;
 using Lykke.Common.Log;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Contract.Enums;
 using MAVN.Service.Campaign.Contract.Events;
 using MAVN.Service.Campaign.Domain.Enums;

diff --git a/src/MAVN.Service.Campaign.DomainServices/Subscribers/BonusTypeDetectedEventSubscriber.cs b/src/MAVN.Service.Campaign.DomainServices/Subscribers/BonusTypeDetectedEventSubscriber.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Lykke.Common.Log;
-using Lykke.Service.BonusTriggerAgent.Contract.Events;
+using MAVN.Service.BonusTriggerAgent.Contract.Events;
 using MAVN.Service.Campaign.Domain.Models;
 using MAVN.Service.Campaign.Domain.Services;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.DomainServices.Subscribers
 {
@@ -33,7 +34,7 @@ public class BonusTypeDetectedEventSubscriber : RabbitSubscriber<BonusTypeDetect
                 AllowConversionRate = message.AllowConversionRate, 
                 CreationDate = DateTime.UtcNow,
                 IsAvailable = message.IsEnabled,
-                Vertical = message.Vertical,
+                Vertical = (Vertical?) message.Vertical,
                 IsStakeable = message.IsStakeable,
                 IsHidden = message.IsHidden,
                 Order = message.Order,

diff --git a/src/MAVN.Service.Campaign.DomainServices/Subscribers/OneMinuteTimeEventSubscriber.cs b/src/MAVN.Service.Campaign.DomainServices/Subscribers/OneMinuteTimeEventSubscriber.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Lykke.Common.Log;
 using MAVN.Service.Campaign.Domain.Services;
-using Lykke.Service.Scheduler.Contract.Events;
+using MAVN.Service.Scheduler.Contract.Events;
 
 namespace MAVN.Service.Campaign.DomainServices.Subscribers
 {

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/CampaignContext.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/CampaignContext.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Data.Common;
 using JetBrains.Annotations;
 using Lykke.Common.MsSql;
 using MAVN.Service.Campaign.MsSqlRepositories.Entities;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/BonusTypeEntity.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/BonusTypeEntity.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/BurnRuleEntity.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/BurnRuleEntity.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Numerics;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Numerics;
+using MAVN.Service.PartnerManagement.Client.Models;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Entities
 {

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/CampaignEntity.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/CampaignEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Domain.Enums;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Entities

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/ConditionEntity.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Entities/ConditionEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Campaign.Domain.Enums;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Entities

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Repositories/BurnRuleRepository.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Repositories/BurnRuleRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,7 +8,7 @@
 using MAVN.Service.Campaign.Domain.Models.BurnRules;
 using MAVN.Service.Campaign.Domain.Repositories;
 using MAVN.Service.Campaign.MsSqlRepositories.Entities;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Repositories

diff --git a/src/MAVN.Service.Campaign.MsSqlRepositories/Repositories/CampaignRepository.cs b/src/MAVN.Service.Campaign.MsSqlRepositories/Repositories/CampaignRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -10,7 +10,7 @@
 using MAVN.Service.Campaign.Domain.Models;
 using MAVN.Service.Campaign.Domain.Repositories;
 using MAVN.Service.Campaign.MsSqlRepositories.Entities;
-using Lykke.Service.PartnerManagement.Client.Models;
+using MAVN.Service.PartnerManagement.Client.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.Campaign.MsSqlRepositories.Repositories

diff --git a/src/MAVN.Service.Campaign/Validation/Condition/RewardRatioAttributeValidator.cs b/src/MAVN.Service.Campaign/Validation/Condition/RewardRatioAttributeValidator.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Falcon.Numerics.Linq;
+using MAVN.Numerics.Linq;
 using FluentValidation;
 using MAVN.Service.Campaign.Client.Models.Condition;