Merge pull request #70 from IliyanIlievPH/69

Closes #69
OpenMAVN · Jun 17, 2020 · a874476 · a874476
2 parents cf081da + 0d4bfca
commit a874476
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/client/MAVN.Service.SmartVouchers.Client/Models/Responses/ReserveVoucherResponse.cs b/client/MAVN.Service.SmartVouchers.Client/Models/Responses/ReserveVoucherResponse.cs
@@ -14,5 +14,8 @@ public class ReserveVoucherResponse
 
         /// <summary>Payment url</summary>
         public string PaymentUrl { get; set; }
+
+        /// <summary>Short code of already reserved voucher</summary>
+        public string AlreadyReservedVoucherShortCode { get; set; }
     }
 }
diff --git a/src/MAVN.Service.SmartVouchers.Domain/Models/VoucherReservationResult.cs b/src/MAVN.Service.SmartVouchers.Domain/Models/VoucherReservationResult.cs
@@ -7,5 +7,7 @@ public class VoucherReservationResult
         public ProcessingVoucherError ErrorCode { get; set; }
 
         public string PaymentUrl { get; set; }
+
+        public string AlreadyReservedVoucherShortCode { get; set; }
     }
 }
diff --git a/src/MAVN.Service.SmartVouchers.Domain/Repositories/IVouchersRepository.cs b/src/MAVN.Service.SmartVouchers.Domain/Repositories/IVouchersRepository.cs
@@ -25,7 +25,7 @@ public interface IVouchersRepository
         Task<List<Voucher>> GetByCampaignIdAndStatusAsync(Guid campaignId, VoucherStatus status);
         Task<List<Voucher>> GetReservedVouchersBeforeDateAsync(DateTime reservationTimeoutDate);
         Task SetVouchersFromCampaignsAsExpired(Guid[] campaignsIds);
-        Task<bool> AnyReservedVouchersAsync(Guid customerId);
+        Task<Voucher> GetReservedVoucherForCustomerAsync(Guid customerId);
         Task<int> GetReservedVouchersCountForCampaign(Guid campaignId);
     }
 }
diff --git a/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs b/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs
@@ -122,9 +122,13 @@ public async Task<VoucherReservationResult> ReserveVoucherAsync(Guid voucherCamp
                     continue;
                 }
 
-                var hasAnyReservedVouchers = await _vouchersRepository.AnyReservedVouchersAsync(ownerId);
-                if (hasAnyReservedVouchers)
-                    return new VoucherReservationResult { ErrorCode = ProcessingVoucherError.CustomerHaveAnotherReservedVoucher };
+                var alreadyReservedVoucher = await _vouchersRepository.GetReservedVoucherForCustomerAsync(ownerId);
+                if (alreadyReservedVoucher != null)
+                    return new VoucherReservationResult
+                    {
+                        ErrorCode = ProcessingVoucherError.CustomerHaveAnotherReservedVoucher,
+                        AlreadyReservedVoucherShortCode = alreadyReservedVoucher.ShortCode
+                    };
 
                 var vouchers = await _vouchersRepository.GetByCampaignIdAndStatusAsync(voucherCampaignId, VoucherStatus.InStock);
                 Voucher voucher = null;

diff --git a/src/MAVN.Service.SmartVouchers.MsSqlRepositories/Repositories/VouchersRepository.cs b/src/MAVN.Service.SmartVouchers.MsSqlRepositories/Repositories/VouchersRepository.cs
@@ -220,14 +220,14 @@ public async Task SetVouchersFromCampaignsAsExpired(Guid[] campaignsIds)
             }
         }
 
-        public async Task<bool> AnyReservedVouchersAsync(Guid customerId)
+        public async Task<Voucher> GetReservedVoucherForCustomerAsync(Guid customerId)
         {
             using (var context = _contextFactory.CreateDataContext())
             {
-                var result = await context.Vouchers
-                    .AnyAsync(x => x.OwnerId == customerId && x.Status == VoucherStatus.Reserved);
+                var entity = await context.Vouchers
+                    .FirstOrDefaultAsync(x => x.OwnerId == customerId && x.Status == VoucherStatus.Reserved);
 
-                return result;
+                return _mapper.Map<Voucher>(entity);
             }
         }