model_driven_api 3.2.9 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cd19d5c69348493256387515146bca60041d648fd49acc939181dd8a859e35
-  data.tar.gz: e5a2a33889767d9b8aedbfa4e6eb2895a5153a313d32073e767080cb20481692
+  metadata.gz: 0fbc1608cd8d9b131868990f8944579ebb29c38b741eb7ccd5a9648dec3778e2
+  data.tar.gz: f01fd64b659acd78457d1b1ff437739172dd5d79ca4cd5f236e0e9fd8bc7323d
 SHA512:
-  metadata.gz: c4482340718ac9a9b88a4381cf2e807f3c226aa6979c4f3d45c4fb1e2ddff5668ba3acc748b40fbc431f9c3702a05a6e81a4ccc4baad154a8ce8c447b165b4e9
-  data.tar.gz: b252c95eed43d4c6216cf29c7f184bb3563128319f9605d9454bbb67cfe32eab0781b8f085cc478cc110c27ed6d509dc61c3d8add74ffc35d367ffc57d6e108c
+  metadata.gz: b8809fca597c152adaa6e1c78cb5d6c9866bc912dcd38bc66245af6bce78210d6c409d9bc028b3d01a9c0bd1fbe801af8ee88811c81adb01a59aa9878564070f
+  data.tar.gz: 33809d4606db5d854df3f1381b1639391df88813e7a377a59adcd17aeba6b9110cbd12bc2b62883a63d9792cd8df4bb2a29056b45a6ca7a3ca61eef5c7c07704

data/app/controllers/api/v2/application_controller.rb

@@ -23,28 +23,27 @@ class Api::V2::ApplicationController < ActionController::API
     # Keeping this automation can be too dangerous and lead to unpredicted results
     # TODO: Remove it
     # @q = (@model.column_names.include?("user_id") ? @model.where(user_id: current_user.id) : @model).ransack(@query.presence|| params[:q])
+    Rails.logger.debug("Querying for #{@model} with #{@query}: #{@query.presence || params[:q]}")
     @q = @model.ransack(@query.presence || params[:q])
-    @records_all = @q.result # (distinct: true) Removing, but I'm not sure, with it I cannot sort in postgres for associated records (throws an exception on misuse of sort with distinct)
     page = (@page.presence || params[:page])
     per = (@per.presence || params[:per])
     # pages_info = (@pages_info.presence || params[:pages_info])
     count = (@count.presence || params[:count])
+    @records_count = @q.result.count
+    @records_all = @q.result
     # Pagination
-    @records = @records_all.page(page).per(per)
+    @records = @q.result.page(page).per(per) # (distinct: true) Removing, but I'm not sure, with it I cannot sort in postgres for associated records (throws an exception on misuse of sort with distinct)
     # Content-Range: posts 0-4/27
     range_start = [(page.to_i - 1) * per.to_i, 0].max
     range_end = [0, page.to_i * per.to_i - 1].max
     response.set_header("Content-Range", "#{@model.table_name} #{range_start}-#{range_end}/#{@records.total_count}")
 
-    # If there's the keyword pagination_info, then return a pagination info object
-    # return render json: {count: @records_all.count,current_page_count: @records.count,next_page: @records.next_page,prev_page: @records.prev_page,is_first_page: @records.first_page?,is_last_page: @records.last_page?,is_out_of_range: @records.out_of_range?,pages_count: @records.total_pages,current_page_number: @records.current_page } if !pages_info.blank?
-
     # puts "ALL RECORDS FOUND: #{@records_all.inspect}"
-    status = @records_all.blank? ? 404 : 200
+    status = @records_count.zero? ? 404 : 200
     # puts "If it's asked for page number, then paginate"
     return render json: @records.as_json(json_attrs), status: status if !page.blank? # (@json_attrs || {})
     #puts "if you ask for count, then return a json object with just the number of objects"
-    return render json: { count: @records_all.size } if !count.blank?
+    return render json: { count: @records_count } if !count.blank?
     #puts "Default"
     json_out = @records_all.as_json(json_attrs)
     #puts "JSON ATTRS: #{json_attrs}"

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.2.9".freeze
+  VERSION = "3.2.10".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.10
 platform: ruby
 authors:
 - Gabriele Tassoni
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons