Bump API version to 2018-02-06 and add support for Product & Plan API update

Author: jhoon-stripe

.vscode/tasks.json

@@ -12,4 +12,4 @@
             "problemMatcher": "$msCompile"
         },
     ]
-}
+}

src/Stripe.Tests.XUnit/orders/_fixture.cs

@@ -21,6 +21,7 @@ public orders_fixture()
             var productService = new StripeProductService(Cache.ApiKey);
             var product = productService.Create(new StripeProductCreateOptions {
                 Name = "T-shirt",
+                Type = "good"
             });
 
             var skuService = new StripeSkuService(Cache.ApiKey);

src/Stripe.Tests.XUnit/plans/_cache.cs

@@ -12,7 +12,10 @@ public static StripePlan GetPlan(string planName = "plan")
             // Avoids parallel calls to end up with the same options (and id) twice.
             lock(cacheLock)
             {
-                if (Items.ContainsKey(planName)) return (StripePlan) Items[planName];
+                if (Items.ContainsKey(planName))
+                {
+                    return (StripePlan) Items[planName];
+                }
 
                 var plan = new StripePlanService(ApiKey).Create(GetPlanCreateOptions(planName));
                 Items.Add(planName, plan);
@@ -29,9 +32,14 @@ public static StripePlanCreateOptions GetPlanCreateOptions(string planName = "pl
             {
                 Amount = 1000,
                 Currency = "usd",
-                Name = Guid.NewGuid().ToString(),
+                Nickname = Guid.NewGuid().ToString(),
                 Id = Guid.NewGuid().ToString(),
-                Interval = StripePlanIntervals.Week
+                Interval = StripePlanIntervals.Week,
+                Product = new StripePlanProductCreateOptions
+                {
+                    Name = "Test Product",
+                    StatementDescriptor = "TEST THIS PRODUCT"
+                }
             };
             Items.Add($"{planName}_create_options", options);
 

src/Stripe.Tests.XUnit/plans/_fixture.cs

@@ -20,14 +20,19 @@ public plans_fixture()
                 // Add a space at the end to ensure the ID is properly URL encoded
                 // when passed in the URL for other methods
                 Id = "test-plan-" + Guid.NewGuid().ToString() + " ",
-                Name = "plan-name",
+                Nickname = "plan-name",
                 Amount = 5000,
                 Currency = "usd",
                 Interval = "month",
+                Product = new StripePlanProductCreateOptions
+                {
+                    Name = "Test Product",
+                    StatementDescriptor = "TEST THIS PRODUCT"
+                },
             };
 
             PlanUpdateOptions = new StripePlanUpdateOptions {
-              Name = "plan-name-2"
+              Nickname = "plan-name-2"
             };
 
             var service = new StripePlanService(Cache.ApiKey);
@@ -40,4 +45,40 @@ public plans_fixture()
 
         public void Dispose() { }
     }
+
+    public class add_plan_to_product_fixture : IDisposable
+    {
+        public StripeProductCreateOptions ProductCreateOptions { get; set; }
+        public StripePlanCreateOptions PlanCreateOptions { get; set; }
+
+        public StripeProduct Product{ get; set; }
+        public StripePlan Plan { get; set; }
+        public StripePlan PlanRetrieved { get; set; }
+
+        public add_plan_to_product_fixture()
+        {
+            ProductCreateOptions = new StripeProductCreateOptions
+            {
+                Name = $"test-product-{ Guid.NewGuid() }",
+                Type = "service"
+            };
+
+            var productService = new StripeProductService(Cache.ApiKey);
+            Product = productService.Create(ProductCreateOptions);
+
+            PlanCreateOptions = new StripePlanCreateOptions() {
+                Nickname = "plan-name",
+                Amount = 5000,
+                Currency = "usd",
+                Interval = "month",
+                ProductId = Product.Id
+            };
+
+            var planService = new StripePlanService(Cache.ApiKey);
+            Plan = planService.Create(PlanCreateOptions);
+            PlanRetrieved = planService.Get(Plan.Id);
+        }
+
+        public void Dispose() { }
+    }
 }

src/Stripe.Tests.XUnit/plans/when_adding_a_plan_to_a_product.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using Xunit;
+
+namespace Stripe.Tests.Xunit
+{
+    public class adding_a_plan_to_a_product : IClassFixture<add_plan_to_product_fixture>
+    {
+        private readonly add_plan_to_product_fixture fixture;
+
+        public adding_a_plan_to_a_product(add_plan_to_product_fixture fixture)
+        {
+            this.fixture = fixture;
+        }
+
+        [Fact]
+        public void has_the_right_product()
+        {
+            fixture.Plan.ProductId.Should().Be(fixture.Product.Id);
+            fixture.PlanRetrieved.ProductId.Should().Be(fixture.Product.Id);
+        }
+    }
+}

src/Stripe.Tests.XUnit/plans/when_creating_and_updating_plans.cs

@@ -17,9 +17,9 @@ public creating_and_updating_plans(plans_fixture fixture)
         [Fact]
         public void created_has_the_right_details()
         {
-            fixture.Plan.Id.Should().Be(fixture.PlanCreateOptions.Id);
-            fixture.Plan.Name.Should().Be(fixture.PlanCreateOptions.Name);
+            fixture.Plan.Id.Should().NotBeNull();
             fixture.Plan.Amount.Should().Be(fixture.PlanCreateOptions.Amount);
+            fixture.Plan.Nickname.Should().Be(fixture.PlanCreateOptions.Nickname);
             fixture.Plan.Currency.Should().Be(fixture.PlanCreateOptions.Currency);
             fixture.Plan.Interval.Should().Be(fixture.PlanCreateOptions.Interval);
         }
@@ -28,7 +28,7 @@ public void created_has_the_right_details()
         public void updated_has_the_right_details()
         {
             fixture.PlanUpdated.Id.Should().Be(fixture.Plan.Id);
-            fixture.PlanUpdated.Name.Should().BeEquivalentTo(fixture.PlanUpdateOptions.Name);
+            fixture.PlanUpdated.Nickname.Should().Be(fixture.PlanUpdateOptions.Nickname);
         }
 
         [Fact]

src/Stripe.Tests.XUnit/products/_fixture.cs

@@ -22,6 +22,7 @@ public products_fixture()
             ProductCreateOptions = new StripeProductCreateOptions
             {
                 Name = $"test-product-{ Guid.NewGuid() }",
+                Type = "good",
                 PackageDimensions = new StripePackageDimensionOptions {
                     Height = 100,
                     Length = 100,
@@ -33,12 +34,13 @@ public products_fixture()
 
             ProductTwoCreateOptions = new StripeProductCreateOptions
             {
-                Name = $"test-product-{ Guid.NewGuid() }"
+                Name = $"test-product-{ Guid.NewGuid() }",
+                Type = "good",
             };
 
             ProductUpdateOptions = new StripeProductUpdateOptions
             {
-                Name = $"test-product-{ Guid.NewGuid() }"
+                Name = $"test-product-{ Guid.NewGuid() }",
             };
 
             var service = new StripeProductService(Cache.ApiKey);

src/Stripe.Tests.XUnit/skus/_fixture.cs

@@ -22,6 +22,7 @@ public skus_fixture()
             var productService = new StripeProductService(Cache.ApiKey);
             Product = productService.Create(new StripeProductCreateOptions {
                 Name = "T-shirt",
+                Type = "good",
                 Description = "stripe-dotnet product description",
                 Attributes = new string[] {"size", "color"},
             });

src/Stripe.net.Tests/plans/plan_behaviors.cs

@@ -7,7 +7,7 @@ public class plan_behaviors
     {
         protected static StripePlanCreateOptions StripePlanCreateOptions;
         protected static StripePlan StripePlan;
-    
+
         It should_have_the_correct_id = () =>
             StripePlan.Id.ShouldEqual(StripePlanCreateOptions.Id);
 
@@ -19,22 +19,19 @@ public class plan_behaviors
 
         It should_have_the_correct_interval = () =>
             StripePlan.Interval.ShouldEqual(StripePlanCreateOptions.Interval);
-        
+
         It should_have_the_correct_interval_count = () =>
             StripePlan.IntervalCount.ShouldEqual(1);
 
-        It should_have_the_correct_name = () =>
-            StripePlan.Name.ShouldEqual(StripePlanCreateOptions.Name);
+        It should_have_the_correct_nickname = () =>
+            StripePlan.Nickname.ShouldEqual(StripePlanCreateOptions.Nickname);
 
         It should_have_the_correct_trial_period_days = () =>
             StripePlan.TrialPeriodDays.ShouldEqual(StripePlanCreateOptions.TrialPeriodDays);
 
         It should_have_a_created_date = () =>
             StripePlan.Created.ShouldNotBeNull();
 
-        It should_have_the_correct_statement_descriptor = () =>
-            StripePlan.StatementDescriptor.ShouldEqual(StripePlanCreateOptions.StatementDescriptor);
-
         It should_have_the_correct_live_mode = () =>
             StripePlan.LiveMode.ShouldEqual(false);
     }

src/Stripe.net.Tests/plans/test_data/stripe_plan_create_options.cs

@@ -13,14 +13,18 @@ public static StripePlanCreateOptions Valid()
                 Amount = 5000,
                 Currency = "usd",
                 Interval = "month",
-                Name = "Test Plan",
+                Nickname = "Test Price",
                 TrialPeriodDays = 1,
                 Metadata = new Dictionary<string, string>
                 {
                     { "A", "Value-A" },
                     { "B", "Value-B" }
                 },
-                StatementDescriptor = "heyyyy ya!"
+                Product = new StripePlanProductCreateOptions
+                {
+                    Name = "Test Plan",
+                    StatementDescriptor = "heyyyy ya!"
+                }
             };
         }
 
@@ -32,7 +36,10 @@ public static StripePlanCreateOptions ThirtyDayIntervalWithFiveDollars()
                 Amount = 500,
                 Currency = "usd",
                 Interval = "month",
-                Name = "Thirty Days and Five Dollars"
+                Product = new StripePlanProductCreateOptions
+                {
+                    Name = "Thirty Days and Five Dollars"
+                }
             };
         }
     }

src/Stripe.net.Tests/plans/test_data/stripe_plan_update_options.cs

@@ -8,14 +8,13 @@ public static StripePlanUpdateOptions Valid()
         {
             return new StripePlanUpdateOptions()
             {
-                Name = "Test Plan Modified",
+                Nickname = "Test Price Modified",
                 Metadata = new Dictionary<string, string>
                 {
                     { "A", "Value-A" },
                     { "B", "Value-B" },
                     { "C", "Value-C" }
-                },
-                StatementDescriptor = "heyyyy ya?"
+                }
             };
         }
     }

src/Stripe.net.Tests/plans/when_updating_a_plan.cs

@@ -25,16 +25,13 @@ public class when_updating_a_plan
         Because of = () =>
             StripePlan = _stripePlanService.Update(_createdStripePlanId, StripePlanUpdateOptions);
 
-        It should_have_the_new_name = () =>
-            StripePlan.Name.ShouldEqual(StripePlanUpdateOptions.Name);
+        It should_have_the_new_nickname = () =>
+            StripePlan.Nickname.ShouldEqual(StripePlanUpdateOptions.Nickname);
 
         It should_have_metadata = () =>
             StripePlan.Metadata.Count.ShouldBeGreaterThan(0);
 
         It should_have_correct_metadata = () =>
             StripePlan.Metadata.ShouldContainOnly(StripePlanUpdateOptions.Metadata);
-
-        It should_have_the_new_statement_descriptor = () =>
-            StripePlan.StatementDescriptor.ShouldEqual(StripePlanUpdateOptions.StatementDescriptor);
     }
 }

src/Stripe.net/Entities/StripePlan.cs

@@ -32,13 +32,13 @@ public class StripePlan : StripeEntityWithId
         [JsonProperty("metadata")]
         public Dictionary<string, string> Metadata { get; set; }
 
-        [JsonProperty("name")]
-        public string Name { get; set; }
+        [JsonProperty("nickname")]
+        public string Nickname { get; set; }
 
-        [JsonProperty("statement_descriptor")]
-        public string StatementDescriptor { get; set; }
+        [JsonProperty("product")]
+        public string ProductId { get; set; }
 
         [JsonProperty("trial_period_days")]
         public int? TrialPeriodDays { get; set; }
     }
-}
+}

src/Stripe.net/Entities/StripeProduct.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Stripe.Infrastructure;
-using Newtonsoft.Json; 
+using Newtonsoft.Json;
 
 namespace Stripe
 {
@@ -14,7 +14,7 @@ public class StripeProduct : StripeEntityWithId
         /// Whether or not the product is currently available for purchase.
         /// </summary>
         [JsonProperty("active")]
-        public bool Active { get; set; }
+        public bool? Active { get; set; }
 
         /// <summary>
         /// A list of up to 5 attributes that each SKU can provide values for (e.g. ["color", "size"]).
@@ -29,7 +29,7 @@ public class StripeProduct : StripeEntityWithId
         public string Caption { get; set; }
 
         /// <summary>
-        /// Time at which the object was created. 
+        /// Time at which the object was created.
         /// </summary>
         [JsonProperty("created")]
         [JsonConverter(typeof(StripeDateTimeConverter))]
@@ -81,14 +81,26 @@ public class StripeProduct : StripeEntityWithId
         /// Whether this product is a shipped good.
         /// </summary>
         [JsonProperty("shippable")]
-        public bool Shippable { get; set; }
+        public bool? Shippable { get; set; }
 
         /// <summary>
         /// A sublist of active SKUs associated with this product.
         /// </summary>
         [JsonProperty("skus")]
         public StripeList<StripeSku> Skus { get; set; }
 
+        /// <summary>
+        /// What appears on a customer's credit card statement.
+        /// </summary>
+        [JsonProperty("statement_descriptor")]
+        public string StatementDescriptor { get; set; }
+
+        /// <summary>
+        /// The type of the Product. Either 'good' or 'service'.
+        /// </summary>
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
         [JsonProperty("updated")]
         [JsonConverter(typeof(StripeDateTimeConverter))]
         public DateTime Updated { get; set; }

src/Stripe.net/Entities/StripeSubscription.cs

@@ -19,6 +19,10 @@ public class StripeSubscription : StripeEntityWithId
         [JsonProperty("billing")]
         public StripeBilling? Billing { get; set; }
 
+        [JsonProperty("billing_cycle_anchor")]
+        [JsonConverter(typeof(StripeDateTimeConverter))]
+        public DateTime? BillingCycleAnchor { get; set; }
+
         [JsonProperty("cancel_at_period_end")]
         public bool CancelAtPeriodEnd { get; set; }
 
@@ -100,4 +104,4 @@ internal object InternalCustomer
         [JsonConverter(typeof(StripeDateTimeConverter))]
         public DateTime? TrialStart { get; set; }
     }
-}
+}

src/Stripe.net/Infrastructure/Public/StripeConfiguration.cs

@@ -7,7 +7,7 @@ namespace Stripe
 {
     public static class StripeConfiguration
     {
-        public static string StripeApiVersion = "2017-12-14";
+        public static string StripeApiVersion = "2018-02-06";
         public static string StripeNetVersion { get; }
 
         /// <summary>