From 02490f05256e8a3f974151ac8b8c1632eb1e12f0 Mon Sep 17 00:00:00 2001
From: cgonzalez <cgonzalez@cartodb.com>
Date: Tue, 13 Apr 2021 13:22:02 +0100
Subject: [PATCH] Update NEWS.md and fix Rubocop offenses

---
 NEWS.md                                       |  1 +
 .../carto/api/visualizations_controller.rb    | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 15655f5d61..b0c773afe0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -111,6 +111,7 @@ sudo make install
 - Modify superadmin users activity endpoint to allow pagination [#16226](https://github.com/CartoDB/cartodb/pull/16226)
 - Update cartodb-common to v1.1.1, which contains serveral logging fixes [#16182](https://github.com/CartoDB/cartodb/pull/16182)
 - Only load DO totals in dashboard when it is needed [#16161](https://github.com/CartoDB/cartodb/pull/16161)
+- Fix subscription/sample filter for datasets [#16254](https://github.com/CartoDB/cartodb/pull/16254)
 - Fix SAML and LDAP integrations for on-premise installations [#16239](https://github.com/CartoDB/cartodb/pull/16239)
 - Read config for public statics compilation [#16234](https://github.com/CartoDB/cartodb/pull/16234)
 - Show dataset version in subscription list and details [#16235](https://github.com/CartoDB/cartodb/pull/16235)
diff --git a/app/controllers/carto/api/visualizations_controller.rb b/app/controllers/carto/api/visualizations_controller.rb
index 488602da1a..0127a911fe 100644
--- a/app/controllers/carto/api/visualizations_controller.rb
+++ b/app/controllers/carto/api/visualizations_controller.rb
@@ -501,18 +501,18 @@ module Carto
 
       def calculate_do_totals(vqb)
         subscription_count = if params[:subscribed] == 'true'
-          vqb.count
-        else
-          vqb.filtered_query.includes(map: { user_table: :data_import }).find_each.lazy
-             .count { |v| v.subscription.present? }
-        end
+                               vqb.count
+                             else
+                               vqb.filtered_query.includes(map: { user_table: :data_import }).find_each.lazy
+                                  .count { |v| v.subscription.present? }
+                             end
 
         sample_count = if params[:sample] == 'true'
-          vqb.count
-        else
-          vqb.filtered_query.includes(map: { user_table: :data_import }).find_each.lazy
-             .count { |v| v.sample.present? }
-        end
+                         vqb.count
+                       else
+                         vqb.filtered_query.includes(map: { user_table: :data_import }).find_each.lazy
+                            .count { |v| v.sample.present? }
+                       end
 
         { total_subscriptions: subscription_count, total_samples: sample_count }
       end