Manualni zavirani aukci

Gemfile

@@ -17,3 +17,5 @@ gem "folio", github: "sinfin/folio", branch: "master"
 
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
+
+gem "rails-i18n", "~> 6"

Gemfile.lock

@@ -431,9 +431,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-i18n (7.0.1)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 6.0.0, < 7)
     railties (6.1.4.4)
       actionpack (= 6.1.4.4)
       activesupport (= 6.1.4.4)
@@ -579,6 +579,7 @@ DEPENDENCIES
   pry-byebug
   pry-rails
   puma
+  rails-i18n (~> 6)
   rubocop
   rubocop-minitest
   rubocop-performance

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

@@ -33,6 +33,36 @@ def bids
           end
         end
 
+        def close_manually
+          with_authorized_account do
+            if @auction.close_manually(by: current_account, price_check: params[:current_price])
+              render_record @auction.reload
+            else
+              render_record @auction.reload, status: 400
+            end
+          end
+        end
+
+        def lock_bidding
+          with_authorized_account do
+            if @auction.lock_bidding(by: current_account)
+              render_record @auction.reload
+            else
+              render_record @auction.reload, status: 400
+            end
+          end
+        end
+
+        def unlock_bidding
+          with_authorized_account do
+            if @auction.unlock_bidding(by: current_account)
+              render_record @auction.reload
+            else
+              render_record @auction.reload, status: 400
+            end
+          end
+        end
+
         private
           def find_auction
             @auction = Auctify::Sale::Auction.find(params[:id])
@@ -79,6 +109,14 @@ def overbid_by_limit?(new_bid)
 
             winning_bid != new_bid
           end
+
+          def with_authorized_account(&block)
+            if current_account
+              block.call
+            else
+              head 403
+            end
+          end
       end
     end
   end

app/jobs/auctify/bidding_closer_job.rb

@@ -12,7 +12,11 @@ def perform(auction_id:)
         return
       end
 
-      return if Time.current < auction.currently_ends_at
+      if auction.must_be_closed_manually?
+        return unless auction.manually_closed_at?
+      else
+        return if Time.current < auction.currently_ends_at
+      end
 
       Auctify::Sale::Auction.with_advisory_lock("closing_auction_#{auction_id}") do
         # can wait unitl other BCJob release lock and than continue!

app/jobs/auctify/ensure_auctions_closing_job.rb

@@ -6,7 +6,9 @@ class EnsureAuctionsClosingJob < ApplicationJob
 
     def perform
       auctions = ::Auctify::Sale::Auction.in_sale
-                                      .where("currently_ends_at <= ?", Time.current + checking_period_to_future)
+                                         .closable_automatically
+                                         .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)

app/models/auctify/bid.rb

@@ -78,7 +78,7 @@ def round_it_to(amount, smallest_amount)
 # Table name: auctify_bids
 #
 #  id              :bigint(8)        not null, primary key
-#  registration_id :integer          not null
+#  registration_id :bigint(8)        not null
 #  price           :decimal(12, 2)   not null
 #  max_price       :decimal(12, 2)
 #  created_at      :datetime         not null

app/models/auctify/bidder_registration.rb

@@ -83,8 +83,8 @@ def auction_is_in_allowed_state
 #
 #  id                :bigint(8)        not null, primary key
 #  bidder_type       :string           not null
-#  bidder_id         :integer          not null
-#  auction_id        :integer          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

app/models/auctify/sale/auction.rb

@@ -13,6 +13,7 @@ class Auction < Auctify::Sale::Base
       }
 
       attr_accessor :winning_bid
+      attr_accessor :manually_closed_price_check
 
       has_many :bidder_registrations, dependent: :destroy
       has_many :bids, through: :bidder_registrations, dependent: :restrict_with_error # destroy them manually first
@@ -23,11 +24,16 @@ class Auction < Auctify::Sale::Base
 
       belongs_to :winner, polymorphic: true, optional: true
       belongs_to :current_winner, polymorphic: true, optional: true
+      belongs_to :manually_closed_by, polymorphic: true, optional: true
+      belongs_to :bidding_locked_by, polymorphic: true, optional: true
 
       validates :ends_at,
                 presence: true
 
       scope :where_current_winner_is, ->(bidder) { where(current_winner: bidder) }
+      scope :closable_automatically, -> do
+        where(must_be_closed_manually: false)
+      end
 
       aasm do
         state :offered, initial: true, color: "red"
@@ -115,6 +121,8 @@ class Auction < Auctify::Sale::Base
 
       validate :buyer_vs_bidding_consistence
       validate :forbidden_changes
+      validate :validate_manually_closed
+      validate :validate_bidding_locked
 
       after_create :autoregister_bidders
       after_save :create_jobs
@@ -225,7 +233,13 @@ def current_max_price_for(bidder, bids_array: nil)
       end
 
       def open_for_bids?
-        in_sale? && Time.current <= currently_ends_at
+        return false if bidding_locked_at?
+
+        if must_be_closed_manually?
+          !manually_closed_at && in_sale?
+        else
+          in_sale? && Time.current <= currently_ends_at
+        end
       end
 
       def opening_price
@@ -249,6 +263,23 @@ def auction_prolonging_limit_in_seconds
         pack&.auction_prolonging_limit_in_seconds || Auctify.configuration.auction_prolonging_limit_in_seconds
       end
 
+      def close_manually(by:, price_check:)
+        if manually_closed_at.nil? && update(manually_closed_at: Time.current, manually_closed_by: by, manually_closed_price_check: price_check)
+          Auctify::BiddingCloserJob.perform_later(auction_id: id)
+          true
+        else
+          false
+        end
+      end
+
+      def lock_bidding(by:)
+        !!update(bidding_locked_at: Time.current, bidding_locked_by: by)
+      end
+
+      def unlock_bidding(by:)
+        !!update(bidding_locked_at: nil, bidding_locked_by: nil)
+      end
+
       private
         def buyer_vs_bidding_consistence
           return true if buyer.blank? && sold_price.blank?
@@ -364,6 +395,38 @@ def create_jobs(force = false)
             end
           end
         end
+
+        def validate_manually_closed
+          return unless will_save_change_to_manually_closed_at?
+
+          if manually_closed_at
+            unless bidding_locked_at?
+              errors.add(:base, :need_to_lock_bidding_first)
+            end
+
+            if !manually_closed_price_check || manually_closed_price_check.to_i != current_price
+              errors.add(:base, :current_price_doesnt_match_closing)
+            end
+
+            unless must_be_closed_manually?
+              errors.add(:base, :sales_not_closed_manually)
+            end
+
+            unless manually_closed_by.is_a?(Folio::Account)
+              errors.add(:manually_closed_by, :not_allowed)
+            end
+          end
+        end
+
+        def validate_bidding_locked
+          return unless will_save_change_to_bidding_locked_at?
+
+          if bidding_locked_at?
+            unless bidding_locked_by.is_a?(Folio::Account)
+              errors.add(:bidding_locked_by, :not_allowed)
+            end
+          end
+        end
     end
   end
 end
@@ -376,16 +439,16 @@ def create_jobs(force = false)
 #  seller_type                  :string
 #  seller_id                    :integer
 #  buyer_type                   :string
-#  buyer_id                     :integer
-#  item_id                      :integer          not null
+#  buyer_id                     :bigint(8)
+#  item_id                      :bigint(8)        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
+#  offered_price                :decimal(12, 2)
+#  current_price                :decimal(12, 2)
+#  sold_price                   :decimal(12, 2)
+#  bid_steps_ladder             :jsonb
 #  reserve_price                :decimal(, )
 #  pack_id                      :bigint(8)
 #  ends_at                      :datetime
@@ -404,12 +467,23 @@ def create_jobs(force = false)
 #  current_winner_id            :bigint(8)
 #  buyer_commission_in_percent  :integer
 #  featured                     :integer
+#  manually_closed_at           :datetime
+#  manually_closed_by_type      :string
+#  manually_closed_by_id        :bigint(8)
+#  must_be_closed_manually      :boolean          default(FALSE)
+#  bidding_locked_at            :datetime
+#  bidding_locked_by_type       :string
+#  bidding_locked_by_id         :bigint(8)
 #
 # Indexes
 #
+#  index_auctify_sales_on_aasm_state                 (aasm_state)
+#  index_auctify_sales_on_bidding_locked_by          (bidding_locked_by_type,bidding_locked_by_id)
 #  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_manually_closed_by         (manually_closed_by_type,manually_closed_by_id)
+#  index_auctify_sales_on_must_be_closed_manually    (must_be_closed_manually)
 #  index_auctify_sales_on_pack_id                    (pack_id)
 #  index_auctify_sales_on_position                   (position)
 #  index_auctify_sales_on_published                  (published)

app/models/auctify/sale/base.rb

@@ -34,13 +34,50 @@ class Base < ApplicationRecord
       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
-        where(aasm_state: "in_sale").where("currently_ends_at > ?", Time.current)
+        sql = <<~SQL
+          (
+            auctify_sales.must_be_closed_manually = ?
+            AND
+            auctify_sales.aasm_state = ?
+          ) OR (
+            auctify_sales.must_be_closed_manually = ?
+            AND
+            auctify_sales.aasm_state = ?
+            AND
+            auctify_sales.currently_ends_at > ?
+          )
+        SQL
+
+        where(sql,
+              true,
+              "in_sale",
+              false,
+              "in_sale",
+              Time.current)
       end
 
       scope :auctions_finished, -> do
-        where.not(aasm_state: %w[offered accepted refused]).where("currently_ends_at < ?", Time.current)
+        sql = <<~SQL
+          (
+            auctify_sales.must_be_closed_manually = ?
+            AND
+            auctify_sales.aasm_state IN (?)
+          ) OR (
+            auctify_sales.must_be_closed_manually = ?
+            AND
+            auctify_sales.aasm_state NOT IN (?)
+            AND
+            auctify_sales.currently_ends_at < ?
+          )
+        SQL
+
+        where(sql,
+              true,
+              %w[bidding_ended auctioned_successfully auctioned_unsuccessfully sold not_sold],
+              false,
+              %w[offered accepted refused],
+              Time.current)
       end
 
       scope :latest_published_by_item, -> { joins(latest_published_sales_by_item_subtable.join_sources) }
@@ -172,16 +209,16 @@ def slug_candidates
 #  seller_type                  :string
 #  seller_id                    :integer
 #  buyer_type                   :string
-#  buyer_id                     :integer
-#  item_id                      :integer          not null
+#  buyer_id                     :bigint(8)
+#  item_id                      :bigint(8)        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
+#  offered_price                :decimal(12, 2)
+#  current_price                :decimal(12, 2)
+#  sold_price                   :decimal(12, 2)
+#  bid_steps_ladder             :jsonb
 #  reserve_price                :decimal(, )
 #  pack_id                      :bigint(8)
 #  ends_at                      :datetime
@@ -200,12 +237,23 @@ def slug_candidates
 #  current_winner_id            :bigint(8)
 #  buyer_commission_in_percent  :integer
 #  featured                     :integer
+#  manually_closed_at           :datetime
+#  manually_closed_by_type      :string
+#  manually_closed_by_id        :bigint(8)
+#  must_be_closed_manually      :boolean          default(FALSE)
+#  bidding_locked_at            :datetime
+#  bidding_locked_by_type       :string
+#  bidding_locked_by_id         :bigint(8)
 #
 # Indexes
 #
+#  index_auctify_sales_on_aasm_state                 (aasm_state)
+#  index_auctify_sales_on_bidding_locked_by          (bidding_locked_by_type,bidding_locked_by_id)
 #  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_manually_closed_by         (manually_closed_by_type,manually_closed_by_id)
+#  index_auctify_sales_on_must_be_closed_manually    (must_be_closed_manually)
 #  index_auctify_sales_on_pack_id                    (pack_id)
 #  index_auctify_sales_on_position                   (position)
 #  index_auctify_sales_on_published                  (published)