Merge pull request #1190 from travis-ci/epic_maint

Billing maintenance milestone 1

Author: Shairyar Baig

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

@@ -24,7 +24,7 @@ def initialize(attributes = {})
   end
 
   class Models::V2BillingInfo
-    attr_reader :id, :address, :address2, :billing_email, :city, :company, :country, :first_name, :last_name, :state, :vat_id, :zip_code
+    attr_reader :id, :address, :address2, :billing_email, :city, :company, :country, :first_name, :last_name, :state, :vat_id, :zip_code, :has_local_registration
 
     def initialize(id, attrs)
       @id = id
@@ -39,6 +39,7 @@ def initialize(id, attrs)
       @state = attrs.fetch('state')
       @vat_id = attrs.fetch('vat_id')
       @zip_code = attrs.fetch('zip_code')
+      @has_local_registration = attrs.fetch('has_local_registration', false)
     end
   end
 

lib/travis/api/v3/queries/v2_subscriptions.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Queries::V2Subscriptions < Query
     params :plan, :coupon, :organization_id, :client_secret, :v1_subscription_id
-    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, prefix: :billing_info
+    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, :has_local_registration, prefix: :billing_info
     params :token, prefix: :credit_card_info
 
     def all(user_id)

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

@@ -20,7 +20,7 @@ def payment_intent
   end
 
   class Renderer::V2BillingInfo < ModelRenderer
-    representation(:standard, :id, :address, :address2, :billing_email, :city, :company, :country, :first_name, :last_name, :state, :vat_id, :zip_code)
+    representation(:standard, :id, :address, :address2, :billing_email, :city, :company, :country, :first_name, :last_name, :state, :vat_id, :zip_code, :has_local_registration)
   end
 
   class Renderer::V2CreditCardInfo < ModelRenderer

lib/travis/api/v3/services/v2_subscription/update_address.rb

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Services::V2Subscription::UpdateAddress < Service
-    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email
+    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, :has_local_registration
 
     def run!
       raise LoginRequired unless access_control.full_access_or_logged_in?

lib/travis/api/v3/services/v2_subscriptions/create.rb

@@ -2,7 +2,7 @@ module Travis::API::V3
   class Services::V2Subscriptions::Create < Service
     result_type :v2_subscription
     params :plan, :coupon, :organization_id, :client_secret, :v1_subscription_id
-    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, prefix: :billing_info
+    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, :has_local_registration, prefix: :billing_info
     params :token, prefix: :credit_card_info
 
     def run!

spec/v3/models/v2_subscription_spec.rb

@@ -8,6 +8,20 @@
       'status' => nil,
       'valid_to' => nil,
       'canceled_at' => nil,
+      'billing_info' => {
+        'address' => 'Washington str.',
+        'address2' => '',
+        'billing_email' => '[email protected]',
+        'city' => 'Washington',
+        'company' => 'Travis CI',
+        'country' => 'United States of America',
+        'first_name' => 'John',
+        'last_name' => 'Doe',
+        'has_local_registration' => true,
+        'state' => 'Alabama',
+        'vat_id' => '',
+        'zip_code' => '2001',
+      },
       'plan_config' => {
         'id' => 'pro_tier_plan',
         'name' => 'Pro Tier Plan',
@@ -103,6 +117,8 @@
       expect(subject.permissions).to be_a(Travis::API::V3::Models::BillingPermissions)
       expect(subject.owner).to be_a(Travis::API::V3::Models::User)
       expect(subject.payment_intent).to be_a(Travis::API::V3::Models::PaymentIntent)
+      expect(subject.billing_info).to be_a(Travis::API::V3::Models::V2BillingInfo)
+      expect(subject.billing_info.has_local_registration).to be true
     end
   end
 end

spec/v3/services/subscription/update_address_spec.rb

@@ -29,7 +29,7 @@
       'country' => 'Germany',
       'zip_code' => '10001',
       'billing_email' => '[email protected]',
-      'has_local_registration' => nil
+      'has_local_registration' => true
       } }
     let(:subscription_id) { rand(999) }
 
@@ -44,7 +44,7 @@
             'country' => 'Germany',
             'zip_code' => '10001',
             'billing_email' => '[email protected]',
-            'has_local_registration' => nil
+            'has_local_registration' => true
           })
         .to_return(status: 204)
     end

spec/v3/services/v2_subscriptions/all_spec.rb

@@ -207,7 +207,8 @@
             'last_name' => 'rosas',
             'state' => nil,
             'vat_id' => '123456',
-            'zip_code' => '28450'
+            'zip_code' => '28450',
+            'has_local_registration' => false,
           },
           'credit_card_info' => {
             '@type' => 'v2_credit_card_info',

spec/v3/services/v2_subscriptions/create_spec.rb

@@ -35,6 +35,8 @@
         'billing_info.country' => 'Germany',
         'billing_info.zip_code' => '10001',
         'billing_info.billing_email' => '[email protected]',
+        'billing_info.state' => 'Alabama',
+        'billing_info.has_local_registration' => true,
         'credit_card_info.token' => 'token_from_stripe'
       }
     end
@@ -56,6 +58,8 @@
               'country' => 'Germany',
               'zip_code' => '10001',
               'billing_email' => '[email protected]',
+              'state' => 'Alabama',
+              'has_local_registration' => true
             },
             'credit_card_info' => {
               'token' => 'token_from_stripe'
@@ -161,6 +165,7 @@
               'vat_id' => nil,
               'zip_code' => '10001',
               'billing_email' => '[email protected]',
+              'has_local_registration' => true,
             },
             'credit_card_info' => {
               'card_owner' => 'Travis Schmidt',
@@ -276,7 +281,8 @@
             'city' => 'Berlin',
             'state' => nil,
             'country' => 'Germany',
-            'vat_id' => nil
+            'vat_id' => nil,
+            'has_local_registration' => true,
           },
           'credit_card_info' => {
             'id' => 1234,