Merge branch 'release/3.805.0'

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.804.0</VersionPrefix>
+    <VersionPrefix>3.805.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

src/VirtoCommerce.Skyflow.Core/Models/SkyflowCard.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using VirtoCommerce.Platform.Core.Common;
 
 namespace VirtoCommerce.Skyflow.Core.Models
 {
@@ -28,6 +29,55 @@ public class SkyflowCard
 
         [JsonPropertyName("user_id")]
         public string UserId { get; set; }
+
+        [JsonPropertyName("active")]
+        public bool Active
+        {
+            get
+            {
+                return CheckIsActive();
+            }
+        }
+
+        private bool CheckIsActive()
+        {
+            var month = 0;
+            var year = 0;
+            if (!CardExpiration.IsNullOrEmpty())
+            {
+                // format MM/YY
+                var parts = CardExpiration.Split('/');
+                if (parts.Length == 2)
+                {
+                    month = int.Parse(parts[0]);
+                    year = int.Parse(parts[1]);
+                }
+            }
+
+            if (!ExpiryMonth.IsNullOrEmpty())
+            {
+                month = int.Parse(ExpiryMonth);
+            }
+            if (!ExpiryYear.IsNullOrEmpty())
+            {
+                year = int.Parse(ExpiryYear);
+            }
+
+            if (year != 0 && month != 0)
+            {
+                // 08/20
+
+                if (year < 100)
+                {
+                    year += 2000;
+                }
+
+                var now = System.DateTime.UtcNow;
+                return year > now.Year || (year == now.Year && month >= now.Month);
+            }
+
+            return true;
+        }
     }
 
     public class SkyflowItemModel

src/VirtoCommerce.Skyflow.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Skyflow</id>
-  <version>3.804.0</version>
+  <version>3.805.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.800.0</platformVersion>

src/VirtoCommerce.Skyflow.XApi/Schemas/SkyflowCardType.cs

@@ -15,5 +15,6 @@ public SkyflowCardType()
         Field(x => x.ExpiryYear, nullable: true);
         Field(x => x.SkyflowId);
         Field(x => x.UserId);
+        Field(x => x.Active);
     }
 }

tests/VirtoCommerce.Skyflow.Tests/SkyflowCardTest.cs

@@ -0,0 +1,43 @@
+using System;
+using VirtoCommerce.Skyflow.Core.Models;
+using Xunit;
+
+namespace VirtoCommerce.Skyflow.Tests;
+
+[Trait("Category", "Unit")]
+public class SkyflowCardTest
+{
+    [Theory]
+    [InlineData("10", "20", false)]
+    [InlineData("01", "38", true)]
+    [InlineData("02", "98", true)]
+    public void MonthYearTest(string month, string year, bool isActive)
+    {
+        var card = new SkyflowCard { ExpiryMonth = month, ExpiryYear = year, };
+
+        Assert.Equal(isActive, card.Active);
+    }
+
+    [Theory]
+    [InlineData("10/20", false)]
+    [InlineData("01/2038", true)]
+    [InlineData("02/98", true)]
+    public void ExpireDateTest(string expireDate, bool isActive)
+    {
+        var card = new SkyflowCard { CardExpiration = expireDate };
+
+        Assert.Equal(isActive, card.Active);
+    }
+
+    [Fact]
+    public void CurrentMonthTests()
+    {
+        var month = DateTime.UtcNow.Month.ToString("00");
+        var year = DateTime.UtcNow.Year.ToString("00");
+        var card = new SkyflowCard { ExpiryMonth = month, ExpiryYear = year, };
+
+        Assert.True(card.Active);
+    }
+
+
+}