Merge pull request #312 from uclibs/bug-263-citations-page-crashing-a…

…fter-college-deletion

263 - Modify College.find(:id) calls to account for destroyed colleges

app/controllers/colleges_controller.rb

@@ -68,7 +68,7 @@ def destroy
 
   # Use callbacks to share common setup or constraints between actions.
   def set_college
-    @college = College.find(params[:id])
+    @college = College.find_by(id: params[:id])
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.

app/helpers/colleges_helper.rb

@@ -22,11 +22,7 @@ def check_other_college(publication)
   end
 
   def college_name(id)
-    if id.nil?
-      ''
-    else
-      College.find(id).name
-    end
+    College.name_for(id)
   end
 
   def college_array(publication)

app/models/college.rb

@@ -4,4 +4,11 @@ class College < ApplicationRecord
   has_and_belongs_to_many :books, dependent: :destroy
   has_and_belongs_to_many :other_publications, dependent: :destroy
   validates :name, presence: true
+
+  def self.name_for(id)
+    return '' if id.nil?
+
+    college = College.find_by(id:)
+    college&.name.to_s
+  end
 end

app/models/csv.rb

@@ -20,11 +20,7 @@ def author_name(position)
   end
 
   def college_name(id)
-    if id.nil?
-      ''
-    else
-      College.find(id).name
-    end
+    College.name_for(id)
   end
 
   def colleges