5428 address MR comments by adding issued_at ordering in the view instead of the model, fix up automated tests

Author: janeewheatley

app/models/vendor.rb

@@ -23,7 +23,7 @@ class Vendor < ApplicationRecord
   include Geocodable
   include Filterable
 
-  has_many :purchases, -> { order(issued_at: :desc) }, inverse_of: :vendor, dependent: :destroy
+  has_many :purchases, inverse_of: :vendor, dependent: :destroy
 
   validates :business_name, presence: true
 

app/views/vendors/show.html.erb

@@ -74,9 +74,9 @@
               </tr>
               </thead>
               <tbody>
-              <% @vendor.purchases.each do |purchase| %>
+              <% @vendor.purchases.order(issued_at: :desc).each do |purchase| %>
                 <tr>
-                  <td data-testid="purchase-date"><%= purchase.issued_at.strftime("%m/%d/%Y") %></td>
+                  <td><%= purchase.issued_at.strftime("%m/%d/%Y") %></td>
                   <td><%= purchase.line_items.total %></td>
                   <td><%= view_button_to purchase, { text: "View purchase details" } %></td>
                 </tr>

spec/models/vendor_spec.rb

@@ -56,22 +56,6 @@
     end
   end
 
-  context "Associations" do
-    describe "purchases" do
-      it "orders purchases by issued_at in descending order (newest first)" do
-        vendor = create(:vendor)
-
-        # Create purchases with different issued_at dates
-        old_purchase = create(:purchase, vendor: vendor, issued_at: 1.week.ago)
-        new_purchase = create(:purchase, vendor: vendor, issued_at: 1.day.ago)
-        middle_purchase = create(:purchase, vendor: vendor, issued_at: 3.days.ago)
-
-        # Verify they're ordered newest first
-        expect(vendor.purchases.to_a).to eq([new_purchase, middle_purchase, old_purchase])
-      end
-    end
-  end
-
   describe "versioning" do
     it { is_expected.to be_versioned }
   end

spec/requests/vendors_requests_spec.rb

@@ -123,6 +123,20 @@
         get vendor_path(id: create(:vendor, organization: organization))
         expect(response).to be_successful
       end
+
+      it "displays purchases in reverse chronological order by issued_at date" do
+        vendor = create(:vendor, organization: organization)
+
+        # Create purchases with different issued_at dates
+        old_purchase = create(:purchase, vendor: vendor, issued_at: 1.week.ago, organization: organization)
+        new_purchase = create(:purchase, vendor: vendor, issued_at: 1.day.ago, organization: organization)
+        middle_purchase = create(:purchase, vendor: vendor, issued_at: 3.days.ago, organization: organization)
+
+        get vendor_path(vendor)
+
+        expect(vendor.reload.purchases.order(issued_at: :desc).to_a).to eq([new_purchase, middle_purchase, old_purchase])
+        expect(response).to be_successful
+      end
     end
 
     describe "DELETE #destroy" do

spec/system/vendor_system_spec.rb

@@ -130,23 +130,5 @@
       expect(page).to have_xpath("//table/tbody/tr", count: 3)
       expect(page).to have_xpath("//table/tbody/tr/td", text: "10")
     end
-
-    it "displays purchases in reverse chronological order by issued_at date" do
-      # Create purchases with specific issued_at dates
-      create(:purchase, vendor: @vendor, issued_at: 1.week.ago)
-      create(:purchase, vendor: @vendor, issued_at: 1.day.ago)
-      create(:purchase, vendor: @vendor, issued_at: 3.days.ago)
-
-      visit vendor_path(@vendor)
-
-      # Get all date text using the correct data attribute
-      dates = page.all("[data-testid='purchase-date']").map(&:text)
-
-      # Get all purchases for this vendor and sort them by issued_at desc
-      all_purchases = @vendor.reload.purchases.order(issued_at: :desc)
-      expected_dates = all_purchases.map { |p| p.issued_at.strftime("%m/%d/%Y") }
-
-      expect(dates).to eq(expected_dates)
-    end
   end
 end