auctify 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19c38113580070b4a0e6d9914b22c042fb3024e2a96193a7004fd61859985c3
-  data.tar.gz: '080f74640d3c40935a0faf304c120cb294e896e000ffa1cc822a769d077f3fbf'
+  metadata.gz: a1ff1f96493a447d685097bcd87d2f6b2798e6c2ae391591692ab840ae6ce2bc
+  data.tar.gz: '018847e67646b882ea6525767416a663dc19dd0ee1d87a0bdccb029215f8897f'
 SHA512:
-  metadata.gz: b5dc577b91bd6ba035187bbf272f52f744a6ee7832c90c998e27c7eb63324c98b7bfa1eecb259f21522d0dae8accde3ef112a8166d58bc2ece2a6cbfd6edafa2
-  data.tar.gz: 67f7b5f692569e542eaa5a59727e15c9e602a1d022c69156046acf7e343f4f5acecad42b1e7adfd44bc8b7bb317dcd293bb5aec7c4d9d6e28078b829e24dd8b7
+  metadata.gz: 8a185ca59647cb9361d3d315d6a62355a85cad1b28bc7276b4195ccdae2f9bafa74c308b9be00083c7031237830217184e29338083745f8372e811423dd4a878
+  data.tar.gz: 959b40425783d4d5d9770ba2d4b5c415684d8264713d537d2f8f9f1488208eae302cb60204c88870af764c9d5ccd279175918580e2268ffe8ae7d805ce9b4806

data/README.md

@@ -65,7 +65,7 @@ If `item.owner` exists, it is used as `auction.seller` (or Select from all aucit
 - item can have category and user can select auction by categories.
 - SalePack can be `(un)published /public`
 - SalePack can be `open (adding items , bidding)/ closed(bidding ended)`
-- auctioneer_commission is in % and adds to sold_price in checkout
+- auctioneer_commision_from_buyer is in % and adds to sold_price in checkout
 - auction have `start_time` and `end_time`
 - auction can be `highlighted` for cover pages
 - auction stores all bids history even those cancelled by admin
@@ -121,11 +121,14 @@ end
       ```
 
   3. ### Configure
+      Enqueuing of `BiddingCloserJob` (for each auction) is done by peridically performed `Auctify::EnsureAuctionsClosingJob`.
+      This is up to You how you run it, but interval between runs must be shorter than `Auctify.configuration.auction_prolonging_limit_in_seconds`.
+
       - optional
       ```ruby
         Auctify.configure do |config|
           config.autoregister_as_bidders_all_instances_of_classes = ["User"] # default is []
-          config.auction_prolonging_limit = 10.minutes # default is 1.minute
+          config.auction_prolonging_limit_in_seconds = 10.minutes # default is 1.minute, can be overriden in `SalePack#auction_prolonging_limit_in_seconds` attribute
           config.auctioneer_commission_in_percent = 10 # so buyer will pay: auction.current_price * ((100 + 10)/100)
           config.autofinish_auction_after_bidding = true # after `auction.close_bidding!` immediatelly proces result to `auction.sold_in_auction!` or `auction.not_sold_in_auction!`; default false
           config.when_to_notify_bidders_before_end_of_bidding = 30.minutes # default `nil` => no notifying

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

@@ -7,21 +7,24 @@ module Auctify
         before_action :find_auction, except: [:index]
 
         def show
-          render_record @auction
+          if params[:updated_at].present? && params[:updated_at].match?(/\A\d+\z/) && params[:updated_at].to_i == @auction.updated_at.to_i
+            render json: { current: true }, status: 200
+          else
+            render_record @auction
+          end
         end
 
         def bids
           if params[:confirmation] == "1"
             if @auction.bid!(new_bid)
-              if params[:dont_confirm_bids] == "1"
-                # use SQL update in case of some obscure invalid attributes
-                current_user.bidder_registrations
-                            .where(auction: @auction)
-                            .update_all(dont_confirm_bids: true)
-              end
-
-              render_record @auction.reload, success: true
+              @auction.reload
+
+              store_dont_confirm_bids
+
+              render_record @auction, success: true, overbid_by_limit: overbid_by_limit?(new_bid)
             else
+              store_dont_confirm_bids
+
               render_record @auction, bid: new_bid, status: 400
             end
           else
@@ -50,11 +53,32 @@ module Auctify
             { bidder: current_user }
           end
 
-          def render_record(auction, bid: nil, status: 200, success: nil)
+          def render_record(auction, bid: nil, status: 200, success: nil, overbid_by_limit: nil)
             render json: {
-              data: cell("#{global_namespace_path}/auctify/auctions/form", auction, bid: bid, success: success).show
+              data: cell("#{global_namespace_path}/auctify/auctions/form",
+                         auction,
+                         bid: bid,
+                         success: success,
+                         overbid_by_limit: overbid_by_limit).show
             }, 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?
+            end
+          end
+
+          def overbid_by_limit?(new_bid)
+            winning_bid = @auction&.winning_bid
+            return false unless winning_bid
+            return false if new_bid.id.blank? || winning_bid.id.blank?
+            return false if winning_bid.registration_id == new_bid.registration_id # do not notify bidder about overbidding itself
+
+            winning_bid != new_bid
+          end
       end
     end
   end

data/app/controllers/auctify/bidder_registrations_controller.rb

@@ -46,8 +46,11 @@ module Auctify
 
     # DELETE /bidder_registrations/1
     def destroy
-      @bidder_registration.destroy
-      redirect_to auctify_bidder_registrations_url, notice: "Bidder registration was successfully destroyed."
+      if @bidder_registration.destroy
+        redirect_to auctify_bidder_registrations_url, notice: "Bidder registration was successfully destroyed."
+      else
+        render json: { errors: @bidder_registration.errors }
+      end
     end
 
     private

data/app/jobs/auctify/autobid_filler_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Auctify
+  class AutobidFillerJob < Auctify::ApplicationJob
+    queue_as :default
+
+    def perform
+      reg_ids = Auctify::Bid.pluck(:registration_id).uniq
+      registrations_with_bids = Auctify::BidderRegistration.where(id: reg_ids)
+
+      registrations_with_bids.find_each { |reg| reg.fillup_autobid_flags! }
+    end
+  end
+end

data/app/jobs/auctify/bidding_closer_job.rb

@@ -12,11 +12,11 @@ module Auctify
         return
       end
 
-      if auction.currently_ends_at <= Time.current
-        auction.close_bidding! if auction.in_sale?
-      else
-        self.class.set(wait_until: auction.currently_ends_at)
-                  .perform_later(auction_id: auction.id)
+      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?
       end
     end
   end

data/app/jobs/auctify/bidding_is_close_to_end_notifier_job.rb

@@ -14,7 +14,7 @@ module Auctify
         return
       end
 
-      notify_time = auction.ends_at - Auctify.configuration.when_to_notify_bidders_before_end_of_bidding
+      notify_time = auction.bidding_is_close_to_end_notification_time
 
       return unless auction.open_for_bids?
 

data/app/jobs/auctify/ensure_auctions_closing_job.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Auctify
+  class EnsureAuctionsClosingJob < ApplicationJob
+    queue_as :critical
+
+    def perform
+      auctions = ::Auctify::Sale::Auction.in_sale
+                                      .where("currently_ends_at <= ?", Time.current + checking_period_to_future)
+      auctions.each do |auction|
+        if auction.currently_ends_at <= Time.current
+          Auctify::BiddingCloserJob.perform_later(auction_id: auction.id)
+        else
+          Auctify::BiddingCloserJob.set(wait_until: auction.currently_ends_at).perform_later(auction_id: auction.id)
+        end
+      end
+    end
+
+    private
+      def checking_period_to_future
+        Auctify.configuration.auction_prolonging_limit_in_seconds || 5.minutes
+      end
+  end
+end

data/app/models/auctify/bid.rb

@@ -10,6 +10,14 @@ module Auctify
     scope :with_limit, -> { where.not(max_price: nil) }
 
     validate :price_is_not_bigger_then_max_price
+    validate :price_is_rounded
+
+    def <=>(other)
+      r = (self.price <=> other.price)
+      r = (self.created_at <=> other.created_at) if r.zero?
+      r = (self.id <=> other.id) if r.zero?
+      r
+    end
 
     def cancel!
       update!(cancelled: true)
@@ -18,7 +26,11 @@ module Auctify
     end
 
     def with_limit?
-      max_price.present?
+      limit.present?
+    end
+
+    def limit
+      max_price
     end
 
     def bade_at
@@ -29,6 +41,12 @@ module Auctify
       errors.add(:price, :must_be_lower_or_equal_max_price) if max_price && max_price < price
     end
 
+    def price_is_rounded
+      round_to = configuration.require_bids_to_be_rounded_to
+      errors.add(:price, :must_be_rounded_to, { round_to: round_to }) if price && (price != round_it_to(price, round_to))
+      errors.add(:max_price, :must_be_rounded_to, { round_to: round_to }) if max_price && (max_price != round_it_to(max_price, round_to))
+    end
+
     def bidder=(auctified_model)
       errors.add(:bidder, :not_auctified) unless auctified_model.class.included_modules.include?(Auctify::Behavior::Buyer)
       raise "There is already registration for this bid!"  if registration.present?
@@ -46,6 +64,12 @@ module Auctify
     def configuration
       Auctify.configuration
     end
+
+    private
+      def round_it_to(amount, smallest_amount)
+        smallest_amount = smallest_amount.to_i
+        (smallest_amount * ((amount + (smallest_amount / 2)).to_i / smallest_amount))
+      end
   end
 end
 
@@ -60,6 +84,7 @@ end
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  cancelled       :boolean          default(FALSE)
+#  autobid         :boolean          default(FALSE)
 #
 # Indexes
 #

data/app/models/auctify/bidder_registration.rb

@@ -49,6 +49,25 @@ module Auctify
 
     validate :auction_is_in_allowed_state, on: :create
 
+    def fillup_autobid_flags!
+      current_limit = 0
+      ordered_applied_bids.reverse_each do |bid|
+        if bid.with_limit?
+          if current_limit < bid.limit
+            # increase of limit
+            bid.autobid = false
+            current_limit = bid.limit
+          else
+            # same limit, same registration, younger bid => autobid
+            bid.autobid = true
+          end
+        else
+          bid.autobid = false
+        end
+        bid.save!(validate: false)
+      end
+    end
+
     private
       def auction_is_in_allowed_state
         unless auction && auction.allows_new_bidder_registrations?

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

@@ -60,8 +60,6 @@ module Auctify
           transitions from: :accepted, to: :in_sale
 
           after do
-            set_bidding_closer_job
-            set_bidding_is_close_to_end_job
             after_start_sale
           end
         end
@@ -119,6 +117,7 @@ module Auctify
       validate :forbidden_changes
 
       after_create :autoregister_bidders
+      after_save :create_jobs
       before_destroy :forbid_destroy_if_there_are_bids, prepend: true
 
       def bidders
@@ -217,9 +216,19 @@ module Auctify
         bidding_result.current_minimal_bid
       end
 
-      def current_max_price_for(bidder)
-        last_bidder_mx_bid = ordered_applied_bids.with_limit
-                                                 .detect { |bid| bid.bidder == bidder }
+      def minimal_bid_increase_amount_at(price, respect_first_bid: true)
+        return 0 if respect_first_bid && price == opening_price # first bid can equal opening price
+        return Auctify.configuration.require_bids_to_be_rounded_to if bid_steps_ladder.blank?
+
+        _range, increase_step = bid_steps_ladder.detect { |range, step| range.cover?(price) }
+        increase_step
+      end
+
+      def current_max_price_for(bidder, bids_array: nil)
+        bids_array ||= ordered_applied_bids.with_limit
+
+        last_bidder_mx_bid = bids_array.detect { |bid| !bid.max_price.nil? && bid.bidder == bidder }
+
         last_bidder_mx_bid.blank? ? 0 : last_bidder_mx_bid.max_price
       end
 
@@ -244,9 +253,8 @@ module Auctify
         applied_bids_count.positive?
       end
 
-      def set_bidding_closer_job
-        Auctify::BiddingCloserJob.set(wait_until: currently_ends_at)
-                                 .perform_later(auction_id: id)
+      def auction_prolonging_limit_in_seconds
+        pack&.auction_prolonging_limit_in_seconds || Auctify.configuration.auction_prolonging_limit_in_seconds
       end
 
       private
@@ -311,7 +319,7 @@ module Auctify
         end
 
         def extend_end_time(bid_time)
-          new_end_time = bid_time + Auctify.configuration.auction_prolonging_limit
+          new_end_time = bid_time + auction_prolonging_limit_in_seconds
           self.currently_ends_at = [currently_ends_at, new_end_time].max
         end
 
@@ -326,16 +334,17 @@ module Auctify
           end
         end
 
-        def set_bidding_is_close_to_end_job
+        def bidding_is_close_to_end_notification_time
           configured_period = Auctify.configuration.when_to_notify_bidders_before_end_of_bidding
-          return if configured_period.blank?
-          notify_time = ends_at - configured_period
-          Auctify::BiddingIsCloseToEndNotifierJob.set(wait_until: notify_time)
-                                                 .perform_later(auction_id: id)
+          return nil if configured_period.blank?
+
+          ends_at - configured_period
         end
 
         def forbidden_changes
           ATTRIBUTES_UNMUTABLE_AT_SOME_STATE.each do |att|
+            next if configuration.allow_changes_on_auction_with_bids_for_attributes.include?(att.to_sym)
+
             if changes[att].present? && locked_for_modifications?
               errors.add(att, :no_modification_allowed_now)
               write_attribute(att, changes[att].first)
@@ -349,6 +358,20 @@ module Auctify
         def forbid_destroy_if_there_are_bids
           errors.add(:base, :you_cannot_delete_auction_with_bids) if bids.any?
         end
+
+        def create_jobs(force = false)
+          return unless in_sale?
+
+          currently_ends_at_changes = saved_changes["currently_ends_at"]
+
+          if force || currently_ends_at_changes.present?
+            if (notify_time = bidding_is_close_to_end_notification_time).present?
+              # remove_old job is unsupported in ActiveJob
+              Auctify::BiddingIsCloseToEndNotifierJob.set(wait_until: notify_time)
+                                                     .perform_later(auction_id: id)
+            end
+          end
+        end
     end
   end
 end
@@ -357,37 +380,51 @@ end
 #
 # Table name: auctify_sales
 #
-#  id                    :bigint(8)        not null, primary key
-#  seller_type           :string
-#  seller_id             :integer
-#  buyer_type            :string
-#  buyer_id              :integer
-#  item_id               :integer          not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  type                  :string           default("Auctify::Sale::Base")
-#  aasm_state            :string           default("offered"), not null
-#  offered_price         :decimal(, )
-#  current_price         :decimal(, )
-#  sold_price            :decimal(, )
-#  bid_steps_ladder      :json
-#  reserve_price         :decimal(, )
-#  pack_id               :bigint(8)
-#  ends_at               :datetime
-#  position              :integer
-#  number                :string
-#  currently_ends_at     :datetime
-#  published             :boolean          default(FALSE)
-#  featured              :boolean          default(FALSE)
-#  slug                  :string
-#  contract_number       :string
-#  commission_in_percent :integer
-#  winner_type           :string
-#  winner_id             :bigint(8)
-#  applied_bids_count    :integer          default(0)
-#  sold_at               :datetime
-#  current_winner_type   :string
-#  current_winner_id     :bigint(8)
+#  id                           :bigint(8)        not null, primary key
+#  seller_type                  :string
+#  seller_id                    :integer
+#  buyer_type                   :string
+#  buyer_id                     :integer
+#  item_id                      :integer          not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  type                         :string           default("Auctify::Sale::Base")
+#  aasm_state                   :string           default("offered"), not null
+#  offered_price                :decimal(, )
+#  current_price                :decimal(, )
+#  sold_price                   :decimal(, )
+#  bid_steps_ladder             :json
+#  reserve_price                :decimal(, )
+#  pack_id                      :bigint(8)
+#  ends_at                      :datetime
+#  position                     :integer
+#  number                       :string
+#  currently_ends_at            :datetime
+#  published                    :boolean          default(FALSE)
+#  slug                         :string
+#  contract_number              :string
+#  seller_commission_in_percent :integer
+#  winner_type                  :string
+#  winner_id                    :bigint(8)
+#  applied_bids_count           :integer          default(0)
+#  sold_at                      :datetime
+#  current_winner_type          :string
+#  current_winner_id            :bigint(8)
+#  buyer_commission_in_percent  :integer
+#  featured                     :integer
+#
+# Indexes
+#
+#  index_auctify_sales_on_buyer_type_and_buyer_id    (buyer_type,buyer_id)
+#  index_auctify_sales_on_currently_ends_at          (currently_ends_at)
+#  index_auctify_sales_on_featured                   (featured)
+#  index_auctify_sales_on_pack_id                    (pack_id)
+#  index_auctify_sales_on_position                   (position)
+#  index_auctify_sales_on_published                  (published)
+#  index_auctify_sales_on_seller_type_and_seller_id  (seller_type,seller_id)
+#  index_auctify_sales_on_slug                       (slug) UNIQUE
+#  index_auctify_sales_on_winner_type_and_winner_id  (winner_type,winner_id)
+#
 
 #
 # Indexes

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

@@ -4,8 +4,7 @@ module Auctify
   module Sale
     class Base < ApplicationRecord
       include Folio::FriendlyId
-      include Folio::Positionable
-      include Folio::Featurable::Basic
+      include Folio::Featurable::WithPosition
       include Folio::Publishable::Basic
 
       self.table_name = "auctify_sales"
@@ -33,6 +32,7 @@ module Auctify
       validate :validate_offered_price_when_published
 
       scope :not_sold, -> { where(sold_price: nil) }
+      scope :ordered, -> { order(currently_ends_at: :asc, id: :asc) }
 
       # need auction scopes here because of has_many :sales, class_name: "Auctify::Sale::Base"
       scope :auctions_open_for_bids, -> do
@@ -92,10 +92,14 @@ module Auctify
         save
       end
 
-      def auctioneer_commission
+      def auctioneer_commision_from_seller
+        (seller_commission_in_percent || 0) * 0.01 * offered_price
+      end
+
+      def auctioneer_commision_from_buyer
         return nil if sold_price.nil?
 
-        percent = commission_in_percent \
+        percent = buyer_commission_in_percent \
                   || (pack&.commission_in_percent) \
                   || Auctify.configuration.auctioneer_commission_in_percent
 
@@ -164,37 +168,38 @@ end
 #
 # Table name: auctify_sales
 #
-#  id                    :bigint(8)        not null, primary key
-#  seller_type           :string
-#  seller_id             :integer
-#  buyer_type            :string
-#  buyer_id              :integer
-#  item_id               :integer          not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  type                  :string           default("Auctify::Sale::Base")
-#  aasm_state            :string           default("offered"), not null
-#  offered_price         :decimal(, )
-#  current_price         :decimal(, )
-#  sold_price            :decimal(, )
-#  bid_steps_ladder      :json
-#  reserve_price         :decimal(, )
-#  pack_id               :bigint(8)
-#  ends_at               :datetime
-#  position              :integer
-#  number                :string
-#  currently_ends_at     :datetime
-#  published             :boolean          default(FALSE)
-#  featured              :boolean          default(FALSE)
-#  slug                  :string
-#  contract_number       :string
-#  commission_in_percent :integer
-#  winner_type           :string
-#  winner_id             :bigint(8)
-#  applied_bids_count    :integer          default(0)
-#  sold_at               :datetime
-#  current_winner_type   :string
-#  current_winner_id     :bigint(8)
+#  id                           :bigint(8)        not null, primary key
+#  seller_type                  :string
+#  seller_id                    :integer
+#  buyer_type                   :string
+#  buyer_id                     :integer
+#  item_id                      :integer          not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  type                         :string           default("Auctify::Sale::Base")
+#  aasm_state                   :string           default("offered"), not null
+#  offered_price                :decimal(, )
+#  current_price                :decimal(, )
+#  sold_price                   :decimal(, )
+#  bid_steps_ladder             :json
+#  reserve_price                :decimal(, )
+#  pack_id                      :bigint(8)
+#  ends_at                      :datetime
+#  position                     :integer
+#  number                       :string
+#  currently_ends_at            :datetime
+#  published                    :boolean          default(FALSE)
+#  slug                         :string
+#  contract_number              :string
+#  seller_commission_in_percent :integer
+#  winner_type                  :string
+#  winner_id                    :bigint(8)
+#  applied_bids_count           :integer          default(0)
+#  sold_at                      :datetime
+#  current_winner_type          :string
+#  current_winner_id            :bigint(8)
+#  buyer_commission_in_percent  :integer
+#  featured                     :integer
 #
 # Indexes
 #

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

@@ -23,6 +23,12 @@ module Auctify
         end
 
         event :start_sale do
+          before do
+            self.current_price = self.offered_price
+            self.currently_ends_at = self.ends_at
+            self.buyer = nil
+          end
+
           transitions from: :accepted, to: :in_sale
         end
 
@@ -51,37 +57,38 @@ end
 #
 # Table name: auctify_sales
 #
-#  id                    :bigint(8)        not null, primary key
-#  seller_type           :string
-#  seller_id             :integer
-#  buyer_type            :string
-#  buyer_id              :integer
-#  item_id               :integer          not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  type                  :string           default("Auctify::Sale::Base")
-#  aasm_state            :string           default("offered"), not null
-#  offered_price         :decimal(, )
-#  current_price         :decimal(, )
-#  sold_price            :decimal(, )
-#  bid_steps_ladder      :json
-#  reserve_price         :decimal(, )
-#  pack_id               :bigint(8)
-#  ends_at               :datetime
-#  position              :integer
-#  number                :string
-#  currently_ends_at     :datetime
-#  published             :boolean          default(FALSE)
-#  featured              :boolean          default(FALSE)
-#  slug                  :string
-#  contract_number       :string
-#  commission_in_percent :integer
-#  winner_type           :string
-#  winner_id             :bigint(8)
-#  applied_bids_count    :integer          default(0)
-#  sold_at               :datetime
-#  current_winner_type   :string
-#  current_winner_id     :bigint(8)
+#  id                           :bigint(8)        not null, primary key
+#  seller_type                  :string
+#  seller_id                    :integer
+#  buyer_type                   :string
+#  buyer_id                     :integer
+#  item_id                      :integer          not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  type                         :string           default("Auctify::Sale::Base")
+#  aasm_state                   :string           default("offered"), not null
+#  offered_price                :decimal(, )
+#  current_price                :decimal(, )
+#  sold_price                   :decimal(, )
+#  bid_steps_ladder             :json
+#  reserve_price                :decimal(, )
+#  pack_id                      :bigint(8)
+#  ends_at                      :datetime
+#  position                     :integer
+#  number                       :string
+#  currently_ends_at            :datetime
+#  published                    :boolean          default(FALSE)
+#  slug                         :string
+#  contract_number              :string
+#  seller_commission_in_percent :integer
+#  winner_type                  :string
+#  winner_id                    :bigint(8)
+#  applied_bids_count           :integer          default(0)
+#  sold_at                      :datetime
+#  current_winner_type          :string
+#  current_winner_id            :bigint(8)
+#  buyer_commission_in_percent  :integer
+#  featured                     :integer
 #
 # Indexes
 #

data/app/models/auctify/sales_pack.rb

@@ -29,6 +29,7 @@ module Auctify
               numericality: { greater_than_or_equal: 0, less_than: 60 }
 
     validate :validate_start_and_end_dates
+    validate :sales_ends_in_pack_time_frame
 
     scope :ordered, -> { order(start_date: :desc, id: :desc) }
 
@@ -44,17 +45,40 @@ module Auctify
     end
 
     def dates_to_label
-      if start_date && end_date
-        if start_date.year == end_date.year
-          if start_date.month == end_date.month
-            "#{start_date.strftime('%-d.')}–#{end_date.strftime('%-d. %-m. %y')}"
-          else
-            "#{start_date.strftime('%-d. %-m.')} – #{end_date.strftime('%-d. %-m. %y')}"
-          end
+      return "" unless start_date && end_date
+
+      date_strings = []
+      if start_date.year == end_date.year
+        if start_date.month == end_date.month
+          # all inside same month
+          date_strings << start_date.strftime("%-d.")
         else
-          "#{start_date.strftime('%-d. %-m. %y')} – #{end_date.strftime('%-d. %-m. %y')}"
+          # all inside same year
+          date_strings << start_date.strftime("%-d. %-m.")
+        end
+      else
+        # crossing years border
+        date_strings << start_date.strftime("%-d. %-m. %Y")
+      end
+
+      date_strings << end_date.strftime("%-d. %-m. %Y")
+      date_strings.join(" – ")
+    end
+
+    def shift_sales_by_minutes!(shift_in_minutes)
+      self.transaction do
+        sales.each do |sale|
+          sale.update!(ends_at: sale.ends_at + shift_in_minutes.minutes)
+
+          validate_sale_ends_in_time_frame(sale)
+          raise ActiveRecord::RecordInvalid if errors[:sales].present?
         end
       end
+      sales.reload
+    end
+
+    def time_frame
+      (start_date.to_time..(end_date.to_time + 1.day))
     end
 
     private
@@ -64,11 +88,28 @@ module Auctify
         end
       end
 
+      def sales_ends_in_pack_time_frame
+        return if changes["start_date"].present? || changes["end_date"]
+
+        sales.select(:id, :slug, :ends_at).each do |sale|
+          validate_sale_ends_in_time_frame(sale)
+        end
+      end
+
       def set_commission
         return if self.commission_in_percent.present?
 
         self.commission_in_percent = Auctify.configuration.auctioneer_commission_in_percent
       end
+
+      def validate_sale_ends_in_time_frame(sale)
+        unless time_frame.cover?(sale.ends_at)
+          errors.add(:sales,
+                    :sale_is_out_of_time_frame,
+                    slug: sale.slug.blank? ? "##{sale.id}" : sale.slug,
+                    ends_at_time: I18n.l(sale.ends_at))
+        end
+      end
   end
 end
 
@@ -76,22 +117,23 @@ end
 #
 # Table name: auctify_sales_packs
 #
-#  id                      :bigint(8)        not null, primary key
-#  title                   :string
-#  description             :text
-#  position                :integer          default(0)
-#  slug                    :string
-#  place                   :string
-#  published               :boolean          default(FALSE)
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
-#  sales_count             :integer          default(0)
-#  start_date              :date
-#  end_date                :date
-#  sales_interval          :integer          default(3)
-#  sales_beginning_hour    :integer          default(20)
-#  sales_beginning_minutes :integer          default(0)
-#  commission_in_percent   :integer
+#  id                                  :bigint(8)        not null, primary key
+#  title                               :string
+#  description                         :text
+#  position                            :integer          default(0)
+#  slug                                :string
+#  place                               :string
+#  published                           :boolean          default(FALSE)
+#  created_at                          :datetime         not null
+#  updated_at                          :datetime         not null
+#  sales_count                         :integer          default(0)
+#  start_date                          :date
+#  end_date                            :date
+#  sales_interval                      :integer          default(3)
+#  sales_beginning_hour                :integer          default(20)
+#  sales_beginning_minutes             :integer          default(0)
+#  commission_in_percent               :integer
+#  auction_prolonging_limit_in_seconds :integer
 #
 # Indexes
 #

data/app/services/auctify/bids_appender.rb

@@ -46,8 +46,8 @@ module Auctify
       def set_price_for_limit_bid
         return unless bid.price.blank? && bid.with_limit?
 
-        if changing_own_limit?
-          bid.price = winning_bid.price
+        if changing_own_limit_when_winning?
+          bid.price = [bid.max_price, winning_bid.price].min
         elsif bid.max_price <= new_current_minimal_bid
           bid.price = bid.max_price
         else
@@ -57,8 +57,10 @@ module Auctify
 
       def approved_bid?
         @approved_bid ||= begin
+          bid.valid?
           check_bidder
-          changing_own_limit? ? check_max_price_increasing : check_price_minimum
+          check_max_price_increasing
+          check_price_minimum
           check_same_bidder
           check_auction_state
 
@@ -94,7 +96,6 @@ module Auctify
 
       def new_current_minimal_bid
         return current_price if first_bid?
-
         increase_price(current_price)
       end
 
@@ -114,7 +115,7 @@ module Auctify
       end
 
       def first_bid?
-        bids.empty?
+        winning_bid.nil?
       end
 
       def bids
@@ -131,11 +132,14 @@ module Auctify
       end
 
       def check_max_price_increasing
-        bid.errors.add(:bidder, :you_can_only_increase_your_max_price) if bid.max_price.present? && (bid.max_price.to_i <= winning_bid.max_price.to_i)
+        return unless changing_own_limit_when_winning?
+
+        bid.errors.add(:bidder, :you_can_only_increase_your_max_price) if bid.max_price.to_i <= winning_bid.max_price.to_i
       end
 
       def check_price_minimum
-        if bid.price < new_current_minimal_bid
+        minimum = changing_own_limit_when_winning? ? current_price : new_current_minimal_bid
+        if bid.price < minimum
           att = bid.with_limit? ? :max_price : :price
           bid.errors.add(att,
                          :price_is_bellow_minimal_bid,
@@ -144,7 +148,7 @@ module Auctify
       end
 
       def check_same_bidder
-        return if overbidding_yourself_allowed? || changing_own_limit?
+        return if overbidding_yourself_allowed? || changing_own_limit_when_winning?
 
         if winning_bid.present? && same_bidder?(winning_bid, bid)
           bid.errors.add(:bidder, :you_cannot_overbid_yourself)
@@ -159,7 +163,7 @@ module Auctify
       end
 
       def solve_winner(winning_bid, new_bid)
-        return if winning_bid.blank? || changing_own_limit?
+        return if winning_bid.blank? || changing_own_limit_when_winning?
 
         solve_limits_fight(winning_bid, new_bid)          if  new_bid.with_limit? &&  winning_bid.with_limit?
         increase_bid_price(winning_bid, new_bid)          if  new_bid.with_limit? && !winning_bid.with_limit?
@@ -201,13 +205,11 @@ module Auctify
 
         @updated_win_bid = winning_bid.dup
         @updated_win_bid.price = [price, winning_bid.max_price].min
+        @updated_win_bid.autobid = true
       end
 
       def increase_price(price)
-        return price + 1 if bid_steps_ladder.blank?
-
-        _range, increase_step = bid_steps_ladder.detect { |range, step| range.cover?(price) }
-        price + increase_step
+        price + auction.minimal_bid_increase_amount_at(price, respect_first_bid: false)
       end
 
       def increase_price_to(overcome:, ceil:)
@@ -222,11 +224,7 @@ module Auctify
         [running_price, ceil].min
       end
 
-      def bid_steps_ladder
-        @bid_steps_ladder ||= auction.bid_steps_ladder
-      end
-
-      def changing_own_limit?
+      def changing_own_limit_when_winning?
         bid.with_limit? && winning_bid.present? && (winning_bid.bidder == bid.bidder)
       end
 

data/config/locales/auctify.cs.yml

@@ -34,14 +34,17 @@ cs:
         published: Zveřejněno
         sales_count: Počet položek
         sales: Položky
+        items: Předměty
         sales_interval: Časový rozestup mezi předměty v minutách
         sales_beginning_hour: Čas prvního předmětu (hodina)
         sales_beginning_minutes: Čas prvního předmětu (minuty)
         commission_in_percent: Provize aukční síně (procenta)
+        auction_prolonging_limit_in_seconds: Časový limit pro prodloužení aukce (sekundy)
       auctify/sale/base:
         buyer: Kupec
         seller: Prodejce
-        item: Zboží
+        item: Předmět
+        pack: Prodejní balík
         aasm_state: Stav
         published: Zveřejněno
         number: Číslo
@@ -58,14 +61,25 @@ cs:
         updated_at: Změněna
         reserve_price: Rezervovaná cena
         ends_at: Předpokládaný konec
-        pack_id: Aukce+
-        pack: Aukce-
+        pack_id: Aukce
+        pack: Aukce
+        bidder_registrations: Registrace do aukce položky
+        bidders: Dražitelé
+        bids: Příhozy
+        winner: Vítěz dražby
+        current_winner: Aktuální výherce
       auctify/bid:
         price: Výše příhozu
-        max_price: Maximální výše příhozu
+        max_price: Limit příhozů
         created_at: Přihozeno
         updated_at:
         registration: Registrace do aukce položky
+        auction: Položka aukce
+        bidder: Dražitel
+      auctify/bidder_registration:
+        bidder: Dražitel
+        auction: Položka aukce
+        bids: Příhozy
 
     errors:
       models:
@@ -98,6 +112,8 @@ cs:
           attributes:
             end_date:
               smaller_than_start_date: "musí být později než začátek"
+            sales:
+              sale_is_out_of_time_frame: "Položka '%{slug}' má čas konce (%{ends_at_time}) mimo rámec aukce"
         auctify/bid:
           not_confirmed: "Příhoz je potřeba potvrdit"
           attributes:
@@ -113,8 +129,10 @@ cs:
               price_is_bellow_opening_price: "je nižší než vyvolávací cena"
               price_is_bellow_minimal_bid: "je nižší než aktuální minimální příhoz %{minimal_bid}"
               must_be_lower_or_equal_max_price: "musí být nižší nebo rovna maximálnímu limitu"
+              must_be_rounded_to: "musí být zaokrouhlená na celé %{round_to} Kč"
             max_price:
               price_is_bellow_minimal_bid: "je nižší než aktuální minimální příhoz %{minimal_bid}"
+              must_be_rounded_to: "musí být zaokrouhlená na celé %{round_to} Kč"
         auctify/bidder_registration:
           attributes:
             auction:

data/db/migrate/20210825155543_change_commission_columns.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class ChangeCommissionColumns < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :auctify_sales, :commission_in_percent, :seller_commission_in_percent
+    add_column :auctify_sales, :buyer_commission_in_percent, :integer
+  end
+end

data/db/migrate/20210917082313_add_auction_prolonging_limit_to_sales_packs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAuctionProlongingLimitToSalesPacks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :auctify_sales_packs, :auction_prolonging_limit_in_seconds, :integer
+  end
+end

data/db/migrate/20211022133253_add_autobid_to_auctify_bids.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddAutobidToAuctifyBids < ActiveRecord::Migration[6.1]
+  def up
+    add_column :auctify_bids, :autobid, :boolean, default: false
+    puts("RUN `Auctify::AutobidFillerJob.perform_later`")
+  end
+
+  def down
+    remove_column :auctify_bids, :autobid
+  end
+end

data/db/migrate/20211203064934_update_sales_featurable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class UpdateSalesFeaturable < ActiveRecord::Migration[6.1]
+  def up
+    rename_column :auctify_sales, :featured, :featured_tmp_boolean
+
+    add_column :auctify_sales, :featured, :integer, default: nil
+    add_index :auctify_sales, :featured
+
+    execute("UPDATE auctify_sales SET featured = 1 WHERE featured_tmp_boolean = TRUE;")
+
+    remove_column :auctify_sales, :featured_tmp_boolean
+  end
+
+  def down
+    rename_column :auctify_sales, :featured, :featured_tmp_integer
+
+    add_column :auctify_sales, :featured, :boolean, default: false
+    add_index :auctify_sales, :featured
+
+    execute("UPDATE auctify_sales SET featured = TRUE WHERE featured_tmp_integer IS NOT NULL;")
+
+    remove_column :auctify_sales, :featured_tmp_integer
+  end
+end

data/lib/auctify/configuration.rb

@@ -3,23 +3,27 @@
 module Auctify
   class Configuration
     attr_accessor :autoregister_as_bidders_all_instances_of_classes,
-                  :auction_prolonging_limit,
+                  :auction_prolonging_limit_in_seconds,
                   :auctioneer_commission_in_percent,
                   :autofinish_auction_after_bidding,
                   :when_to_notify_bidders_before_end_of_bidding,
                   :default_bid_steps_ladder,
-                  :restrict_overbidding_yourself_to_max_price_increasing
+                  :restrict_overbidding_yourself_to_max_price_increasing,
+                  :require_bids_to_be_rounded_to,
+                  :allow_changes_on_auction_with_bids_for_attributes
 
 
     def initialize
       # set defaults here
       @autoregister_as_bidders_all_instances_of_classes = []
-      @auction_prolonging_limit = 2.minutes
+      @auction_prolonging_limit_in_seconds = 2.minutes
       @auctioneer_commission_in_percent = 1 # %
       @autofinish_auction_after_bidding = false
       @when_to_notify_bidders_before_end_of_bidding = nil # no notifying
       @default_bid_steps_ladder = { 0.. => 1 }
       @restrict_overbidding_yourself_to_max_price_increasing = true
+      @require_bids_to_be_rounded_to = 1
+      @allow_changes_on_auction_with_bids_for_attributes = []
     end
 
     def autoregistering_for?(instance)

data/lib/auctify/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "aasm"
+require "with_advisory_lock"
 require_relative "../../app/models/auctify/behaviors"
 
 module Auctify

data/lib/auctify/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auctify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - foton
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: with_advisory_lock
+  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
@@ -272,16 +280,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.142.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.142.7
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -335,8 +343,10 @@ files:
 - app/helpers/auctify/sales_helper.rb
 - app/helpers/auctify/sales_packs_helper.rb
 - app/jobs/auctify/application_job.rb
+- app/jobs/auctify/autobid_filler_job.rb
 - app/jobs/auctify/bidding_closer_job.rb
 - app/jobs/auctify/bidding_is_close_to_end_notifier_job.rb
+- app/jobs/auctify/ensure_auctions_closing_job.rb
 - app/mailers/auctify/application_mailer.rb
 - app/models/auctify/application_record.rb
 - app/models/auctify/behaviors.rb
@@ -411,6 +421,10 @@ files:
 - db/migrate/20210607113440_add_commission_in_percent_to_sales_packs.rb
 - db/migrate/20210617062509_add_index_to_auctify_sales_currently_ends_at.rb
 - db/migrate/20210625125732_add_current_winner_to_auctify_sales.rb
+- db/migrate/20210825155543_change_commission_columns.rb
+- 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
 - lib/auctify.rb
 - lib/auctify/configuration.rb
 - lib/auctify/engine.rb
@@ -420,7 +434,7 @@ homepage: https://github.com/sinfin/auctify
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -435,8 +449,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
-signing_key:
+rubygems_version: 3.2.28
+signing_key: 
 specification_version: 4
 summary: Gem for adding auction behavior to models.
 test_files: []