Merge pull request #1144 from AndriiMysko/v2-user-usage-am

Include invoice status

Author: AndriiMysko

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

@@ -1,10 +1,11 @@
 module Travis::API::V3
   class Models::Invoice
-    attr_reader :id, :created_at, :url, :amount_due
+    attr_reader :id, :created_at, :status, :url, :amount_due
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
       @created_at = attributes.fetch('created_at') && DateTime.parse(attributes.fetch('created_at'))
+      @status = attributes.fetch('status')
       @url = attributes.fetch('url')
       @amount_due = attributes.fetch('amount_due')
     end

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

@@ -1,6 +1,6 @@
 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, :active, :status
 
     def initialize(attrs)
       @id = attrs.fetch('id')
@@ -9,6 +9,7 @@ def initialize(attrs)
       @addon_usage = attrs.fetch('addon_usage')
       @remaining = attrs.fetch('remaining')
       @active = attrs.fetch('active')
+      @status = attrs.fetch('status')
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Travis::API::V3
   class Renderer::Invoice < ModelRenderer
-    representation(:standard, :id, :created_at, :url, :amount_due)
+    representation(:standard, :id, :created_at, :status, :url, :amount_due)
   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, :active, :status)
+    representation(:minimal, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active, :status)
   end
 end

spec/support/billing_spec_helper.rb

@@ -141,6 +141,7 @@ def billing_addons_response_body
               "addon_quantity" => 40000,
               "addon_usage" => 0,
               "remaining" => 40000,
+              "status" => "subscribed",
               "active" => true
           }
         },
@@ -154,6 +155,7 @@ def billing_addons_response_body
             "addon_quantity" => 10000,
             "addon_usage" => 0,
             "remaining" => 10000,
+            "status" => "subscribed",
             "active" => true
           }
         }

spec/v3/billing_client_spec.rb

@@ -46,7 +46,7 @@
 
     it 'returns a list of invoices' do
       stub_billing_request(:get, "/subscriptions/#{subscription_id}/invoices", auth_key: auth_key, user_id: user_id)
-        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999 }]))
+        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid' }]))
       expect(subject.first).to be_a(Travis::API::V3::Models::Invoice)
       expect(subject.first.id).to eq(invoice_id)
       expect(subject.first.amount_due).to eq(999)
@@ -65,7 +65,7 @@
 
     it 'returns a list of invoices' do
       stub_billing_request(:get, "/v2/subscriptions/#{subscription_id}/invoices", auth_key: auth_key, user_id: user_id)
-        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999 }]))
+        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid' }]))
       expect(subject.first).to be_a(Travis::API::V3::Models::Invoice)
       expect(subject.first.id).to eq(invoice_id)
       expect(subject.first.amount_due).to eq(999)

spec/v3/services/subscription/invoices_spec.rb

@@ -25,10 +25,11 @@
     let(:created_at) { '2018-04-17T18:30:32Z' }
     let(:url) { 'https://billing-test.travis-ci.com/invoices/111.pdf' }
     let(:amount_due) { 100 }
+    let(:status) { 'paid' }
     let(:subscription_id) { rand(999) }
     before do
       stub_billing_request(:get, "/subscriptions/#{subscription_id}/invoices", auth_key: billing_auth_key, user_id: user.id)
-        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due }]))
+        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due, 'status' => status }]))
     end
 
     it 'responds with list of subscriptions' do
@@ -45,7 +46,8 @@
           'id' => invoice_id,
           'created_at' => created_at,
           'url' => url,
-          'amount_due' => amount_due
+          'amount_due' => amount_due,
+          'status' => status
         }]
       })
     end

spec/v3/services/v2_subscription/invoices_spec.rb

@@ -25,10 +25,11 @@
     let(:created_at) { '2018-04-17T18:30:32Z' }
     let(:url) { 'https://billing-test.travis-ci.com/invoices/111.pdf' }
     let(:amount_due) { 100 }
+    let(:status) { 'paid' }
     let(:subscription_id) { rand(999) }
     before do
       stub_billing_request(:get, "/v2/subscriptions/#{subscription_id}/invoices", auth_key: billing_auth_key, user_id: user.id)
-        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due }]))
+        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due, 'status' => status }]))
     end
 
     it 'responds with list of subscriptions' do
@@ -45,7 +46,8 @@
           'id' => invoice_id,
           'created_at' => created_at,
           'url' => url,
-          'amount_due' => amount_due
+          'amount_due' => amount_due,
+          'status' => status
         }]
       })
     end

spec/v3/services/v2_subscriptions/all_spec.rb

@@ -150,6 +150,7 @@
                 'addon_quantity' => 40_000,
                 'addon_usage' => 0,
                 'remaining' => 40_000,
+                'status' => 'subscribed',
                 'active' => true
               }
             },
@@ -168,6 +169,7 @@
                 'addon_quantity' => 10_000,
                 'addon_usage' => 0,
                 'remaining' => 10_000,
+                'status' => 'subscribed',
                 'active' => true
               }
             }

spec/v3/services/v2_subscriptions/create_spec.rb

@@ -238,9 +238,10 @@
               '@representation' => 'standard',
               'id' => 7,
               'addon_id' => 7,
-              'addon_quantity' => 40000,
+              'addon_quantity' => 40_000,
               'addon_usage' => 0,
-              'remaining' => 40000,
+              'remaining' => 40_000,
+              'status' => 'pending',
               'active' => false
             }
           }],