Merge pull request #48 from IliyanIlievPH/47

Closes #47
OpenMAVN · May 29, 2020 · cc43d12 · cc43d12
2 parents 987dcf4 + e8d649a
commit cc43d12
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 1 deletion.
diff --git a/client/MAVN.Service.SmartVouchers.Client/Models/Responses/Enums/RedeemVoucherErrorCodes.cs b/client/MAVN.Service.SmartVouchers.Client/Models/Responses/Enums/RedeemVoucherErrorCodes.cs
@@ -15,5 +15,9 @@ public enum RedeemVoucherErrorCodes
         VoucherCampaignNotFound,
         /// <summary>Voucher campaign not active</summary>
         VoucherCampaignNotActive,
+        /// <summary>The passed seller id does not have a linked partner id</summary>
+        SellerCustomerIsNotALinkedPartner,
+        /// <summary>The passed seller id does not match the voucher issuer id</summary>
+        SellerCustomerIsNotTheVoucherIssuer,
     }
 }
diff --git a/settings.yaml b/settings.yaml
@@ -76,3 +76,6 @@ MonitoringServiceClient:
 PaymentManagementServiceClient:
     ServiceUrl:
         settings-key: PaymentManagementServiceUrl
+PartnerManagementServiceClient:
+    ServiceUrl:
+        settings-key: PartnerManagementServiceUrl
diff --git a/src/MAVN.Job.SmartVouchers/Modules/ServiceModule.cs b/src/MAVN.Job.SmartVouchers/Modules/ServiceModule.cs
@@ -5,6 +5,7 @@
 using Lykke.SettingsReader;
 using MAVN.Job.SmartVouchers.Services;
 using MAVN.Job.SmartVouchers.Settings;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PaymentManagement.Client;
 using MAVN.Service.SmartVouchers.Domain.Services;
 using MAVN.Service.SmartVouchers.DomainServices;
@@ -43,6 +44,7 @@ protected override void Load(ContainerBuilder builder)
                 .SingleInstance();
 
             builder.RegisterPaymentManagementClient(_settings.PaymentManagementServiceClient, null);
+            builder.RegisterPartnerManagementClient(_settings.PartnerManagementServiceClient, null);
         }
     }
 }
diff --git a/src/MAVN.Job.SmartVouchers/Settings/AppSettings.cs b/src/MAVN.Job.SmartVouchers/Settings/AppSettings.cs
@@ -1,5 +1,6 @@
 using Lykke.Sdk.Settings;
 using MAVN.Job.SmartVouchers.Settings.JobSettings;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PaymentManagement.Client;
 
 namespace MAVN.Job.SmartVouchers.Settings
@@ -9,5 +10,7 @@ public class AppSettings : BaseAppSettings
         public SmartVouchersJobSettings SmartVouchersJob { get; set; }
 
         public PaymentManagementServiceClientSettings PaymentManagementServiceClient { get; set; }
+
+        public PartnerManagementServiceClientSettings PartnerManagementServiceClient { get; set; }
     }
 }
diff --git a/src/MAVN.Service.SmartVouchers.Domain/Enums/RedeemVoucherError.cs b/src/MAVN.Service.SmartVouchers.Domain/Enums/RedeemVoucherError.cs
@@ -7,5 +7,7 @@ public enum RedeemVoucherError
         WrongValidationCode,
         VoucherCampaignNotFound,
         VoucherCampaignNotActive,
+        SellerCustomerIsNotALinkedPartner,
+        SellerCustomerIsNotTheVoucherIssuer,
     }
 }
diff --git a/...AVN.Service.SmartVouchers.DomainServices/MAVN.Service.SmartVouchers.DomainServices.csproj b/...AVN.Service.SmartVouchers.DomainServices/MAVN.Service.SmartVouchers.DomainServices.csproj
@@ -6,6 +6,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="2.8.2" />
     <PackageReference Include="MAVN.Service.PaymentManagement.Client" Version="1.18.0" />
     <PackageReference Include="MAVN.Service.PaymentManagement.Contract" Version="1.18.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.1.30" />

diff --git a/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs b/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs
@@ -6,6 +6,7 @@
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Publisher;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PaymentManagement.Client;
 using MAVN.Service.PaymentManagement.Client.Models.Requests;
 using MAVN.Service.PaymentManagement.Client.Models.Responses;
@@ -24,6 +25,7 @@ public class VouchersService : IVouchersService
         private const string PendingPaymentStatus = "pending";
 
         private readonly IPaymentManagementClient _paymentManagementClient;
+        private readonly IPartnerManagementClient _partnerManagementClient;
         private readonly IVouchersRepository _vouchersRepository;
         private readonly ICampaignsRepository _campaignsRepository;
         private readonly IPaymentRequestsRepository _paymentRequestsRepository;
@@ -35,6 +37,7 @@ public class VouchersService : IVouchersService
 
         public VouchersService(
             IPaymentManagementClient paymentManagementClient,
+            IPartnerManagementClient partnerManagementClient,
             IVouchersRepository vouchersRepository,
             ICampaignsRepository campaignsRepository,
             IPaymentRequestsRepository paymentRequestsRepository,
@@ -45,6 +48,7 @@ public VouchersService(
             TimeSpan lockTimeOut)
         {
             _paymentManagementClient = paymentManagementClient;
+            _partnerManagementClient = partnerManagementClient;
             _vouchersRepository = vouchersRepository;
             _campaignsRepository = campaignsRepository;
             _paymentRequestsRepository = paymentRequestsRepository;
@@ -247,6 +251,17 @@ public async Task<RedeemVoucherError> RedeemVoucherAsync(string voucherShortCode
             if (!IsCampaignStateValid(campaign) || !IsCampaignDateValid(campaign))
                 return RedeemVoucherError.VoucherCampaignNotActive;
 
+            if (sellerCustomerId.HasValue)
+            {
+                var linkedPartner = await _partnerManagementClient.Linking.GetLinkedPartnerAsync(sellerCustomerId.Value);
+
+                if (!linkedPartner.HasValue)
+                    return RedeemVoucherError.SellerCustomerIsNotALinkedPartner;
+
+                if(linkedPartner.Value != campaign.PartnerId)
+                    return RedeemVoucherError.SellerCustomerIsNotTheVoucherIssuer;
+            }
+
             voucher.Status = VoucherStatus.Used;
             voucher.RedemptionDate = DateTime.UtcNow;
             voucher.SellerId = sellerCustomerId;

diff --git a/src/MAVN.Service.SmartVouchers.MsSqlRepositories/Repositories/CampaignsRepository.cs b/src/MAVN.Service.SmartVouchers.MsSqlRepositories/Repositories/CampaignsRepository.cs
@@ -149,6 +149,7 @@ public async Task<CampaignsPage> GetCampaignsAsync(CampaignListRequest request)
                     result = await query.ToListAsync();
                     result = result
                         .OrderBy(p => partnersOrders[p.PartnerId])
+                        .ThenByDescending(i => i.CreationDate)
                         .Skip(request.Skip)
                         .Take(request.Take)
                         .ToList();

diff --git a/src/MAVN.Service.SmartVouchers/MAVN.Service.SmartVouchers.csproj b/src/MAVN.Service.SmartVouchers/MAVN.Service.SmartVouchers.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Dockerfile">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

diff --git a/src/MAVN.Service.SmartVouchers/Modules/ServiceModule.cs b/src/MAVN.Service.SmartVouchers/Modules/ServiceModule.cs
@@ -3,6 +3,7 @@
 using Lykke.Sdk;
 using Lykke.Sdk.Health;
 using Lykke.SettingsReader;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PaymentManagement.Client;
 using MAVN.Service.SmartVouchers.Services;
 using MAVN.Service.SmartVouchers.Settings;
@@ -67,6 +68,8 @@ protected override void Load(ContainerBuilder builder)
                 .SingleInstance();
 
             builder.RegisterPaymentManagementClient(_settings.PaymentManagementServiceClient, null);
+
+            builder.RegisterPartnerManagementClient(_settings.PartnerManagementServiceClient, null);
         }
     }
 }
diff --git a/src/MAVN.Service.SmartVouchers/Settings/AppSettings.cs b/src/MAVN.Service.SmartVouchers/Settings/AppSettings.cs
@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Lykke.Sdk.Settings;
+using MAVN.Service.PartnerManagement.Client;
 using MAVN.Service.PaymentManagement.Client;
 
 namespace MAVN.Service.SmartVouchers.Settings
@@ -10,5 +11,7 @@ public class AppSettings : BaseAppSettings
         public SmartVouchersSettings SmartVouchersService { get; set; }
 
         public PaymentManagementServiceClientSettings PaymentManagementServiceClient { get; set; }
+
+        public PartnerManagementServiceClientSettings PartnerManagementServiceClient { get; set; }
     }
 }