From 887ec452eb0e7f3076e4be5457671bab0ea3d00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Miedes=20Garc=C3=A9s?= Date: Wed, 30 Sep 2020 10:53:15 +0200 Subject: [PATCH] Please linter --- .../cartodb_central_synchronizable.rb | 4 +- app/presenters/organization_presenter.rb | 41 +++++++++++-------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/models/concerns/cartodb_central_synchronizable.rb b/app/models/concerns/cartodb_central_synchronizable.rb index 8427ccf2bb..87a8f00fee 100644 --- a/app/models/concerns/cartodb_central_synchronizable.rb +++ b/app/models/concerns/cartodb_central_synchronizable.rb @@ -158,14 +158,14 @@ module CartodbCentralSynchronizable dashboard_viewed_at email_verification_token email_verification_sent_at ) attrs = attributes.symbolize_keys.slice(*allowed_attributes) - attrs[:multifactor_authentication_status] = multifactor_authentication_status() + attrs[:multifactor_authentication_status] = multifactor_authentication_status case action when :create attrs[:remote_user_id] = id attrs.delete(:organization_id) attrs when :update - attrs[:batch_queries_statement_timeout] = batch_queries_statement_timeout() + attrs[:batch_queries_statement_timeout] = batch_queries_statement_timeout attrs end end diff --git a/app/presenters/organization_presenter.rb b/app/presenters/organization_presenter.rb index 2be5226447..da9f5b8776 100644 --- a/app/presenters/organization_presenter.rb +++ b/app/presenters/organization_presenter.rb @@ -20,6 +20,28 @@ class OrganizationPresenter < BasePresenter avatar_url: owner ? owner.avatar : nil, groups: owner_groups }, + geocoder_provider: geocoder_provider, + isolines_provider: isolines_provider, + routing_provider: routing_provider, + seats: seats, + twitter_username: twitter_username, + location: location, + updated_at: updated_at, + website: website, + avatar_url: avatar_url, + password_expiration_in_d: password_expiration_in_d + }.merge(quotas_information) + end + + def extended_representation + default_representation.merge( + table_count: visualizations_builder.with_type(Carto::Visualization::TYPE_CANONICAL).count, + map_count: visualizations_builder.with_type(Carto::Visualization::TYPE_DERIVED).count + ) + end + + def quotas_information + { quota_in_bytes: quota_in_bytes, unassigned_quota: unassigned_quota, used_quota: db_size_in_bytes, @@ -37,9 +59,6 @@ class OrganizationPresenter < BasePresenter quota: mapzen_routing_quota, monthly_use: get_mapzen_routing_calls }, - geocoder_provider: geocoder_provider, - isolines_provider: isolines_provider, - routing_provider: routing_provider, obs_snapshot: { quota: obs_snapshot_quota, monthly_use: get_obs_snapshot_calls @@ -54,24 +73,10 @@ class OrganizationPresenter < BasePresenter block_price: twitter_datasource_block_price, block_size: twitter_datasource_block_size, monthly_use: get_twitter_imports_count - }, - seats: seats, - twitter_username: twitter_username, - location: location, - updated_at: updated_at, - website: website, - avatar_url: avatar_url, - password_expiration_in_d: password_expiration_in_d + } } end - def extended_representation - default_representation.merge( - table_count: visualizations_builder.with_type(Carto::Visualization::TYPE_CANONICAL).count, - map_count: visualizations_builder.with_type(Carto::Visualization::TYPE_DERIVED).count - ) - end - def visualizations_builder Carto::VisualizationQueryBuilder.new.with_organization_id(id) end