Merge 1ff63c0 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?
+    auction.work_in_progress?
+  end
+
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(auction)
   end
 
   def status

app/models/auction.rb

@@ -54,6 +54,10 @@ class Auction < ActiveRecord::Base
   )
   validate :publishing_auction, on: :update, if: :published_changed?
 
+  def work_in_progress?
+    delivery_url.present? && pending_delivery?
+  end
+
   def publishing_auction
     if published_was == 'unpublished' && purchase_card == 'default' && c2_status != 'approved'
       errors.add(:c2_status, " is not approved.")

app/models/bid_status_presenter_factory.rb

@@ -100,23 +100,23 @@ def ineligible?
   end
 
   def work_in_progress?
-    auction_status.work_in_progress?
+    auction.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
@@ -19,10 +19,6 @@ def expiring?
     available? && auction.ended_at < (Time.current + 12.hours)
   end
 
-  def work_in_progress?
-    auction.delivery_url.present? && auction.pending_delivery?
-  end
-
   private
 
   attr_reader :auction

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/models/status_presenter_factory.rb

@@ -12,18 +12,18 @@ def create
   private
 
   def status_name
-    if auction_status.expiring?
+    if bidding_status.expiring?
       'Expiring'
-    elsif auction_status.over?
+    elsif bidding_status.over?
       'Over'
-    elsif auction_status.future?
+    elsif bidding_status.future?
       'Future'
     else
       'Available'
     end
   end
 
-  def auction_status
-    AuctionStatus.new(auction)
+  def bidding_status
+    @_bidding_status ||= BiddingStatus.new(auction)
   end
 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'
@@ -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

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

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

@@ -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?

app/view_models/my_bid_list_item.rb

@@ -54,7 +54,7 @@ def delivery_due_at
   private
 
   def available?
-    AuctionStatus.new(auction).available?
+    BiddingStatus.new(auction).available?
   end
 
   def winning_bid

docs/technical_debt.md

@@ -132,7 +132,7 @@ the various classes relate:
 7. The `AuctionListItem` class also delegates to methods from an internal
    object. So, a call to `AuctionListItem#available?` within a view
    will actually call an internal variable instance of the
-   [AuctionStatus](../app/models/auction_status.rb) with that
+   [BiddingStatus](../app/models/bidding_status.rb) with that
    method. This approach lets us collect related functions like _all
    the methods for querying the availability of an auction_ in a single
    focused place unlike having them be scattered among many methods in

spec/models/auction_status_spec.rb → spec/models/bidding_status_spec.rb

@@ -1,35 +1,35 @@
 require 'rails_helper'
 
-describe AuctionStatus do
+describe BiddingStatus do
   describe '#available?' do
     context 'start datetime in past, end datetime in future' do
       it 'is true' do
         auction = FactoryGirl.build(:auction, :available)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to be_available
       end
     end
 
     context 'start datetime in past, end datetime in past' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :closed)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_available
       end
     end
 
     context 'start datetime in future, end datetime in future' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :future)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_available
       end
     end
 
     context 'the auction is not published' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :available, published: false)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to_not be_available
       end
     end
@@ -39,23 +39,23 @@
     context 'end datetime is in past' do
       it 'is true' do
         auction = FactoryGirl.build(:auction, :closed)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to be_over
       end
     end
 
     context 'end datetime is in future' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :future)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_over
       end
     end
 
     context 'end datetime is nil' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, ended_at: nil)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_over
       end
     end
@@ -65,23 +65,23 @@
     context 'start datetime is in future' do
       it 'is true' do
         auction = FactoryGirl.build(:auction, :future)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to be_future
       end
     end
 
     context 'start datetime is in past' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :available)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_future
       end
     end
 
     context 'start datetime is nil' do
       it 'is true' do
         auction = FactoryGirl.build(:auction, started_at: nil)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to be_future
       end
     end
@@ -91,23 +91,23 @@
     context 'auction in progress and expiring in less than 12 hours' do
       it 'is true' do
         auction = FactoryGirl.build(:auction, :expiring)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).to be_expiring
       end
     end
 
     context 'auction not started and expiring in less than 12 hours' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :future)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_expiring
       end
     end
 
     context 'auction in progress and expiring in more than 12 hours' do
       it 'is false' do
         auction = FactoryGirl.build(:auction, :available)
-        status = AuctionStatus.new(auction)
+        status = BiddingStatus.new(auction)
         expect(status).not_to be_expiring
       end
     end