Merge 9ad7d5b into f8b2f3d

app/models/admin_auction_status_presenter_factory.rb

@@ -56,15 +56,19 @@ def other_purchase_card_presenter
   end
 
   def available?
-    AuctionStatus.new(auction).available?
+    bidding_status.available?
   end
 
   def future?
-    AuctionStatus.new(auction).future?
+    bidding_status.future?
   end
 
   def work_in_progress?
-    AuctionStatus.new(auction).work_in_progress?
+    bidding_status.work_in_progress?
+  end
+
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(auction)
   end
 
   def status

app/models/bid_status_presenter_factory.rb

@@ -100,23 +100,23 @@ def ineligible?
   end
 
   def work_in_progress?
-    auction_status.work_in_progress?
+    bidding_status.work_in_progress?
   end
 
   def over?
-    auction_status.over?
+    bidding_status.over?
   end
 
   def available?
-    auction_status.available?
+    bidding_status.available?
   end
 
   def future?
-    auction_status.future?
+    bidding_status.future?
   end
 
-  def auction_status
-    AuctionStatus.new(auction)
+  def bidding_status
+    BiddingStatus.new(auction)
   end
 
   def user_is_winning_bidder?

app/models/auction_status.rb → app/models/bidding_status.rb

@@ -1,4 +1,4 @@
-class AuctionStatus
+class BiddingStatus
   def initialize(auction)
     @auction = auction
   end

app/models/bidding_status_presenter_factory.rb

@@ -0,0 +1,29 @@
+class BiddingStatusPresenterFactory
+  attr_reader :auction
+
+  def initialize(auction)
+    @auction = auction
+  end
+
+  def create
+    Object.const_get("BiddingStatusPresenter::#{status_name}").new(auction)
+  end
+
+  private
+
+  def status_name
+    if bidding_status.expiring?
+      'Expiring'
+    elsif bidding_status.over?
+      'Over'
+    elsif bidding_status.future?
+      'Future'
+    else
+      'Available'
+    end
+  end
+
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(auction)
+  end
+end

app/models/rules/base_rules.rb

@@ -22,7 +22,7 @@ def user_can_bid?(user)
   end
 
   def auction_available?
-    AuctionStatus.new(auction).available?
+    BiddingStatus.new(auction).available?
   end
 
   def user_is_eligible_to_bid?(user)

app/presenters/status_presenter/available.rb → app/presenters/bidding_status_presenter/available.rb

@@ -1,4 +1,4 @@
-class StatusPresenter::Available < StatusPresenter::Base
+class BiddingStatusPresenter::Available < BiddingStatusPresenter::Base
   def start_label
     "Bid start time"
   end

app/presenters/status_presenter/base.rb → app/presenters/bidding_status_presenter/base.rb

@@ -1,4 +1,4 @@
-class StatusPresenter::Base
+class BiddingStatusPresenter::Base
   attr_reader :auction
 
   def initialize(auction)

app/presenters/status_presenter/expiring.rb → app/presenters/bidding_status_presenter/expiring.rb

@@ -1,4 +1,4 @@
-class StatusPresenter::Expiring < StatusPresenter::Available
+class BiddingStatusPresenter::Expiring < BiddingStatusPresenter::Available
   def label_class
     'auction-label-expiring'
   end

app/presenters/status_presenter/future.rb → app/presenters/bidding_status_presenter/future.rb

@@ -1,4 +1,4 @@
-class StatusPresenter::Future < StatusPresenter::Base
+class BiddingStatusPresenter::Future < BiddingStatusPresenter::Base
   def start_label
     "Bid start time"
   end

app/presenters/status_presenter/over.rb → app/presenters/bidding_status_presenter/over.rb

@@ -1,4 +1,4 @@
-class StatusPresenter::Over < StatusPresenter::Base
+class BiddingStatusPresenter::Over < BiddingStatusPresenter::Base
   def start_label
     "Auction started at"
   end

app/serializers/auction_serializer.rb

@@ -55,15 +55,15 @@ def winning_bid
   private
 
   def veiled_bids
-    if object.type == 'sealed_bid' && auction_status.available?
+    if object.type == 'sealed_bid' && bidding_status.available?
       object.bids.where(bidder: scope)
     else
       object.bids
     end
   end
 
   def find_winning_bid
-    if auction_status.available?
+    if bidding_status.available?
       NullBid.new
     else
       WinningBid.new(object).find
@@ -74,7 +74,7 @@ def find_customer
     object.customer || NullCustomer.new
   end
 
-  def auction_status
-    @_auction_status ||= AuctionStatus.new(object)
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(object)
   end
 end

app/serializers/bid_serializer.rb

@@ -45,6 +45,6 @@ def veiled_bidder
   end
 
   def auction_available?
-    AuctionStatus.new(object.auction).available?
+    BiddingStatus.new(object.auction).available?
   end
 end

app/services/create_auction_ended_job.rb

@@ -23,6 +23,6 @@ def job
   end
 
   def auction_not_over?
-    !AuctionStatus.new(auction).over?
+    !BiddingStatus.new(auction).over?
   end
 end

app/view_models/admin/auction_show_view_model.rb

@@ -7,7 +7,7 @@ def initialize(auction:, current_user:)
   end
 
   def csv_report_partial
-    if auction_status.over?
+    if bidding_status.over?
       'admin/auctions/csv_report'
     else
       'components/null'
@@ -26,8 +26,8 @@ def admin_auction_status_presenter
     AdminAuctionStatusPresenterFactory.new(auction: auction).create
   end
 
-  def status_presenter
-    @_status_presenter ||= StatusPresenterFactory.new(auction).create
+  def bidding_status_presenter
+    @_status_presenter ||= BiddingStatusPresenterFactory.new(auction).create
   end
 
   def admin_data
@@ -60,7 +60,7 @@ def title
   end
 
   def relative_time
-    status_presenter.relative_time
+    bidding_status_presenter.relative_time
   end
 
   def veiled_bids
@@ -108,8 +108,8 @@ def c2_fields
     end
   end
 
-  def auction_status
-    AuctionStatus.new(auction)
+  def bidding_status
+    BiddingStatus.new(auction)
   end
 
   def customer

app/view_models/admin/bid_list_item.rb

@@ -37,7 +37,7 @@ def amount_to_currency
   end
 
   def auction_available?
-    AuctionStatus.new(bid.auction).available?
+    BiddingStatus.new(bid.auction).available?
   end
 
   def bidder_not_user?

app/view_models/admin/edit_auction_view_model.rb

@@ -86,7 +86,7 @@ def default_date_time
   end
 
   def closed?
-    AuctionStatus.new(auction).over?
+    BiddingStatus.new(auction).over?
   end
 
   def publishable?

app/view_models/admin/user_auction_view_model.rb

@@ -17,8 +17,8 @@ def id
     auction.id
   end
 
-  def status
-    StatusPresenterFactory.new(auction).create.label
+  def bidding_status
+    BiddingStatusPresenterFactory.new(auction).create.label
   end
 
   def skills
@@ -56,7 +56,7 @@ def user_won?
   end
 
   def auction_over?
-    AuctionStatus.new(auction).over?
+    BiddingStatus.new(auction).over?
   end
 
   def auction_accepted?

app/view_models/auction_list_item.rb

@@ -64,7 +64,7 @@ def winning_bid_partial
   end
 
   def relative_time
-    status_presenter.relative_time
+    bidding_status_presenter.relative_time
   end
 
   def winning_bid_amount_as_currency
@@ -75,8 +75,8 @@ def winning_bid_amount_as_currency
     end
   end
 
-  def status_presenter
-    @_status_presenter ||= StatusPresenterFactory.new(auction).create
+  def bidding_status_presenter
+    @_status_presenter ||= BiddingStatusPresenterFactory.new(auction).create
   end
 
   private
@@ -86,14 +86,14 @@ def for_small_business?
   end
 
   def available?
-    auction_status.available?
+    bidding_status.available?
   end
 
   def over?
-    auction_status.over?
+    bidding_status.over?
   end
 
-  def auction_status
-    AuctionStatus.new(auction)
+  def bidding_status
+    BiddingStatus.new(auction)
   end
 end

app/view_models/auction_show_view_model.rb

@@ -33,8 +33,8 @@ def skills
 
   def auction_data
     {
-      status_presenter.start_label => formatted_date(auction.started_at),
-      status_presenter.deadline_label => formatted_ended_at,
+      bidding_status_presenter.start_label => formatted_date(auction.started_at),
+      bidding_status_presenter.deadline_label => formatted_ended_at,
       'Delivery deadline' => formatted_date(auction.delivery_due_at),
       'Eligible vendors' => eligibility_label,
       'Customer' => customer.agency_name
@@ -53,8 +53,8 @@ def capitalized_type
     auction.type.dasherize.capitalize
   end
 
-  def status_presenter
-    @_status_presenter ||= StatusPresenterFactory.new(auction).create
+  def bidding_status_presenter
+    @_status_presenter ||= BiddingStatusPresenterFactory.new(auction).create
   end
 
   def bid_status_presenter
@@ -105,15 +105,15 @@ def formatted_accepted_at
   end
 
   def tag_data_value_status
-    status_presenter.tag_data_value_status
+    bidding_status_presenter.tag_data_value_status
   end
 
   def tag_data_label_2
-    status_presenter.tag_data_label_2
+    bidding_status_presenter.tag_data_label_2
   end
 
   def tag_data_value_2
-    status_presenter.tag_data_value_2
+    bidding_status_presenter.tag_data_value_2
   end
 
   def highlighted_bid_amount_as_currency
@@ -125,7 +125,7 @@ def max_allowed_bid_as_currency
   end
 
   def relative_time
-    status_presenter.relative_time
+    bidding_status_presenter.relative_time
   end
 
   def sealed_bids_partial
@@ -164,15 +164,15 @@ def user_bids
   end
 
   def over?
-    auction_status.over?
+    bidding_status.over?
   end
 
   def available?
-    auction_status.available?
+    bidding_status.available?
   end
 
-  def auction_status
-    AuctionStatus.new(auction)
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(auction)
   end
 
   def rules

app/view_models/bid_list_item.rb

@@ -41,7 +41,7 @@ def amount_to_currency
   end
 
   def auction_available?
-    AuctionStatus.new(bid.auction).available?
+    BiddingStatus.new(bid.auction).available?
   end
 
   def bidder_not_user?