Add last service date and mileage methods to Vehicle model and update views

app/models/vehicle.rb

@@ -33,6 +33,23 @@ class Vehicle < ApplicationRecord
     issues.includes(:invoices).flat_map(&:invoices).uniq.compact
   end
 
+  def last_service
+    return issues
+      .joins(:custom_values)
+      .where(custom_values: { custom_field_id: CustomField.find_by(name: "Mileage")&.id })
+      .where.not(custom_values: { value: ['', nil] })
+      .order(created_on: :desc)
+      .first
+  end
+
+  def last_service_date
+    return last_service.created_on&.to_date
+  end
+
+  def last_service_mileage
+    return last_service&.custom_values&.find_by(custom_field_id: CustomField.find_by(name: "Mileage")&.id)&.value.presence
+  end
+
   def make=(val)
     super(val.to_s.strip)
   end

app/views/vehicles/_details.html.erb

@@ -49,16 +49,15 @@
   </div>
 </div>
 
-<% last = vehicle.issues.last %>
+<% 
-<% if last %>
+  mileage = vehicle.last_service_mileage
-  <% mileage = last.custom_values.find_by(custom_field_id: CustomField.find_by_name("Mileage").id) %>
+%>
-  <% if mileage %>
+
+<% if mileage %>
   <p>
-      <b><%=t(:label_last_service) %></b> <%= last&.closed_on&.to_date || l(:label_unknown) %>
+    <b><%= t(:label_last_service) %></b> <%= vehicle.last_service_date %>
-      at <%= mileage.value %>
+    at <%= mileage %> <%= t(:label_miles) %>
-      <%=t(:label_miles) %>
   </p>
-  <% end %>
 <% end %>
 
 <div style="float: right;">

app/views/vehicles/_list.html.erb

@@ -21,10 +21,22 @@
           <% if show_customer %>
             <%= vehicle.customer %>
           <% end %>
-        </div>
+
+           <% 
+            mileage = vehicle.last_service_mileage
+          %>
+
+          <% if mileage %>
+            <br/>
+            <b><%= t(:label_last_service) %></b> <%= vehicle.last_service_date %>
+            at <%= mileage %> <%= t(:label_miles) %>
+          <% end %>
 
         </div>
         <br/>
+      
+      </div>
+
     </div>
   <% end %>