auctify 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff579c105985a8f250d586936aa3ff93dbf1d0fe3b378c69b1ca91cd54e8dbe
-  data.tar.gz: 40a062694ac56b79ff884ec3cb233c4647881d365f76fee944da6ba0c88ceee4
+  metadata.gz: 7e40c33ab5508a5874d200e861cebe30e1c7b9b99dd0d6a24376998f7eca011c
+  data.tar.gz: 026de4ef6565e73d83e0e9e433cca5872a6be4a4a92aa1e5b85b2ec64a44ad99
 SHA512:
-  metadata.gz: aab916ea0865c95cb54199b7ad1d807f3508dd87c6e94cebb8eed533b5e7f79e9f5d58132f65cebc14a3a8fc096073794e5df443e883d17a57c37eacb849e9d6
-  data.tar.gz: 814db09ba82b44e8c59981f0f439d7e39d2fe8df85c13c057ae167c0488989de7b5512ddb0473529398a2d10ff5108afc2151e261d83ae6699c0f0b0f7571a31
+  metadata.gz: 3f1c2cce869ea2fd00ca4a8a078d4f5febb15b0ce328682847a47cbdc5b2410fd120e55c5d54ee79ea5f38388ef87157232d2b0fc133f81931f1b4f4dc77246f
+  data.tar.gz: c07420c8fa9d289d99f947e4debcb653cc0a34c2c24500878d8317482fd39201054aec71d36b83d7b80994ad77b9b53d85b5648fe44fae3e5f777202aa4e11cb

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/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

@@ -71,7 +71,7 @@ module Auctify
             self.winner = current_winner
 
             now = Time.current
-            Yabeda.auctify.diff_in_closing_time_seconds.set({}, (now - self.currently_ends_at))
+            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
@@ -163,15 +163,7 @@ module Auctify
 
           bap = Auctify::BidsAppender.call(auction: self, bid: bid)
 
-          if bap.success?
-            after_bid_appended(bap)
-
-            Yabeda.auctify.bids_count.increment({}, by: 1)
-            times = ordered_applied_bids.limit(2).pluck(:created_at)
-            Yabeda.auctify.time_between_bids.set({ auction_slug: slug }, (times.size == 1 ? 0 : times.first - times.second))
-          else
-            after_bid_not_appended(bap)
-          end
+          bap.success? ? after_bid_appended(bap) : after_bid_not_appended(bap)
 
           bap.success?
         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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-require "yabeda/prometheus"
-
 module Auctify
   class Railtie < Rails::Railtie
-    initializer "my_railtie.configure_rails_initialization" do |app|
-      app.middleware.use ::Yabeda::Prometheus::Exporter
+    # 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.4"
+  VERSION = "1.1.5"
 end

data/lib/auctify.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(Rails::Railtie)
-  require "auctify/railtie"
-  require "yabeda_config.rb"
-end
+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

@@ -1,16 +1,35 @@
 # frozen_string_literal: true
 
-require "yabeda/prometheus"
-
 Yabeda.configure do
   group :auctify do
-   counter :bids_count, comment: "A counter of applied bids"
-   gauge :diff_in_closing_time_seconds,
+    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"
-   gauge :time_between_bids, comment: "Time period between last two bids", tags: [:auction_slug]
- end
+  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
-    # main_app.t_gauge.set({}, rand(10))
+    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.4
+  version: 1.1.5
 platform: ruby
 authors:
 - foton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -439,18 +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
@@ -465,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: []