Merge pull request #1149 from AndriiMysko/plan-page-fixes-am

Expose purchase and valid dates for addons

Author: AndriiMysko

lib/travis/api/v3/models/v2_addon_usage.rb

@@ -1,13 +1,15 @@
 module Travis::API::V3
   class Models::V2AddonUsage
-    attr_reader :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active
+    attr_reader :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :purchase_date, :valid_to, :active
 
     def initialize(attrs)
       @id = attrs.fetch('id')
       @addon_id = attrs.fetch('addon_id')
       @addon_quantity = attrs.fetch('addon_quantity')
       @addon_usage = attrs.fetch('addon_usage')
       @remaining = attrs.fetch('remaining')
+      @purchase_date = attrs.fetch('purchase_date')
+      @valid_to = attrs.fetch('valid_to')
       @active = attrs.fetch('active')
     end
   end

lib/travis/api/v3/renderer/v2_addon_usage.rb

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Renderer::V2AddonUsage < ModelRenderer
-    representation(:standard, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active)
-    representation(:minimal, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active)
+    representation(:standard, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :purchase_date, :valid_to, :active)
+    representation(:minimal, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :purchase_date, :valid_to, :active)
   end
 end

spec/support/billing_spec_helper.rb

@@ -141,6 +141,8 @@ def billing_addons_response_body
               "addon_quantity" => 40000,
               "addon_usage" => 0,
               "remaining" => 40000,
+              "purchase_date" => "2017-11-28T00:09:59.502Z",
+              "valid_to" => "2017-12-28T00:09:59.502Z",
               "active" => true
           }
         },
@@ -154,6 +156,8 @@ def billing_addons_response_body
             "addon_quantity" => 10000,
             "addon_usage" => 0,
             "remaining" => 10000,
+            "purchase_date" => "2017-11-28T00:09:59.502Z",
+            "valid_to" => "",
             "active" => true
           }
         }

spec/v3/services/v2_subscriptions/all_spec.rb

@@ -150,6 +150,8 @@
                 'addon_quantity' => 40_000,
                 'addon_usage' => 0,
                 'remaining' => 40_000,
+                'purchase_date' => '2017-11-28T00:09:59.502Z',
+                'valid_to' => '2017-12-28T00:09:59.502Z',
                 'active' => true
               }
             },
@@ -168,6 +170,8 @@
                 'addon_quantity' => 10_000,
                 'addon_usage' => 0,
                 'remaining' => 10_000,
+                'purchase_date' => '2017-11-28T00:09:59.502Z',
+                'valid_to' => '',
                 'active' => true
               }
             }

spec/v3/services/v2_subscriptions/create_spec.rb

@@ -241,6 +241,8 @@
               'addon_quantity' => 40000,
               'addon_usage' => 0,
               'remaining' => 40000,
+              'purchase_date' => '2017-11-28T00:09:59.502Z',
+              'valid_to' => '2017-11-28T00:09:59.502Z',
               'active' => false
             }
           }],