Merge pull request #16276 from CartoDB/feature/ch149099/return-access-info-for-bq

Add do_bq_project and do_bq_dataset to api/v3/me endpoint

NEWS.md

@@ -16,6 +16,7 @@ Development
 - Support staging hostname in the catalog [#16258](https://github.com/CartoDB/cartodb/pull/16258)
 - Allow the usage of WMTS URLs with parameters to create custom basemaps [#16271](https://github.com/CartoDB/cartodb/pull/16271)
 - Sync license_type in redis with the values coming from Central [#16270](https://github.com/CartoDB/cartodb/pull/16270)
+- Add `do_bq_project` and `do_bq_dataset` to `api/v3/me` endpoint [#16276](https://github.com/CartoDB/cartodb/pull/16276)
 - Fix subscription/sample filter for datasets [#16254](https://github.com/CartoDB/cartodb/pull/16254)
 - Use fully qualified table name while creating a new map from a shared dataset [#16241](https://github.com/CartoDB/cartodb/pull/16241)
 

app/controllers/carto/api/user_presenter.rb

@@ -46,7 +46,7 @@ module Carto
           public_visualization_count: @user.public_visualization_count,
           all_visualization_count:    @user.all_visualization_count,
           org_user:                   @user.organization_id.present?,
-          remove_logo:                @user.remove_logo?
+          remove_logo:                @user.remove_logo?,
         }
 
         if fetch_groups
@@ -243,7 +243,9 @@ module Carto
           location: @user.location,
           mfa_configured: @user.multifactor_authentication_configured?,
           is_enterprise: @user.enterprise?,
-          do_enabled: @user.do_enabled?
+          do_enabled: @user.do_enabled?,
+          do_bq_project: @user&.gcloud_settings&.[](:bq_project),
+          do_bq_dataset: @user&.gcloud_settings&.[](:bq_dataset),
         }
 
         if @user.google_maps_geocoder_enabled? && (!@user.organization.present? || @user.organization_owner?)

app/services/carto/do_licensing_service.rb

@@ -51,7 +51,7 @@ module Carto
       expires_at = Time.parse(subscription['expires_at']) if subscription['expires_at'].present?
       subscription_data = subscription.merge(parsed_entity_id).merge({
         id: subscription['dataset_id'],
-        status: (expires_at && (Time.now >= expires_at)) ? 'expired' : subscription['status']
+        status: (expires_at && (Time.now >= expires_at)) ? 'expired' : subscription['status'],
       })
       subscription_data.with_indifferent_access
     end
@@ -77,7 +77,7 @@ module Carto
           expires_at: dataset[:expires_at].to_s,
           status: dataset[:status],
           available_in: dataset[:available_in],
-          license_type: dataset[:license_type] || nil,
+          license_type: dataset[:license_type],
           type: dataset[:type],
           estimated_size: entity_info[:estimated_size].to_i || 0,
           estimated_row_count: entity_info[:estimated_row_count].to_i || 0,

spec/models/user_presenter_spec.rb

@@ -277,6 +277,8 @@ describe Carto::Api::UserPresenter do
     new_poro[:next_billing_period] = Time.parse('2018-02-01')
     new_poro[:is_enterprise] = true
     new_poro[:do_enabled] = false
+    new_poro[:do_bq_project] = nil
+    new_poro[:do_bq_dataset] = nil
     new_poro
   end