Initial v2 subscription for new users (#1131)

Create initial subscription on user creation

Author: piotrmilcarz

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 import:
-  - travis-ci/build-configs:db-setup.yml
+  - travis-ci/build-configs:db-setup.yml@sb-remove-user-travis
 
 rvm: 2.6.5
 

lib/travis/api/app/endpoint/authorization.rb

@@ -134,6 +134,7 @@ class Authorization < Endpoint
         def update_first_login(user)
           unless user.first_logged_in_at
             user.update_attributes(first_logged_in_at: Time.now)
+            user.create_initial_subscription unless Travis.config.org?
           end
         end
 
@@ -209,7 +210,7 @@ def vcs_handshake
               redirect to(vcs_data['redirect_uri'])
               return
             end
-
+            update_first_login(user)
             yield serialize_user(User.find(vcs_data['user']['id'])), vcs_data['token'], payload(params[:provider])
           else
             state = vcs_create_state(params[:origin] || params[:redirect_uri])

lib/travis/api/v3/billing_client.rb

@@ -89,6 +89,11 @@ def create_subscription(subscription_data)
       handle_subscription_response(response)
     end
 
+    def create_initial_v2_subscription
+      response = connection.post('/v2/initial_subscription')
+      handle_v2_subscription_response(response)
+    end
+
     def create_v2_subscription(subscription_data)
       response = connection.post('/v2/subscriptions', subscription_data)
       handle_v2_subscription_response(response)

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

@@ -82,5 +82,10 @@ def installation
     def github?
       vcs_type == 'GithubUser'
     end
+
+    def create_initial_subscription
+      client = BillingClient.new(id)
+      client.create_initial_v2_subscription
+    end
   end
 end

lib/travis/model/user.rb

@@ -170,6 +170,11 @@ def github?
     vcs_type == 'GithubUser'
   end
 
+  def create_initial_subscription
+    client = Travis::API::V3::BillingClient.new(id)
+    client.create_initial_v2_subscription
+  end
+
   protected
 
     def track_previous_changes

spec/unit/endpoint/authorization/user_manager_spec.rb

@@ -1,4 +1,4 @@
-describe Travis::Api::App::Endpoint::Authorization::UserManager do
+describe Travis::Api::App::Endpoint::Authorization::UserManager, billing_spec_helper: true do
   let(:manager) { described_class.new(data, 'abc123') }
 
   before do
@@ -51,9 +51,15 @@
     context 'with existing user' do
       let!(:user) { FactoryBot.create(:user, login: 'drogus', github_id: 456, github_oauth_token: token) }
       let(:token) { nil }
+      let(:billing_url) { 'http://billingfake.travis-ci.com' }
+      let(:billing_auth_key) { 'secret' }
 
       before do
         allow(manager).to receive(:education).and_return(false)
+        Travis.config.billing.url = billing_url
+        Travis.config.billing.auth_key = billing_auth_key
+        stubbed_request = stub_billing_request(:post, "/v2/initial_subscription", auth_key: billing_auth_key, user_id: user.id)
+                          .to_return(status: 201, body: JSON.dump(billing_v2_subscription_response_body('id' => 456, 'owner' => { 'type' => 'User', 'id' => user.id })))
       end
 
       context 'without any User#tokens record' do

spec/unit/endpoint/authorization_spec.rb

@@ -1,6 +1,9 @@
-describe Travis::Api::App::Endpoint::Authorization do
+describe Travis::Api::App::Endpoint::Authorization, billing_spec_helper: true do
   include Travis::Testing::Stubs
 
+  let(:billing_url) { 'http://billingfake.travis-ci.com' }
+  let(:billing_auth_key) { 'secret' }
+
   before do
     add_endpoint '/info' do
       get '/login', scope: :private do
@@ -21,6 +24,10 @@
       scope: 'public_repo,user:email,new_scope',
       insufficient_access_redirect_url: 'https://travis-ci.org/insufficient_access'
     }
+    Travis.config.billing.url = billing_url
+    Travis.config.billing.auth_key = billing_auth_key
+    WebMock.stub_request(:post, 'http://billingfake.travis-ci.com/v2/initial_subscription')
+           .to_return(status: 200, body: JSON.dump(billing_v2_subscription_response_body('id' => 456, 'owner' => { 'type' => 'User', 'id' => user.id })))
   end
 
   after do