Drop pagy

Gemfile

@@ -22,7 +22,6 @@ gem "mission_control-jobs"
 gem "oj"
 gem "omniauth-airtable"
 gem "omniauth-rails_csrf_protection"
-gem "pagy"
 gem "pg"
 gem "pghero"
 gem "pg_lock"

Gemfile.lock

@@ -290,7 +290,6 @@ GEM
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     ostruct (0.6.1)
-    pagy (9.3.1)
     parallel (1.26.3)
     parser (3.3.6.0)
       ast (~> 2.4.1)
@@ -370,7 +369,7 @@ GEM
     rdoc (6.8.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.11)
+    reline (0.5.12)
       io-console (~> 0.5)
     require-hooks (0.2.2)
     responders (3.1.1)
@@ -529,7 +528,6 @@ DEPENDENCIES
   oj
   omniauth-airtable
   omniauth-rails_csrf_protection
-  pagy
   pg
   pg_lock
   pghero

app/controllers/api/paginatable.rb

@@ -0,0 +1,18 @@
+module Api
+  module Paginatable
+    def paginate(relation)
+      limit = params[:items].presence.to_i
+      limit = 10 if limit.zero?
+      limit = [limit, 100].min
+      count = relation.count(:all)
+      pages = (count.to_f / limit).ceil
+      page = [params[:page].to_i, 1].max
+      page = pages if page > pages && pages.positive?
+
+      offset = (page - 1) * limit
+      records = relation.offset(offset).limit(limit)
+
+      [records, {count:, page:, limit:, pages:}]
+    end
+  end
+end

app/controllers/api/shots_controller.rb

@@ -1,23 +1,19 @@
 module Api
   class ShotsController < Api::BaseController
-    include Pagy::Backend
+    include Paginatable
 
     before_action :verify_upload_access, only: %i[upload]
     before_action :verify_write_access, only: %i[destroy]
 
     def index
-      limit = params[:items].presence.to_i
-      limit = 10 if limit.zero?
-      limit = 100 if limit.to_i > 100
-
       shots = Current.user.present? ? Current.user.shots : Shot.visible
       shots = shots.non_premium unless Current.user&.premium?
       shots = shots.by_start_time.select(:id, :start_time, :user_id)
-
-      pagy, shots = pagy(shots, limit:)
+      shots, paging = paginate(shots)
       data = shots.map { |s| {clock: s.start_time.to_i, id: s.id} }
-      render json: {data:, paging: pagy_metadata(pagy)}
-    rescue Pagy::VariableError
+      render json: {data:, paging:}
+    rescue StandardError => e
+      Appsignal.report_error(e)
       render json: {error: "Could not paginate"}, status: :unprocessable_entity
     end
 

test/controllers/api/shots_controller_test.rb

@@ -19,6 +19,25 @@ class ShotsControllerTest < ActionDispatch::IntegrationTest
       json_response = response.parsed_body
       assert_equal 5, json_response["data"].length
       assert_includes json_response, "paging"
+      assert_equal %w[count page limit pages], json_response["paging"].keys
+      assert_equal 5, json_response["paging"]["count"]
+      assert_equal 1, json_response["paging"]["page"]
+      assert_equal 10, json_response["paging"]["limit"]
+      assert_equal 1, json_response["paging"]["pages"]
+
+      shot_data = json_response["data"].first
+      assert_equal %w[clock id], shot_data.keys
+
+      get api_shots_url(items: 2, page: 3), headers: auth_headers(user), as: :json
+      assert_response :success
+
+      json_response = response.parsed_body
+      assert_equal 1, json_response["data"].length
+
+      assert_equal 5, json_response["paging"]["count"]
+      assert_equal 3, json_response["paging"]["page"]
+      assert_equal 2, json_response["paging"]["limit"]
+      assert_equal 3, json_response["paging"]["pages"]
 
       shot_data = json_response["data"].first
       assert_equal %w[clock id], shot_data.keys