Fix pagination headers in grouped environments API

2 files changed, 25 insertions, 9 deletions

diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb
index fe16a3784c4..d0a60f134da 100644
--- a/app/serializers/environment_serializer.rb
+++ b/app/serializers/environment_serializer.rb
@@ -20,8 +20,6 @@ class EnvironmentSerializer < BaseSerializer
   end
 
   def represent(resource, opts = {})
-    resource = @paginator.paginate(resource) if paginated?
-
     if itemized?
       itemize(resource).map do |item|
         { name: item.name,
@@ -29,6 +27,8 @@ class EnvironmentSerializer < BaseSerializer
           latest: super(item.latest, opts) }
       end
     else
+      resource = @paginator.paginate(resource) if paginated?
+
       super(resource, opts)
     end
   end
@@ -36,15 +36,20 @@ class EnvironmentSerializer < BaseSerializer
   private
 
   def itemize(resource)
-    items = resource.group(:item_name).order('item_name ASC')
-      .pluck('COALESCE(environment_type, name) AS item_name',
-             'COUNT(*) AS environments_count',
-             'MAX(id) AS last_environment_id')
+    items = resource.order('folder_name ASC')
+      .group('COALESCE(environment_type, name)')
+      .select('COALESCE(environment_type, name) AS folder_name',
+              'COUNT(*) AS size', 'MAX(id) AS last_id')
+
+    # It makes a difference when you call `paginate` method, because
+    # although `page` is effective at the end, it calls counting methods
+    # immediately.
+    items = @paginator.paginate(items) if paginated?
 
-    environments = resource.where(id: items.map(&:last)).index_by(&:id)
+    environments = resource.where(id: items.map(&:last_id)).index_by(&:id)
 
-    items.map do |name, size, id|
-      Item.new(name, size, environments[id])
+    items.map do |item|
+      Item.new(item.folder_name, item.size, environments[item.last_id])
     end
   end
 end
diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index 1b95f1ff198..6a6df377b35 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -181,6 +181,17 @@ describe EnvironmentSerializer do
           expect(subject.first[:name]).to eq 'production'
           expect(subject.second[:name]).to eq 'staging'
         end
+
+        it 'appends correct total page count header' do
+          expect(subject).not_to be_empty
+          expect(response).to have_received(:[]=).with('X-Total', '3')
+        end
+
+        it 'appends correct page count headers' do
+          expect(subject).not_to be_empty
+          expect(response).to have_received(:[]=).with('X-Total-Pages', '2')
+          expect(response).to have_received(:[]=).with('X-Per-Page', '2')
+        end
       end
     end
   end