提出物一覧のページの各タブの並びを昇順にした

app/controllers/api/products/passed_controller.rb

@@ -4,7 +4,7 @@ class API::Products::PassedController < API::BaseController
   def show
     products = Product
                .list
-               .order_for_not_wip_list
+               .ascending_by_date_of_publishing_and_id
     @passed5 = products.count { |product| product.elapsed_days == 5 }
     @passed6 = products.count { |product| product.elapsed_days == 6 }
     @over7 = products.count { |product| product.elapsed_days >= 7 }

app/controllers/api/products/unassigned_controller.rb

@@ -8,7 +8,7 @@ def index
                 .unchecked
                 .not_wip
                 .list
-                .order_for_not_wip_list
+                .ascending_by_date_of_publishing_and_id
     @latest_product_submitted_just_5days = @products.find { |product| product.elapsed_days == 5 }
     @latest_product_submitted_just_6days = @products.find { |product| product.elapsed_days == 6 }
     @latest_product_submitted_over_7days = @products.find { |product| product.elapsed_days >= 7 }

app/controllers/api/products/unchecked_controller.rb

@@ -10,14 +10,13 @@ def index
                   Product.unchecked
                          .not_wip
                          .list
-                         .order_for_not_wip_list
+                         .ascending_by_date_of_publishing_and_id
                          .page(params[:page])
                 when 'unchecked_no_replied'
                   Product.unchecked_no_replied_products(current_user.id)
                          .unchecked
                          .not_wip
                          .list
-                         .order_for_not_wip_list
                          .page(params[:page])
                 end
     @latest_product_submitted_just_5days = @products.find { |product| product.elapsed_days == 5 }

app/controllers/api/products_controller.rb

@@ -6,7 +6,7 @@ class API::ProductsController < API::BaseController
   def index
     @products = Product
                 .list
-                .order_for_list
+                .ascending_by_date_of_publishing_and_id
                 .page(params[:page])
   end
 end

app/models/product.rb

@@ -49,8 +49,8 @@ class Product < ApplicationRecord
                { checks: { user: { avatar_attachment: :blob } } })
   }
   scope :order_for_list, -> { order(created_at: :desc, id: :desc) }
-  scope :order_for_not_wip_list, -> { order(published_at: :desc, id: :desc) }
-  scope :order_for_self_assigned_list, -> { order(commented_at: :desc, published_at: :desc) }
+  scope :ascending_by_date_of_publishing_and_id, -> { order(published_at: :asc, id: :asc) }
+  scope :order_for_self_assigned_list, -> { order('commented_at asc nulls first, published_at asc') }
 
   def self.add_latest_commented_at
     Product.all.includes(:comments).find_each do |product|
@@ -122,13 +122,13 @@ def self.unchecked_no_replied_products_ids(current_user_id)
   def self.self_assigned_no_replied_products(current_user_id)
     no_replied_product_ids = self_assigned_no_replied_product_ids(current_user_id)
     Product.where(id: no_replied_product_ids)
-           .order(commented_at: :desc, published_at: :desc)
+           .order(published_at: :asc, id: :asc)
   end
 
   def self.unchecked_no_replied_products(current_user_id)
     no_replied_products_ids = unchecked_no_replied_products_ids(current_user_id)
     Product.where(id: no_replied_products_ids)
-           .order(created_at: :desc)
+           .order(published_at: :asc, id: :asc)
   end
 
   def completed?(user)

db/fixtures/products.yml

@@ -118,7 +118,8 @@ product62:
   practice: practice1
   user: take8
   body: テストの提出物62です。
-  published_at: <%= (now - 60 * 60 * 24 * 10).to_s(:db) %>
+  published_at: <%= 10.day.ago.to_s(:db) %>
+  created_at: <%= 10.day.ago.to_s(:db) %>
 
 product63:
   practice: practice6

test/fixtures/products.yml

@@ -356,20 +356,29 @@ product62:
   practice: practice45
   user: kimura
   body: 「自分の担当」かつ「未返信」の提出物
+  created_at: <%= 1.day.ago %>
+  updated_at: <%= 1.day.ago %>
+  published_at: <%= 1.day.ago %>
   wip: false
   checker_id: <%= ActiveRecord::FixtureSet.identify(:machida) %>
 
 product63:
   practice: practice46
   user: kimura
   body: 「自分の担当」かつ「返信済み」の提出物
+  created_at: <%= 2.day.ago %>
+  updated_at: <%= 2.day.ago %>
+  published_at: <%= 2.day.ago %>
   wip: false
   checker_id: <%= ActiveRecord::FixtureSet.identify(:machida) %>
 
 product64:
   practice: practice10
   user: kimura
   body: 担当者のいる提出物です。
+  created_at: <%= Time.current %>
+  updated_at: <%= Time.current %>
+  published_at: <%= Time.current %>
   checker_id: "<%= ActiveRecord::FixtureSet.identify(:machida) %>"
 
 product65:

test/integration/api/products_test.rb

@@ -3,6 +3,8 @@
 require 'test_helper'
 
 class API::ProductsTest < ActionDispatch::IntegrationTest
+  fixtures :products
+
   test 'GET /api/products.json' do
     get api_products_path(format: :json)
     assert_response :unauthorized
@@ -42,4 +44,14 @@ class API::ProductsTest < ActionDispatch::IntegrationTest
         headers: { 'Authorization' => "Bearer #{token}" }
     assert_response :ok
   end
+
+  test 'should return products in order ' do
+    token = create_token('machida', 'testtest')
+    get api_products_self_assigned_index_path(format: :json),
+        headers: { 'Authorization' => "Bearer #{token}" }
+
+    expected = products(:product15, :product63, :product62, :product64).map { |product| product.practice.title }
+    actual = response.parsed_body['products'].map { |product| product['practice']['title'] }
+    assert_equal expected, actual
+  end
 end

test/system/product/self_assigned_test.rb

@@ -42,26 +42,14 @@ class Product::SelfAssignedTest < ApplicationSystemTestCase
     end
   end
 
-  test 'products order on self assigned tab' do
-    checker = users(:komagata)
-    # id順で並べたときの最初と最後の提出物を、コメントの日付順・提出日順で見たときに最新と最古になるように入れ替える
-    # 最古の提出物を画面上で判定するため、提出物を1ページ内に収める
-    Product.update_all(created_at: 3.days.ago, published_at: 3.days.ago, checker_id: checker.id) # rubocop:disable Rails/SkipsModelValidations
-    Product.unchecked.limit(Product.count - Product.default_per_page).delete_all
-    newest_product = Product.self_assigned_product(checker.id).unchecked.reorder(:id).first
-    newest_product.update(published_at: 1.day.ago)
-    oldest_product = Product.self_assigned_product(checker.id).unchecked.reorder(:id).last
-    oldest_product.update(commented_at: Time.current, published_at: Time.current)
+  test 'display products on self assigned tab' do
+    oldest_product = products(:product15)
+    newest_product = products(:product64)
 
-    visit_with_auth '/products/self_assigned', 'komagata'
+    visit_with_auth '/products/self_assigned', 'machida'
 
-    # 作成日の降順で並んでいることを検証する
-    titles = all('.thread-list-item-title__title').map { |t| t.text.gsub('★', '') }
-    names = all('.thread-list-item-meta .a-user-name').map(&:text)
-    assert_equal "#{newest_product.practice.title}の提出物", titles.first
-    assert_equal newest_product.user.login_name, names.first
-    assert_equal "#{oldest_product.practice.title}の提出物", titles.last
-    assert_equal oldest_product.user.login_name, names.last
+    assert_equal 'OS X Mountain Lionをクリーンインストールする', oldest_product.practice.title
+    assert_equal 'sshdをインストールする', newest_product.practice.title
   end
 
   test 'not display products in listing self-assigned if self-assigned products all checked' do

test/system/product/unassigned_test.rb

@@ -28,28 +28,20 @@ class Product::UnassignedTest < ApplicationSystemTestCase
                        .unassigned
                        .unchecked
                        .not_wip
-                       .order_for_not_wip_list
+                       .ascending_by_date_of_publishing_and_id
                        .first
       assert_text newest_product.body
     end
   end
 
   test 'products order on unassigned tab' do
-    # id順で並べたときの最初と最後の提出物を、提出日順で見たときに最新と最古になるように入れ替える
-    Product.update_all(created_at: 1.day.ago, published_at: 1.day.ago) # rubocop:disable Rails/SkipsModelValidations
-    newest_product = Product.unassigned.unchecked.not_wip.reorder(:id).first
-    newest_product.update(published_at: Time.current)
-    oldest_product = Product.unassigned.unchecked.not_wip.reorder(:id).last
-    oldest_product.update(published_at: 2.days.ago)
+    oldest_product = products(:product14)
+    newest_product = products(:product26)
 
     visit_with_auth '/products/unassigned', 'komagata'
 
-    # 提出日の降順で並んでいることを検証する
-    titles = all('.thread-list-item-title__title').map { |t| t.text.gsub('★', '') }
-    names = all('.thread-list-item-meta .a-user-name').map(&:text)
-    assert_equal "#{newest_product.practice.title}の提出物", titles.first
-    assert_equal newest_product.user.login_name, names.first
-    assert_equal "#{oldest_product.practice.title}の提出物", titles.last
-    assert_equal oldest_product.user.login_name, names.last
+    # 提出日の昇順で並んでいることを検証する
+    assert_equal 'OS X Mountain Lionをクリーンインストールする', oldest_product.practice.title
+    assert_equal 'sshdでパスワード認証を禁止にする', newest_product.practice.title
   end
 end

test/system/product/unchecked_test.rb

@@ -27,31 +27,22 @@ class Product::UncheckedTest < ApplicationSystemTestCase
       newest_product = Product
                        .unchecked
                        .not_wip
-                       .order_for_not_wip_list
+                       .ascending_by_date_of_publishing_and_id
                        .first
       assert_text newest_product.body
     end
   end
 
   test 'products order on unchecked tab' do
-    # id順で並べたときの最初と最後の提出物を、提出日順で見たときに最新と最古になるように入れ替える
-    Product.update_all(created_at: 1.day.ago, published_at: 1.day.ago) # rubocop:disable Rails/SkipsModelValidations
-    # 最古の提出物を画面上で判定するため、提出物を1ページ内に収める
-    Product.unchecked.not_wip.limit(Product.count - Product.default_per_page).delete_all
-    newest_product = Product.unchecked.not_wip.reorder(:id).first
-    newest_product.update(published_at: Time.current)
-    oldest_product = Product.unchecked.not_wip.reorder(:id).last
-    oldest_product.update(published_at: 2.days.ago)
+    oldest_product = products(:product14)
+    newest_product = products(:product26)
 
+    # 提出日の昇順で並んでいることを検証する
     visit_with_auth '/products/unchecked', 'komagata'
+    assert_equal 'OS X Mountain Lionをクリーンインストールする', oldest_product.practice.title
 
-    # 提出日の降順で並んでいることを検証する
-    titles = all('.thread-list-item-title__title').map { |t| t.text.gsub('★', '') }
-    names = all('.thread-list-item-meta .a-user-name').map(&:text)
-    assert_equal "#{newest_product.practice.title}の提出物", titles.first
-    assert_equal newest_product.user.login_name, names.first
-    assert_equal "#{oldest_product.practice.title}の提出物", titles.last
-    assert_equal oldest_product.user.login_name, names.last
+    visit_with_auth '/products/unchecked?page=2', 'komagata'
+    assert_equal 'sshdでパスワード認証を禁止にする', newest_product.practice.title
   end
 
   test 'not display products in listing unchecked if unchecked products all checked' do
@@ -89,15 +80,7 @@ class Product::UncheckedTest < ApplicationSystemTestCase
   end
 
   test 'display no-replied products if click on no-replied-button' do
-    checker = users(:komagata)
-    practice = practices(:practice47)
-    user = users(:kimura)
-    product = Product.create!(
-      body: 'test',
-      user: user,
-      practice: practice,
-      checker_id: checker.id
-    )
+    product = products(:product8)
     visit_with_auth "/products/#{product.id}", 'kimura'
     fill_in('new_comment[description]', with: 'test')
     click_button 'コメントする'