grape-listing 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45e458a8f8256d37914e7844b87ab5ca89a828649e7de41743495dafa2122bbd
-  data.tar.gz: 6fc8dd5d2f6ae95c8122c74f895129282835bf42c45d8fd8f553d6df69102f16
+  metadata.gz: ebde4f181db7c89e1def2eeb1af0fe820da5f89b0921dc88080d0b793f3d01ac
+  data.tar.gz: 5f077bb264dcf16c617be8a22c78e0769a1270af387ee2f171b78be398a35baa
 SHA512:
-  metadata.gz: 87a26725a413209783864fb440ea285aaae589b80597f4ae23217dd135e1c380fd3ba8d6e3e74640bb2890d4a947ac1c41a6c75ba2560c862c3f56cf4ff0f44d
-  data.tar.gz: 470b431dbb7f26af609bfe09de5ad38ddb3cf7d004880c276ed8c77acade62107a88f57dc6a936b0a385fa349f5908be55a58b8e6c62f241f61e612dde1e1641
+  metadata.gz: 0cc783b3c30a87083033d825a7d80624af8d513c55989b6cd572a9dea1786caa72bc1306f50bf1a5f6ca6f136e9008b4c08a6b93713d4e5da58b12e06684500d
+  data.tar.gz: dde882747da769a523f0c31b4862327d8b959f667a14e5b151b92dca8de9b609204467c2b9bfbfc79e19b75a2b27b49243184ac434bb7ee858a496371b6c6c78

data/lib/grape/dsl.rb

@@ -3,7 +3,12 @@ module Grape
     module InsideRoute
 
       def listing(model:, entity:, scopes: nil, search: nil, paginate: true, caching: false)
-        opts = listing_opts(model, entity, scopes, search, caching)
+        # параметры запроса API
+        request_method = request.env['REQUEST_METHOD']
+        request_uri = request.env['REQUEST_URI']
+
+        # опции для сервиса
+        opts = listing_opts(model, entity, scopes, search, caching, request_method, request_uri)
 
         if params[:spreadsheet]
           listing_spreadsheet(**opts)
@@ -16,9 +21,9 @@ module Grape
 
       private
 
-      def listing_opts(model, entity, scopes, search, caching)
+      def listing_opts(model, entity, scopes, search, caching, request_method, request_uri)
         # стандартные опции
-        opts = { model:, entity:, scopes:, search:, params:, current_user:, caching: }
+        opts = { model:, entity:, scopes:, search:, params:, current_user:, caching:, request_method:, request_uri: }
 
         # требуемый список полей (+стандартные) для фильтрации в Grape Entity
         if params[:columns]

data/lib/listing_service/args_handling.rb

@@ -7,6 +7,10 @@ module GrapeListing
       # обрабатываемая модель
       @model = args[:model]
 
+      # параметры адреса запроса API
+      @request_method = args[:request_method]
+      @request_uri = args[:request_uri]
+
       # параметры запроса и текущий пользователь
       @params = args[:params].stringify_keys
       @current_user = args[:current_user]
@@ -49,8 +53,8 @@ module GrapeListing
 
     def records_count
       # получение кол-ва записей из кеша
-      cache_key = "#{@model}_records_count"
-      cached = GrapeListing.cache.read(cache_key)
+      key = count_cache_key
+      cached = GrapeListing.cache.read(key)
       return cached if cached
 
       # получение кол-ва записей из запроса к БД
@@ -58,11 +62,19 @@ module GrapeListing
 
       # кеширование кол-ва записей при превышении порогового значения
       if count >= 1_000
-        GrapeListing.cache.write(cache_key, count, expires_in: 30.minutes)
+        GrapeListing.cache.write(key, count, expires_in: 30.minutes)
       end
 
       count
     end
 
+    def count_cache_key
+      # пример: "GET api/v1/users?active=true"
+      body = "#{@request_method} #{@request_uri}"
+
+      enc = Digest::MD5.hexdigest(body)
+      "listing_cached_count_#{enc}"
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport