auctify 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14832525cab9835407bccb94056500037fe39da17a9ea311f7053ce4adf48255
-  data.tar.gz: 522647a33fa236dd02c2980ecde719508bd83f21db2c0ffa38d1d77ce104d002
+  metadata.gz: 7e40c33ab5508a5874d200e861cebe30e1c7b9b99dd0d6a24376998f7eca011c
+  data.tar.gz: 026de4ef6565e73d83e0e9e433cca5872a6be4a4a92aa1e5b85b2ec64a44ad99
 SHA512:
-  metadata.gz: 803112a2c554cb95f1eb818911ea4a92d4377306ba936ac5190101f8463a5378d225a5c260a50e01e8cc0f379ddd87b1d57902d186a8469c7baa34dee991f23a
-  data.tar.gz: ee8f293dbba3adc69a730d208b4973ebf7d9609d326bca03eda616ca668edfb792b2d4d9b09bef211a5c08db221da2befcd507d9d3f0844c5d8de1e774db46d8
+  metadata.gz: 3f1c2cce869ea2fd00ca4a8a078d4f5febb15b0ce328682847a47cbdc5b2410fd120e55c5d54ee79ea5f38388ef87157232d2b0fc133f81931f1b4f4dc77246f
+  data.tar.gz: c07420c8fa9d289d99f947e4debcb653cc0a34c2c24500878d8317482fd39201054aec71d36b83d7b80994ad77b9b53d85b5648fe44fae3e5f777202aa4e11cb

data/README.md

@@ -221,7 +221,19 @@ end
 
       To protect accidential deletions, many associations are binded with `dependent: restrict_with_error`. Correct order ofdeletion is `bids` => `sales` => `sales_packs`.
 
-
+## Monitor it
+Auctify should add some metrics for Prometheus (using Yabeda gem). Exposing them on `/metrics` path.
+```
+group :auctify do
+  counter :bids_count, comment: "A counter of applied bids"
+  gauge :diff_in_closing_time_seconds,
+        comment: "Difference between auction.currently_ends_at and actual sale end time by job"
+   gauge :time_between_bids, comment: "Time period between last two bids", tags: [:auction_slug]
+end
+```
+See `lib/yabeda_config.rb` for current setup.
+Note: `diff_in_closing_time_seconds` is fill in `auction.close_bidding!`. At normal setup this is done in background job, so value is maintained in BJ process not rails app.
+      Eg. if You use sidekiq for backgoud jobs, You will need `yabeda-sidekiq` gem and then value vwill be displayed at port 9394 (`your.app:9394/metrics`).
 
 ## Contributing
 Contribution directions go here.

data/Rakefile

@@ -23,12 +23,11 @@ load "rails/tasks/statistics.rake"
 
 require "bundler/gem_tasks"
 
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.verbose = false
-end
-
-task default: :test
+## use `rails test` instead
+# require "rake/testtask"
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << "test"
+#   t.pattern = "test/**/*_test.rb"
+#   t.verbose = false
+# end
+# task default: :test

data/app/controllers/auctify/api/v1/auctions_controller.rb

@@ -15,15 +15,15 @@ module Auctify
         end
 
         def bids
-          if params[:confirmation] == "1"
+          if params[:terms_confirmation] == "1"
             if @auction.bid!(new_bid)
               @auction.reload
 
-              store_dont_confirm_bids
+              store_confirmations_checkboxes
 
               render_record @auction, success: true, overbid_by_limit: overbid_by_limit?(new_bid)
             else
-              store_dont_confirm_bids
+              store_confirmations_checkboxes
 
               render_record @auction, bid: new_bid, status: 400
             end
@@ -63,11 +63,18 @@ module Auctify
             }, status: status
           end
 
-          def store_dont_confirm_bids
-            if params[:dont_confirm_bids] == "1"
-              # use SQL update in case of some obscure invalid attributes
-              bidder_regs = current_user.bidder_registrations.where(auction: @auction)
-              bidder_regs.update_all(dont_confirm_bids: true) if bidder_regs.present?
+          def store_confirmations_checkboxes
+            bidder_regs = current_user.bidder_registrations.where(auction: @auction)
+            if bidder_regs.present?
+              atts = { dont_confirm_bids: params[:dont_confirm_bids] == "1",
+                       confirmed_sales_pack_terms: params[:terms_confirmation] == "1" }
+              bidder_regs.update_all(atts)
+
+              if atts[:confirmed_sales_pack_terms]
+                current_user.bidder_registrations.for_pack(bidder_regs.last.auction.pack)
+                            .where(confirmed_sales_pack_terms: false)
+                            .update_all(confirmed_sales_pack_terms: true)
+              end
             end
           end
 

data/app/jobs/auctify/application_job.rb

@@ -2,5 +2,9 @@
 
 module Auctify
   class ApplicationJob < ActiveJob::Base
+    private
+      def auction_label(auction)
+        "[#{auction.try(:slug)}##{auction.id}; currently_ends_at: #{auction.currently_ends_at}]"
+      end
   end
 end

data/app/jobs/auctify/bidding_closer_job.rb

@@ -12,11 +12,14 @@ module Auctify
         return
       end
 
-      return if Time.current < auction.currently_ends_at
-
-      Auctify::Sale::Auction.with_advisory_lock("closing_auction_#{auction_id}") do
-        # can wait unitl other BCJob release lock and than continue!
-        auction.close_bidding! if auction.reload.in_sale?
+      if Time.current < auction.currently_ends_at
+        Rails.logger.info("Too soon for closing of auction #{auction_label(auction)}.")
+      else
+        Rails.logger.info("Closing auction #{auction_label(auction)} NOW!")
+        Auctify::Sale::Auction.with_advisory_lock("closing_auction_#{auction_id}") do
+          # can wait unitl other BCJob release lock and than continue!
+          auction.close_bidding! if auction.reload.in_sale?
+        end
       end
     end
   end

data/app/jobs/auctify/ensure_auctions_closing_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Auctify
-  class EnsureAuctionsClosingJob < ApplicationJob
+  class EnsureAuctionsClosingJob < Auctify::ApplicationJob
     queue_as :critical
 
     def perform
@@ -9,8 +9,10 @@ module Auctify
                                       .where("currently_ends_at <= ?", Time.current + checking_period_to_future)
       auctions.each do |auction|
         if auction.currently_ends_at <= Time.current
+          Rails.logger.info("Queueing auction #{auction_label(auction)} for immediate close.")
           Auctify::BiddingCloserJob.perform_later(auction_id: auction.id)
         else
+          Rails.logger.info("Delaying close of auction #{auction_label(auction)}.")
           Auctify::BiddingCloserJob.set(wait_until: auction.currently_ends_at).perform_later(auction_id: auction.id)
         end
       end

data/app/models/auctify/bid.rb

@@ -8,6 +8,7 @@ module Auctify
     scope :applied, -> { where(cancelled: false) }
     scope :canceled, -> { where(cancelled: true) }
     scope :with_limit, -> { where.not(max_price: nil) }
+    scope :manual, -> { where(autobid: false) }
 
     validate :price_is_not_bigger_then_max_price
     validate :price_is_rounded

data/app/models/auctify/bidder_registration.rb

@@ -17,6 +17,8 @@ module Auctify
                                     inverse_of: :registration,
                                     dependent: :restrict_with_error # destroy them manually first
 
+    scope :for_pack, ->(pack) { where(auction: pack.sales) }
+
     aasm do
       state :pending, initial: true, color: "gray"
       state :approved, color: "green"
@@ -81,15 +83,16 @@ end
 #
 # Table name: auctify_bidder_registrations
 #
-#  id                :bigint(8)        not null, primary key
-#  bidder_type       :string           not null
-#  bidder_id         :integer          not null
-#  auction_id        :integer          not null
-#  aasm_state        :string           default("pending"), not null
-#  handled_at        :datetime
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
-#  dont_confirm_bids :boolean          default(FALSE)
+#  id                         :bigint(8)        not null, primary key
+#  bidder_type                :string           not null
+#  bidder_id                  :bigint(8)        not null
+#  auction_id                 :bigint(8)        not null
+#  aasm_state                 :string           default("pending"), not null
+#  handled_at                 :datetime
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  dont_confirm_bids          :boolean          default(FALSE)
+#  confirmed_sales_pack_terms :boolean          default(FALSE)
 #
 # Indexes
 #

data/app/models/auctify/sale/auction.rb

@@ -69,7 +69,9 @@ module Auctify
 
           after do
             self.winner = current_winner
+
             now = Time.current
+            Yabeda.auctify.diff_in_closing_time_seconds.set({}, (now - self.currently_ends_at).round)
             self.currently_ends_at = now if now < currently_ends_at
 
             after_close_bidding
@@ -162,6 +164,7 @@ module Auctify
           bap = Auctify::BidsAppender.call(auction: self, bid: bid)
 
           bap.success? ? after_bid_appended(bap) : after_bid_not_appended(bap)
+
           bap.success?
         end
       end

data/db/migrate/20230905114142_add_confirmed_sales_pack_terms_to_bidder_registrations.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddConfirmedSalesPackTermsToBidderRegistrations < ActiveRecord::Migration[6.1]
+  def change
+    add_column :auctify_bidder_registrations, :confirmed_sales_pack_terms, :boolean, default:  false
+
+    execute "UPDATE auctify_bidder_registrations SET confirmed_sales_pack_terms = true WHERE dont_confirm_bids = true;"
+  end
+end

data/lib/auctify/railtie.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Auctify
+  class Railtie < Rails::Railtie
+    # I did not found way, how to chec for presence of Yabeda::Prometheus::Exporter in middleware
+    if require "yabeda/prometheus"
+      initializer "auctify.railtie_initialization" do |main_app|
+        main_app.middleware.use ::Yabeda::Prometheus::Exporter
+      end
+    end
+  end
+end
+
+require "yabeda_config.rb"

data/lib/auctify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Auctify
-  VERSION = "1.1.3"
+  VERSION = "1.1.5"
 end

data/lib/auctify.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "auctify/railtie" if defined?(Rails::Railtie)
+
 require "auctify/engine"
 require "auctify/configuration"
 

data/lib/tasks/test_tasks.rake

@@ -0,0 +1,8 @@
+namespace :test do
+  Rake::TestTask.new(:dummy) do |t|
+    t.libs << "test"
+    t.pattern = 'test/dummy/test/**/*_test.rb'
+    t.verbose = true
+  end
+end
+# Rake::Task[:test].enhance ["test:dummy"]

data/lib/yabeda_config.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+Yabeda.configure do
+  group :auctify do
+    gauge :bids_count,
+           comment: "A count of all applied bids"
+    # counter :bids_count, comment: "A count of all applied bids"
+    gauge :time_between_last_bids_seconds,
+          comment: "Time period between last two manual bids"
+    gauge :current_max_delay_in_closing_auction_seconds,
+          comment: "Delay from oldest `currently_ends_at` of auction in sale (that should be already closed)."
+
+
+    # this is done when auction.close_bidding! is run
+    gauge :diff_in_closing_time_seconds,
+          comment: "Difference between auction.currently_ends_at and actual sale end time by job"
+  end
+
+  # to fetch correct data independently on process/container
+  # we collect them at request for /metrics, not at "trigger" time
+  collect do # when /metrics is displayed
+    auctify.bids_count.set({}, Auctify::Bid.count)
+
+    last_bid_times = Auctify::Bid.applied.manual.order(created_at: :desc).limit(2).pluck(:created_at)
+    auctify.time_between_last_bids_seconds.set({}, last_bid_times.size == 2 ? (last_bid_times.first - last_bid_times.last).round : 0)
+
+    auction = Auctify::Sale::Auction.in_sale.order(currently_ends_at: :asc).first
+    if auction.blank?
+      auctify.current_max_delay_in_closing_auction_seconds.set({}, -1)
+    else
+      delay = [0, (Time.current - auction.currently_ends_at)].max # only positive number
+      auctify.current_max_delay_in_closing_auction_seconds.set({}, delay.round)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auctify
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - foton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yabeda-prometheus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -425,16 +439,20 @@ files:
 - db/migrate/20210917082313_add_auction_prolonging_limit_to_sales_packs.rb
 - db/migrate/20211022133253_add_autobid_to_auctify_bids.rb
 - db/migrate/20211203064934_update_sales_featurable.rb
+- db/migrate/20230905114142_add_confirmed_sales_pack_terms_to_bidder_registrations.rb
 - lib/auctify.rb
 - lib/auctify/configuration.rb
 - lib/auctify/engine.rb
+- lib/auctify/railtie.rb
 - lib/auctify/version.rb
 - lib/tasks/auctify_tasks.rake
+- lib/tasks/test_tasks.rake
+- lib/yabeda_config.rb
 homepage: https://github.com/sinfin/auctify
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -449,8 +467,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Gem for adding auction behavior to models.
 test_files: []