auctify 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a52b4af50580a4b82abdb1c7fd04686803f3a59d648b2a0fb18bc7acb46875
-  data.tar.gz: c33891089eb4f6e53d101b033442dc56dd62966a2b0aef5d1173e73c0070335d
+  metadata.gz: 14832525cab9835407bccb94056500037fe39da17a9ea311f7053ce4adf48255
+  data.tar.gz: 522647a33fa236dd02c2980ecde719508bd83f21db2c0ffa38d1d77ce104d002
 SHA512:
-  metadata.gz: 33f938020a0879f29ce53ac4f0a926138f9c904cdcb435ecdf4ac79119300e450394861c12f611e6248ac5136ab7e94516a3232d9451bf339a682509ce2eac92
-  data.tar.gz: a68e770af42e0c5be75ff52e47bccc428d80be1c49b5744623cd26d0c0aa5b01d6700d5e385f1e0ad3e41448aeaf7ff66efbb8b5fd0414b3c562e35041b64776
+  metadata.gz: 803112a2c554cb95f1eb818911ea4a92d4377306ba936ac5190101f8463a5378d225a5c260a50e01e8cc0f379ddd87b1d57902d186a8469c7baa34dee991f23a
+  data.tar.gz: ee8f293dbba3adc69a730d208b4973ebf7d9609d326bca03eda616ca668edfb792b2d4d9b09bef211a5c08db221da2befcd507d9d3f0844c5d8de1e774db46d8

data/README.md

@@ -121,6 +121,9 @@ 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|

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

@@ -17,20 +17,14 @@ module Auctify
         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
-
               @auction.reload
 
-              winning_bid_id = @auction.winning_bid.try(:id)
-              overbid_by_limit = winning_bid_id && new_bid.id && winning_bid_id != new_bid.id
+              store_dont_confirm_bids
 
-              render_record @auction, success: true, overbid_by_limit: overbid_by_limit
+              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
@@ -68,6 +62,23 @@ module Auctify
                          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/jobs/auctify/ensure_auctions_closing_job.rb

@@ -9,7 +9,7 @@ module Auctify
                                       .where("currently_ends_at <= ?", Time.current + checking_period_to_future)
       auctions.each do |auction|
         if auction.currently_ends_at <= Time.current
-          Auctify::BiddingCloserJob.perform_now(auction_id: auction.id)
+          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

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

@@ -216,6 +216,14 @@ module Auctify
         bidding_result.current_minimal_bid
       end
 
+      def minimal_bid_increase_amount_at(price, respect_first_bid: true)
+        return 0 if respect_first_bid && ordered_applied_bids.blank? # 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
 

data/app/models/auctify/sales_pack.rb

@@ -45,17 +45,24 @@ 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)

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
@@ -59,7 +59,8 @@ module Auctify
         @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
 
@@ -95,7 +96,6 @@ module Auctify
 
       def new_current_minimal_bid
         return current_price if first_bid?
-
         increase_price(current_price)
       end
 
@@ -132,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,
@@ -145,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)
@@ -160,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?
@@ -206,10 +209,7 @@ module Auctify
       end
 
       def increase_price(price)
-        return price + 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) }
-        price + increase_step
+        price + auction.minimal_bid_increase_amount_at(price, respect_first_bid: false)
       end
 
       def increase_price_to(overcome:, ceil:)
@@ -224,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/lib/auctify/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auctify
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - foton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails