Merge pull request #981 from 18F/jy-admin-auctions-closed

Create closed auctions section for admin

app/controllers/admin/auctions/closed_controller.rb

@@ -0,0 +1,5 @@
+class Admin::Auctions::ClosedController < Admin::BaseController
+  def index
+    @view_model = Admin::ClosedAuctionsViewModel.new
+  end
+end

app/models/auction_query.rb

@@ -29,7 +29,6 @@ def complete_and_successful
       .delivery_due_at_expired
       .delivered
       .delivery_accepted
-      .c2_submitted
       .paid
   end
 

app/models/null_bidder.rb

@@ -3,6 +3,10 @@ def name
     nil
   end
 
+  def github_login
+    'N/A'
+  end
+
   def admin_user_page_link_partial
     'components/null'
   end

app/models/rules/sealed_bid_auction.rb

@@ -3,7 +3,7 @@ def winning_bid
     if auction_available?
       NullBid.new
     else
-      auction.lowest_bid
+      auction.lowest_bid || NullBid.new
     end
   end
 

app/services/winning_bidder_email_sender.rb

@@ -16,7 +16,7 @@ def perform
   attr_reader :auction
 
   def auction_has_winner?
-    WinningBid.new(auction).find.present?
+    WinningBid.new(auction).find.is_a?(Bid)
   end
 
   def winning_bidder

app/view_models/admin/base_view_model.rb

@@ -3,6 +3,10 @@ def auctions_nav_class
     ''
   end
 
+  def closed_auctions_nav_class
+    ''
+  end
+
   def vendors_nav_class
     ''
   end

app/view_models/admin/closed_auctions_list_item_view_model.rb

@@ -0,0 +1,37 @@
+class Admin::ClosedAuctionsListItemViewModel
+  attr_reader :auction
+
+  def initialize(auction)
+    @auction = auction
+  end
+
+  def title
+    auction.title
+  end
+
+  def id
+    auction.id
+  end
+
+  def delivery_url
+    auction.delivery_url
+  end
+
+  def accepted_at
+    DcTimePresenter.convert_and_format(auction.accepted_at)
+  end
+
+  def rejected_at
+    DcTimePresenter.convert_and_format(auction.rejected_at)
+  end
+
+  def winning_vendor_github_login
+    winning_bidder.github_login
+  end
+
+  private
+
+  def winning_bidder
+    WinningBid.new(auction).find.bidder || NullBidder.new
+  end
+end

app/view_models/admin/closed_auctions_view_model.rb

@@ -0,0 +1,43 @@
+class Admin::ClosedAuctionsViewModel < Admin::BaseViewModel
+  def successful_partial
+    if successfully_delivered.any?
+      'admin/auctions/closed/successful'
+    else
+      'admin/auctions/closed/no_successful'
+    end
+  end
+
+  def rejected_partial
+    if rejected.any?
+      'admin/auctions/closed/rejected'
+    else
+      'admin/auctions/closed/no_rejected'
+    end
+  end
+
+  def successfully_delivered
+    @_successfully_delivered ||= complete_and_successful_auctions.map do |auction|
+      Admin::ClosedAuctionsListItemViewModel.new(auction)
+    end
+  end
+
+  def rejected
+    @_rejected ||= rejected_auctions.map do |auction|
+      Admin::ClosedAuctionsListItemViewModel.new(auction)
+    end
+  end
+
+  def closed_auctions_nav_class
+    'usa-current'
+  end
+
+  private
+
+  def complete_and_successful_auctions
+    AuctionQuery.new.complete_and_successful
+  end
+
+  def rejected_auctions
+    AuctionQuery.new.rejected
+  end
+end

app/views/admin/_auctions_subnav.html.erb

@@ -5,6 +5,7 @@
     <li><%= link_to 'All', admin_auctions_path, class: view_model.auctions_nav_class %></li>
     <li><%= link_to 'Action Items', admin_action_items_path, class: view_model.action_items_nav_class %></li>
     <li><%= link_to 'Draft Auctions', admin_drafts_path, class: view_model.drafts_nav_class %></li>
+    <li><%= link_to 'Closed', admin_auctions_closed_path, class: view_model.closed_auctions_nav_class %></li>
     <li class='new-button'>
       <%= link_to 'Add auction',
         new_admin_auction_path,

app/views/admin/auctions/closed/_no_rejected.html.erb

@@ -0,0 +1,3 @@
+<div>
+  No auctions have been rejected yet
+</div>

app/views/admin/auctions/closed/_no_successful.html.erb

@@ -0,0 +1,3 @@
+<div>
+  No auctions have been successfully delivered yet
+</div>

app/views/admin/auctions/closed/_rejected.html.erb

@@ -0,0 +1,22 @@
+<table class="usa-table-borderless">
+  <thead>
+    <tr>
+      <th scope="col">Title</th>
+      <th scope="col">Vendor</th>
+      <th scope="col">Delivery URL</th>
+      <th scope="col">Date rejected</th>
+      <th scope="col">Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @view_model.rejected.each do |auction| %>
+      <tr>
+        <td><%= link_to(auction.title, admin_auction_path(auction.id)) %></td>
+        <td><%= auction.winning_vendor_github_login %></td>
+        <td><%= auction.delivery_url %></td>
+        <td><%= auction.rejected_at %></td>
+        <td><%= link_to 'edit', edit_admin_auction_path(auction.id) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

app/views/admin/auctions/closed/_successful.html.erb

@@ -0,0 +1,22 @@
+<table class="usa-table-borderless">
+  <thead>
+    <tr>
+      <th scope="col">Title</th>
+      <th scope="col">Vendor</th>
+      <th scope="col">Delivery URL</th>
+      <th scope="col">Date accepted</th>
+      <th scope="col">Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @view_model.successfully_delivered.each do |auction| %>
+      <tr>
+        <td><%= link_to(auction.title, admin_auction_path(auction.id)) %></td>
+        <td><%= auction.winning_vendor_github_login %></td>
+        <td><%= auction.delivery_url %></td>
+        <td><%= auction.accepted_at %></td>
+        <td><%= link_to 'edit', edit_admin_auction_path(auction.id) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

app/views/admin/auctions/closed/index.html.erb

@@ -0,0 +1,9 @@
+<%= render partial: 'admin/auctions_subnav', locals: { view_model: @view_model } %>
+
+<h2>Successfully Delivered</h2>
+
+<%= render partial: @view_model.successful_partial, locals: { view_model: @view_model } %>
+
+<h2>Rejected Auctions</h2>
+
+<%= render partial: @view_model.rejected_partial, locals: { view_model: @view_model } %>

config/routes.rb

@@ -18,14 +18,19 @@
   get '/sign_in', to: 'sign_ins#show'
 
   namespace :admin do
-    resources :auctions
     resources :auction_reports, only: [:show]
     resources :user_reports, only: [:index]
     resources :action_items, only: [:index]
     resources :drafts, only: [:index]
     resources :proposals, only: [:create]
     resources :users, only: [:show, :edit, :update]
 
+    namespace :auctions do
+      get '/closed', to: 'closed#index'
+    end
+
+    resources :auctions
+
     scope '/people' do
       resources :admins, only: [:index]
       resources :vendors, only: [:index]

features/admin_views_action_items.feature

@@ -8,11 +8,11 @@ Feature: Admin view action items
     And I sign in
 
   Scenario: Viewing the action items dashboard
-    Given there are complete and successful auctions
-    And there is an unpublished auction
+    Given there is a complete and successful auction
+    And there is also an unpublished auction
     When I visit the admin action items page
-    Then I should see the name of each dashboard auction
-    And I should see edit links for each dashboard auction
+    Then I should see the name of the auction
+    And I should see the edit link for the auction
 
   Scenario: Viewing the drafts dashboard
     Given there is an unpublished auction

features/admin_views_closed_auctions.feature

@@ -0,0 +1,22 @@
+Feature: Admin views closed auctions in the admin panel
+  As an admin of the Micro-purchase system
+  I want to be able to view successful and rejected closed auctions
+
+  Scenario: Viewing closed successful auctions
+    Given I am an administrator
+    And there is a complete and successful auction
+    And I sign in
+    When I visit the admin closed auctions page
+    Then I should see the name of the auction
+    And I should see the edit link for the auction
+    And I should see "No auctions have been rejected yet"
+
+  Scenario: Viewing closed rejected auctions
+    Given I am an administrator
+    And there is a rejected auction
+    And I sign in
+    When I visit the admin closed auctions page
+    Then I should see the name of the auction
+    And I should see the edit link for the auction
+    And I should see "No auctions have been successfully delivered yet"
+

features/step_definitions/admin_views_action_items_steps.rb

@@ -1,5 +1,5 @@
 Then(/^I should see the rejected auction as an action item$/) do
-  auction = Admin::ActionItemListItem.new(@rejected)
+  auction = Admin::ActionItemListItem.new(@auction)
 
   ['Title', 'Delivery Deadline', 'Delivery URL', 'Vendor Name', 'Rejected At'].each_with_index do |header, i|
     within(:xpath, th_xpath(table_id: 'table-rejected', column: i + 1)) do

features/step_definitions/auction_attributes_steps.rb

@@ -111,16 +111,12 @@
   expect(page).to have_text(@unpublished_auction.description)
 end
 
-Then(/^I should see the name of each dashboard auction$/) do
-  @complete_and_successful.each do |auction|
-    expect(page).to have_text(auction.title)
-  end
+Then(/^I should see the name of the auction$/) do
+  expect(page).to have_text(@auction.title)
 end
 
-Then(/^I should see edit links for each dashboard auction$/) do
-  @complete_and_successful.each do |auction|
-    expect(page).to have_link('edit', href: edit_admin_auction_path(auction.id))
-  end
+Then(/^I should see the edit link for the auction$/) do
+  expect(page).to have_link('edit', href: edit_admin_auction_path(@auction.id))
 end
 
 Then(/^I should not see the unpublished auction$/) do

features/step_definitions/auction_create_steps.rb

@@ -100,16 +100,16 @@
   @unpublished_auction = FactoryGirl.create(:auction, published: false)
 end
 
-Given(/^there are complete and successful auctions$/) do
-  @complete_and_successful = FactoryGirl.create_list(:auction, 2, :complete_and_successful)
+Given(/^there is a complete and successful auction$/) do
+  @auction = FactoryGirl.create(:auction, :complete_and_successful)
 end
 
 Given(/^there is a rejected auction$/) do
-  @rejected = FactoryGirl.create(:auction, :closed, :with_bidders, :delivered, :rejected)
+  @auction = FactoryGirl.create(:auction, :closed, :with_bidders, :delivered, :rejected)
 end
 
 Given(/^there is a rejected auction with no bids$/) do
-  @rejected = FactoryGirl.create(:auction, :closed, :rejected)
+  @auction = FactoryGirl.create(:auction, :closed, :rejected)
 end
 
 Given(/^there is an auction where the winning vendor is not eligible to be paid$/) do

features/step_definitions/navigation_steps.rb

@@ -70,6 +70,10 @@
   visit admin_skills_path
 end
 
+When(/^I visit the admin closed auctions page$/) do
+  visit admin_auctions_closed_path
+end
+
 Then(/^I should be on the skills admin page$/) do
   expect(page.current_path).to eq(admin_skills_path)
 end