diff --git a/NEWS.md b/NEWS.md index 7cd9e5227f..fa5a66e5f3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -18,6 +18,7 @@ Development - 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) - Add endpoint to update DO subscriptions and manage status of full access requests [#16277](https://github.com/CartoDB/cartodb/pull/16277) +- Add new fields `full_access_[aws|azure]_info` to DO subscriptions [#16278](https://github.com/CartoDB/cartodb/pull/16278) - 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) diff --git a/app/services/carto/do_licensing_service.rb b/app/services/carto/do_licensing_service.rb index eb5194517e..4ae6f635e2 100644 --- a/app/services/carto/do_licensing_service.rb +++ b/app/services/carto/do_licensing_service.rb @@ -88,6 +88,8 @@ module Carto full_access_status_bq: dataset[:full_access_status_bq], full_access_status_azure: dataset[:full_access_status_azure], full_access_status_aws: dataset[:full_access_status_aws], + full_access_aws_info: dataset[:full_access_aws_info], + full_access_azure_info: dataset[:full_access_azure_info], type: dataset[:type], estimated_size: entity_info[:estimated_size].to_i || 0, estimated_row_count: entity_info[:estimated_row_count].to_i || 0, diff --git a/spec/services/carto/do_licensing_service_spec.rb b/spec/services/carto/do_licensing_service_spec.rb index 35874ab5ec..8334de929a 100644 --- a/spec/services/carto/do_licensing_service_spec.rb +++ b/spec/services/carto/do_licensing_service_spec.rb @@ -53,6 +53,7 @@ describe Carto::DoLicensingService do estimated_columns_count: 0, num_bytes: 0, sync_status: 'unsynced', unsyncable_reason: nil, unsynced_errors: nil, sync_table: nil, sync_table_id: nil, synchronization_id: nil, full_access_status_bq: nil, full_access_status_azure: nil, full_access_status_aws: nil, + full_access_aws_info: nil, full_access_azure_info: nil, }.stringify_keys ]