Merge pull request #70 from blocknotes/dev/internal-improvements

Dev & Test internal improvements

Author: blocknotes

.rubocop.yml

@@ -22,6 +22,10 @@ Lint/MissingSuper:
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true
 
+Naming/FileName:
+  Exclude:
+    - spec/dummy/db/*
+
 RSpec/DescribeClass:
   Enabled: false
 

Gemfile

@@ -44,6 +44,7 @@ end
 gem 'concurrent-ruby', '1.3.4'
 
 gem 'bigdecimal'
+gem 'bullet'
 gem 'image_processing', '>= 1.2'
 gem 'mutex_m'
 gem 'puma'

Makefile

@@ -38,6 +38,9 @@ console:
 lint:
 	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rubocop
 
+seed:
+	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rails db:seed
+
 server:
 	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rails server -b 0.0.0.0 -p ${SERVER_PORT}
 

extra/Dockerfile

@@ -5,9 +5,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV DEVEL=1
 ENV LANG=C.UTF-8
 
-RUN apt-get update -qq
-RUN apt-get install -yqq --no-install-recommends build-essential less nano netcat-traditional pkg-config
-RUN apt-get install -yqq --no-install-recommends freetds-dev libmariadb-dev libpq-dev libvips42 libyaml-dev sqlite3
+RUN apt-get update -qq && \
+  apt-get install -yqq --no-install-recommends build-essential less nano netcat-traditional pkg-config && \
+  apt-get install -yqq --no-install-recommends freetds-dev libmariadb-dev libpq-dev libvips42 libyaml-dev sqlite3
 
 ARG BUNDLER_VERSION
 RUN gem install bundler -v ${BUNDLER_VERSION}

lib/active_storage/service/db_service.rb

@@ -57,7 +57,8 @@ def download_chunk(key, range)
 
     def delete(key)
       instrument :delete, key: key do
-        record = ::ActiveStorageDB::File.find_by(ref: key)
+        comment = "DBService#delete"
+        record = ::ActiveStorageDB::File.annotate(comment).find_by(ref: key)
         record&.destroy
         # NOTE: Ignore files already deleted
         !record.nil?
@@ -66,15 +67,18 @@ def delete(key)
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
-        ::ActiveStorageDB::File.where('ref LIKE ?', "#{ApplicationRecord.sanitize_sql_like(prefix)}%").destroy_all
+        comment = "DBService#delete_prefixed"
+        sanitized_prefix = "#{ApplicationRecord.sanitize_sql_like(prefix)}%"
+        ::ActiveStorageDB::File.annotate(comment).where('ref LIKE ?', sanitized_prefix).destroy_all
       end
     end
 
     def exist?(key)
       instrument :exist, key: key do |payload|
-        answer = ::ActiveStorageDB::File.where(ref: key).exists?
-        payload[:exist] = answer
-        answer
+        comment = "DBService#exist?"
+        result = ::ActiveStorageDB::File.annotate(comment).where(ref: key).exists?
+        payload[:exist] = result
+        result
       end
     end
 
@@ -152,7 +156,8 @@ def retrieve_file(key)
     end
 
     def object_for(key, fields: nil)
-      as_file = fields ? ::ActiveStorageDB::File.select(*fields) : ::ActiveStorageDB::File
+      comment = "DBService#object_for"
+      as_file = fields ? ::ActiveStorageDB::File.annotate(comment).select(*fields) : ::ActiveStorageDB::File
       as_file.find_by(ref: key)
     end
 

lib/active_storage/service/db_service_rails70.rb

@@ -4,8 +4,9 @@ module ActiveStorage
   module DBServiceRails70
     def compose(source_keys, destination_key, **)
       buffer = nil
+      comment = "DBService#compose"
       source_keys.each do |source_key|
-        data = ::ActiveStorageDB::File.find_by!(ref: source_key).data
+        data = ::ActiveStorageDB::File.annotate(comment).find_by!(ref: source_key).data
         if buffer
           buffer << data
         else