Inline method

4 files changed, 9 insertions, 19 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 23e01be54..3d9559c8b 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -877,7 +877,7 @@ class RequestController < ApplicationController
                               :email_subject => _("Log in to download a zip file of {{info_request_title}}",
                                            :info_request_title=>@info_request.title)
                               )
-                updated = Digest::SHA1.hexdigest(@info_request.get_last_event.created_at.to_i.to_s + @info_request.updated_at.to_i.to_s)
+                updated = Digest::SHA1.hexdigest(@info_request.info_request_events.last.created_at.to_i.to_s + @info_request.updated_at.to_i.to_s)
                 @url_path = File.join("/download",
                                        request_dirs(@info_request),
                                        updated,
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 98b45af85..f7391a60a 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -551,7 +551,7 @@ public
     def set_described_state(new_state, set_by = nil)
         ActiveRecord::Base.transaction do
             self.awaiting_description = false
-            last_event = self.get_last_event
+            last_event = self.info_request_events.last
             last_event.described_state = new_state
             self.described_state = new_state
             last_event.save!
@@ -789,16 +789,6 @@ public
         end
     end
 
-    # Returns last event
-    def get_last_event
-        events = self.info_request_events
-        if events.size == 0
-            return nil
-        else
-            return events[-1]
-        end
-    end
-
     # Get previous email sent to
     def get_previous_email_sent_to(info_request_event)
         last_email = nil
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml
index 48bd7f694..ea19f2635 100644
--- a/app/views/admin_general/index.rhtml
+++ b/app/views/admin_general/index.rhtml
@@ -40,7 +40,7 @@
     <% for @request in @error_message_requests %>
         <li>
             <%= request_both_links(@request)%>
-            &ndash; <%=simple_date(@request.get_last_event.created_at)%>
+            &ndash; <%=simple_date(@request.info_request_events.last.created_at)%>
         </li>
     <% end %>
     </ul>
@@ -53,7 +53,7 @@
     <% for @request in @attention_requests %>
         <li>
             <%= request_both_links(@request)%>
-            &ndash; <%=simple_date(@request.get_last_event.created_at)%>
+            &ndash; <%=simple_date(@request.info_request_events.last.created_at)%>
         </li>
     <% end %>
     </ul>
@@ -67,7 +67,7 @@
     <% for @request in @requires_admin_requests %>
         <li>
             <%= request_both_links(@request)%>
-            &ndash; <%=simple_date(@request.get_last_event.created_at)%>
+            &ndash; <%=simple_date(@request.info_request_events.last.created_at)%>
         </li>
     <% end %>
     </ul>
diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb
index 000a0c12e..39f554323 100644
--- a/spec/models/request_mailer_spec.rb
+++ b/spec/models/request_mailer_spec.rb
@@ -28,7 +28,7 @@ describe RequestMailer, " when receiving incoming mail" do
         receive_incoming_mail('incoming-request-plain.email', 'dummy@localhost')
         ir.incoming_messages.size.should == 1
         InfoRequest.holding_pen_request.incoming_messages.size.should == 1
-        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event
+        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.info_request_events.last
         last_event.params[:rejected_reason].should == "Could not identify the request from the email address"
 
         deliveries = ActionMailer::Base.deliveries
@@ -48,7 +48,7 @@ describe RequestMailer, " when receiving incoming mail" do
         receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "")
         ir.incoming_messages.size.should == 1
         InfoRequest.holding_pen_request.incoming_messages.size.should == 1
-        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event
+        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.info_request_events.last
         last_event.params[:rejected_reason].should =~ /there is no "From" address/
 
         deliveries = ActionMailer::Base.deliveries
@@ -68,7 +68,7 @@ describe RequestMailer, " when receiving incoming mail" do
         receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "frob@nowhere.com")
         ir.incoming_messages.size.should == 1
         InfoRequest.holding_pen_request.incoming_messages.size.should == 1
-        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event
+        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.info_request_events.last
         last_event.params[:rejected_reason].should =~ /Only the authority can reply/
 
         deliveries = ActionMailer::Base.deliveries
@@ -153,7 +153,7 @@ describe RequestMailer, " when receiving incoming mail" do
         receive_incoming_mail('incoming-request-plain.email', ir.incoming_email)
         ir.incoming_messages.size.should == 1
         InfoRequest.holding_pen_request.incoming_messages.size.should == 1 # arrives in holding pen
-        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event
+        last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.info_request_events.last
         last_event.params[:rejected_reason].should =~ /allow new responses from nobody/
 
         # should be a message to admin regarding holding pen