From 079c4c9593ae69153558c7dd451919974d7af419 Mon Sep 17 00:00:00 2001
From: Rolf Schmidt <rs@znuny.com>
Date: Thu, 6 Dec 2018 15:35:00 +0100
Subject: [PATCH] Fixed issue #2391 - Wrong file size calculation in monitoring
 controller (postgres only)

---
 app/controllers/monitoring_controller.rb     |  2 +-
 spec/requests/integration/monitoring_spec.rb | 70 +++++++++++++++++++-
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/app/controllers/monitoring_controller.rb b/app/controllers/monitoring_controller.rb
index 0d9d15829..ebfa61ef4 100644
--- a/app/controllers/monitoring_controller.rb
+++ b/app/controllers/monitoring_controller.rb
@@ -225,7 +225,7 @@ curl http://localhost/api/v1/monitoring/status?token=XXX
     end
 
     if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
-      sql = 'SELECT SUM(CAST(coalesce(size, \'0\') AS INTEGER)) FROM stores WHERE id IN (SELECT DISTINCT(store_file_id) FROM stores)'
+      sql = 'SELECT SUM(CAST(coalesce(size, \'0\') AS INTEGER)) FROM stores WHERE id IN (SELECT MAX(id) FROM stores GROUP BY store_file_id)'
       records_array = ActiveRecord::Base.connection.exec_query(sql)
       if records_array[0] && records_array[0]['sum']
         sum = records_array[0]['sum']
diff --git a/spec/requests/integration/monitoring_spec.rb b/spec/requests/integration/monitoring_spec.rb
index bce34009e..1d997d853 100644
--- a/spec/requests/integration/monitoring_spec.rb
+++ b/spec/requests/integration/monitoring_spec.rb
@@ -110,9 +110,10 @@ RSpec.describe 'Monitoring', type: :request do
 
       # test storage usage
       string = ''
-      10.times do
+      1000.times do
         string += 'Some Text Some Text Some Text Some Text Some Text Some Text Some Text Some Text'
       end
+
       Store.add(
         object: 'User',
         o_id: 1,
@@ -141,9 +142,76 @@ RSpec.describe 'Monitoring', type: :request do
       expect(json_response.key?('counts')).to be_truthy
       expect(json_response.key?('last_created_at')).to be_truthy
 
+      first_json_response_kb = 0
       if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
         expect(json_response['storage']).to be_truthy
         expect(json_response['storage'].key?('kB')).to be_truthy
+        expect(json_response['storage']['kB']).to be > 0
+        expect(json_response['storage'].key?('MB')).to be_truthy
+        expect(json_response['storage'].key?('GB')).to be_truthy
+
+        first_json_response_kb = json_response['storage']['kB']
+      else
+        expect(json_response['storage']).to be_falsey
+      end
+
+      # save same file again
+      Store.add(
+        object: 'User',
+        o_id: 1,
+        data: string,
+        filename: 'filename.txt',
+        created_by_id: 1,
+      )
+
+      # status
+      get "/api/v1/monitoring/status?token=#{token}", params: {}, as: :json
+      expect(response).to have_http_status(200)
+
+      expect(json_response).to be_a_kind_of(Hash)
+      expect(json_response['error']).to be_falsey
+      expect(json_response.key?('agents')).to be_truthy
+      expect(json_response.key?('last_login')).to be_truthy
+      expect(json_response.key?('counts')).to be_truthy
+      expect(json_response.key?('last_created_at')).to be_truthy
+
+      if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
+        expect(json_response['storage']).to be_truthy
+        expect(json_response['storage'].key?('kB')).to be_truthy
+
+        # check if the stores got summarized. value should be the same because the file has the same fingerprint
+        expect(json_response['storage']['kB']).to eq(first_json_response_kb)
+        expect(json_response['storage'].key?('MB')).to be_truthy
+        expect(json_response['storage'].key?('GB')).to be_truthy
+      else
+        expect(json_response['storage']).to be_falsey
+      end
+
+      Store.add(
+        object: 'User',
+        o_id: 1,
+        data: string + '123',
+        filename: 'filename2.txt',
+        created_by_id: 1,
+      )
+
+      # status
+      get "/api/v1/monitoring/status?token=#{token}", params: {}, as: :json
+      expect(response).to have_http_status(200)
+
+      expect(json_response).to be_a_kind_of(Hash)
+      expect(json_response['error']).to be_falsey
+      expect(json_response.key?('agents')).to be_truthy
+      expect(json_response.key?('last_login')).to be_truthy
+      expect(json_response.key?('counts')).to be_truthy
+      expect(json_response.key?('last_created_at')).to be_truthy
+
+      if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
+        expect(json_response['storage']).to be_truthy
+        expect(json_response['storage'].key?('kB')).to be_truthy
+
+        # check if the stores got summarized. value should be greather than the size of just one file (saved 2 times)
+        expect(json_response['storage']['kB']).to be > first_json_response_kb
         expect(json_response['storage'].key?('MB')).to be_truthy
         expect(json_response['storage'].key?('GB')).to be_truthy
       else