smol bug fix

jaspermayone · Aug 4, 2024 · 2db6d5c · 2db6d5c
1 parent bf89316
commit 2db6d5c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/app/controllers/loaners_controller.rb b/app/controllers/loaners_controller.rb
@@ -43,6 +43,7 @@ def show
     # Measure the time taken to find and display the loaner
     StatsD.measure('loaner.show_request') do
       @loaner
+      @loans = @loaner.loans.order(loaned_at: :desc)
     end
   end
 

diff --git a/app/models/loan.rb b/app/models/loan.rb
@@ -89,6 +89,15 @@ def extend
         end
       end
     end
+
+    event :return do
+      transitions from: :out, to: :returned
+
+      after do
+        StatsD.increment("loan.returned")
+        self.update(returned_at: Time.now)
+      end
+    end
   end
 
   def log_status_change

diff --git a/app/models/loaner.rb b/app/models/loaner.rb
@@ -92,8 +92,8 @@ def chrome_enable
 
       after do
         StatsD.increment("loaner.returned")
-        self.loan.returned_at = Time.now
-        self.loan.save!
+
+        self.current_loan.return!
       end
     end
 

diff --git a/app/views/loaners/show.html.erb b/app/views/loaners/show.html.erb
@@ -72,7 +72,7 @@
           </tr>
         </thead>
         <tbody>
-          <% @loaner.loans.each do |loan| %>
+          <% @loans.each do |loan| %>
             <tr>
               <td><%= loan.reason.humanize %></td>
               <td><%= loan.borrower.first_name %> <%= loan.borrower.last_name %></td>