Merge pull request #62 from IliyanIlievPH/master

update campaign validation on voucher redeem
OpenMAVN · Jun 9, 2020 · 5d26e82 · 5d26e82
2 parents d4820bb + 9a506b5
commit 5d26e82
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs b/src/MAVN.Service.SmartVouchers.DomainServices/VouchersService.cs
@@ -389,11 +389,11 @@ public async Task MarkVouchersFromExpiredCampaignsAsExpired()
         }
 
         private bool IsCampaignStateValid(VoucherCampaign campaign)
-            => campaign.State != CampaignState.Published;
+            => campaign.State == CampaignState.Published;
 
         private bool IsCampaignDateValid(VoucherCampaign campaign)
-            => DateTime.UtcNow < campaign.FromDate
-               || (campaign.ToDate.HasValue && campaign.ToDate.Value < DateTime.UtcNow);
+            => DateTime.UtcNow > campaign.FromDate
+               && (!campaign.ExpirationDate.HasValue || campaign.ExpirationDate.Value > DateTime.UtcNow);
 
         private async Task PublishVoucherSoldEvent(Guid? paymentRequestId, VoucherCampaign voucherCampaign, Voucher voucher)
         {