Merge pull request #13 from IliyanIlievPH/12

Closes #12

client/MAVN.Service.OperationsHistory.Client/IOperationsHistoryApi.cs

@@ -36,13 +36,6 @@ public interface IOperationsHistoryApi
         [Get("/api/bonuses")]
         Task<PaginatedBonusesHistoryResponse> GetBonusesByDatesAsync(PaginationModelWithDatesRange paginationModel);
 
-        /// <summary>
-        /// Gets paged payment transfers history between two dates
-        /// </summary>
-        /// <param name="paginationModel">Information of which page you want the data for</param>
-        [Get("/api/payment-transfers")]
-        Task<PaginatedPaymentTransfersHistoryResponse> GetPaymentTransfersByDatesAsync(PaginationModelWithDatesRange paginationModel);
-
         /// <summary>
         /// Gets paged partners payments history between two dates
         /// </summary>

client/MAVN.Service.OperationsHistory.Client/Models/Responses/PaginatedCustomerOperationsResponse.cs

@@ -17,16 +17,6 @@ public class PaginatedCustomerOperationsResponse : BasePagedResponse
         /// </summary>
         public IEnumerable<BonusCashInResponse> BonusCashIns { get; set; }
 
-        /// <summary>
-        /// List of payment transfers
-        /// </summary>
-        public IEnumerable<PaymentTransferResponse> PaymentTransfers { get; set; }
-
-        /// <summary>
-        /// List of refunded Payment transfers
-        /// </summary>
-        public IEnumerable<PaymentTransferResponse> RefundedPaymentTransfers { get; set; }
-
         /// <summary>
         /// List of partner payments
         /// </summary>

src/MAVN.Service.OperationsHistory.Domain/Models/PaginatedCustomerOperationsModel.cs

@@ -8,12 +8,8 @@ public class PaginatedCustomerOperationsModel : BasePagedModel
 
         public IEnumerable<Transfer> Transfers { get; set; }
 
-        public IEnumerable<PaymentTransferDto> PaymentTransfers { get; set; }
-
         public IEnumerable<IPartnersPayment> PartnersPayments { get; set; }
 
-        public IEnumerable<PaymentTransferDto> RefundedPaymentTransfers { get; set; }
-
         public IEnumerable<IPartnersPayment> RefundedPartnersPayments { get; set; }
 
         public IEnumerable<LinkedWalletTransferDto> LinkedWalletTransfers { get; set; }

src/MAVN.Service.OperationsHistory.Domain/Services/IOperationsQueryService.cs

@@ -19,12 +19,6 @@ Task<PaginatedTransactionHistory> GetByDatePaginatedAsync
             int currentPage,
             int pageSize);
 
-        Task<PaginatedPaymentTransfersHistory> GetPaymentTransfersByDatesPaginatedAsync(
-            DateTime fromDate,
-            DateTime toDate,
-            int currentPage,
-            int pageSize);
-
         Task<PaginatedPartnersPaymentsHistory> GetPartnersPaymentsByDatesPaginatedAsync(
             DateTime fromDate,
             DateTime toDate,

src/MAVN.Service.OperationsHistory.Domain/Services/IOperationsService.cs

@@ -9,14 +9,10 @@ public interface IOperationsService
 
         Task ProcessBonusReceivedEventAsync(BonusCashInDto bonusCashIn);
 
-        Task ProcessPaymentTransferTokensReservedEventAsync(PaymentTransferDto paymentTransferDto);
-
         Task ProcessCustomerTierChangedEventAsync(CustomerTierModel customerTier);
 
         Task ProcessPartnersPaymentTokensReservedEventAsync(PartnerPaymentDto partnerPayment);
 
-        Task ProcessRefundPaymentTransferEventAsync(PaymentTransferDto paymentTransferDto);
-
         Task ProcessRefundPartnersPaymentEventAsync(PartnerPaymentDto partnerPayment);
 
         Task ProcessReferralStakeTokensReservationEventAsync(ReferralStakeDto referralStake);

src/MAVN.Service.OperationsHistory.DomainServices/MAVN.Service.OperationsHistory.DomainServices.csproj

@@ -7,21 +7,20 @@
     <ProjectReference Include="..\MAVN.Service.OperationsHistory.Domain\MAVN.Service.OperationsHistory.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.Campaign.Client" Version="7.4.0" />
-    <PackageReference Include="Falcon.Service.CrossChainTransfers.Contract" Version="2.2.0" />
-    <PackageReference Include="Falcon.Service.CrossChainWalletLinker.Contract" Version="1.0.8" />
-    <PackageReference Include="Falcon.Service.CustomerProfile.Client" Version="7.7.0" />
-    <PackageReference Include="Falcon.Service.PartnerManagement.Client" Version="2.3.0" />
-    <PackageReference Include="Falcon.Service.PartnersPayments.Contract" Version="1.6.1" />
-    <PackageReference Include="Falcon.Service.PaymentTransfers.Contract" Version="1.4.0" />
-    <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Client" Version="2.9.0" />
-    <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Contract" Version="2.13.0" />
-    <PackageReference Include="Falcon.Service.Staking.Contract" Version="1.1.0" />
-    <PackageReference Include="Falcon.Service.Vouchers.Contract" Version="1.1.0" />
-    <PackageReference Include="Falcon.Service.WalletManagement.Contract" Version="3.8.0" />
-    <PackageReference Include="Falcon.Service.Tiers.Contract" Version="1.0.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.12.0" />
+    <PackageReference Include="MAVN.Service.Campaign.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.CrossChainTransfers.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.CrossChainWalletLinker.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.2.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.2.0" />
+    <PackageReference Include="MAVN.Service.PartnersPayments.Contract" Version="1.0.1" />
     <PackageReference Include="MAVN.Service.PaymentManagement.Contract" Version="1.6.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.0.1" />
     <PackageReference Include="MAVN.Service.SmartVouchers.Contract" Version="1.9.0" />
+    <PackageReference Include="MAVN.Service.Staking.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.Tiers.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.Vouchers.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Contract" Version="1.0.1" />
   </ItemGroup>
 </Project>

src/MAVN.Service.OperationsHistory.DomainServices/Services/OperationsQueryService.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
-using Lykke.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client;
 using MAVN.Service.OperationsHistory.Domain.Models;
 using MAVN.Service.OperationsHistory.Domain.Repositories;
 using MAVN.Service.OperationsHistory.Domain.Services;
@@ -15,7 +15,6 @@ public class OperationsQueryService : IOperationsQueryService
     {
         private readonly ITransactionHistoryRepository _transactionHistoryRepository;
         private readonly IBonusCashInsRepository _bonusCashInsRepository;
-        private readonly IPaymentTransfersRepository _paymentTransfersRepository;
         private readonly IPartnersPaymentsRepository _partnersPaymentsRepository;
         private readonly IVoucherPurchasePaymentsRepository _voucherPurchasePaymentsRepository;
         private readonly ICustomerProfileClient _customerProfileClient;
@@ -25,7 +24,6 @@ public class OperationsQueryService : IOperationsQueryService
         public OperationsQueryService(
             ITransactionHistoryRepository transactionHistoryRepository,
             IBonusCashInsRepository bonusCashInsRepository,
-            IPaymentTransfersRepository paymentTransfersRepository,
             IPartnersPaymentsRepository partnersPaymentsRepository,
             IVoucherPurchasePaymentsRepository voucherPurchasePaymentsRepository,
             ICustomerProfileClient customerProfileClient,
@@ -34,7 +32,6 @@ public class OperationsQueryService : IOperationsQueryService
         {
             _transactionHistoryRepository = transactionHistoryRepository;
             _bonusCashInsRepository = bonusCashInsRepository;
-            _paymentTransfersRepository = paymentTransfersRepository;
             _partnersPaymentsRepository = partnersPaymentsRepository;
             _voucherPurchasePaymentsRepository = voucherPurchasePaymentsRepository;
             _customerProfileClient = customerProfileClient;
@@ -77,20 +74,6 @@ public Task<PaginatedTransactionHistory> GetByDatePaginatedAsync(DateTime fromDa
             return _bonusCashInsRepository.GetByDatesPaginatedAsync(fromDate, toDate, skip, take);
         }
 
-        public Task<PaginatedPaymentTransfersHistory> GetPaymentTransfersByDatesPaginatedAsync(
-            DateTime fromDate,
-            DateTime toDate,
-            int currentPage,
-            int pageSize)
-        {
-            if (fromDate >= toDate)
-                throw new InvalidOperationException($"{nameof(fromDate)} must be earlier than {nameof(toDate)}");
-
-            var (skip, take) = ValidateAndCalculateSkipAndTake(currentPage, pageSize);
-
-            return _paymentTransfersRepository.GetByDatesPaginatedAsync(fromDate, toDate, skip, take);
-        }
-
         public Task<PaginatedPartnersPaymentsHistory> GetPartnersPaymentsByDatesPaginatedAsync(
             DateTime fromDate,
             DateTime toDate,