minor change

Author: zeffman

app/controllers/reservations_controller.rb

@@ -3,7 +3,6 @@
 class ReservationsController < ApplicationController
   load_and_authorize_resource
 
-  
   before_action :set_user, only: [:current, :checkout]
 
   private
@@ -210,7 +209,7 @@ def update # rubocop:disable all
         end
 
         # update the item history / histories
-        old_item.make_switch_notes(reservation, r, current_user) if old_item
+        old_item&.make_switch_notes(reservation, r, current_user)
 
         new_item.make_switch_notes(r, reservation, current_user)
       end

lib/checkout_helper.rb

@@ -9,6 +9,15 @@ def self.checkout_reservation(r, reservations)
                                             new_notes, r.checked_out)
   end
 
+  def self.checkin_reservation(r, reservations)
+    r.save!
+    # update equipment item notes
+    new_notes = reservations[r.id.to_s][:notes]
+    r.equipment_item.make_reservation_notes('checked in', r,
+                                            r.checkin_handler, new_notes,
+                                            r.checked_in)
+  end
+
   def self.reservation_for(r_id, r_attrs, user)
     return if r_attrs[:equipment_item_id].blank?
     r = Reservation.includes(:reserver).find(r_id)
@@ -43,15 +52,6 @@ def self.update_tos(user)
     user.update_attributes(terms_of_service_accepted: true)
   end
 
-  def self.checkin_reservation(r, reservations)
-    r.save!
-    # update equipment item notes
-    new_notes = reservations[r.id.to_s][:notes]
-    r.equipment_item.make_reservation_notes('checked in', r,
-                                            r.checkin_handler, new_notes,
-                                            r.checked_in)
-  end
-
   def self.preproccess_checkins(reservations, user)
     checked_in_reservations = []
     reservations.each do |r_id, r_attrs|