1 files changed, 57 insertions, 11 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index c203f75c3..02faffcfa 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -50,6 +50,7 @@ class InfoRequest < ActiveRecord::Base
     has_many :info_request_events, :order => 'created_at'
     has_many :user_info_request_sent_alerts
     has_many :track_things, :order => 'created_at desc'
+    has_many :widget_votes
     has_many :comments, :order => 'created_at'
     has_many :censor_rules, :order => 'created_at desc'
     has_many :mail_server_logs, :order => 'mail_server_log_done_id'
@@ -783,7 +784,14 @@ public
     end
 
     def public_response_events
-        self.info_request_events.select{|e| e.response? && e.incoming_message.all_can_view? }
+        condition = <<-SQL
+        info_request_events.event_type = ?
+        AND incoming_messages.prominence = ?
+        SQL
+
+        info_request_events.
+          joins(:incoming_message).
+            where(condition, 'response', 'normal')
     end
 
     # The last public response is the default one people might want to reply to
@@ -810,8 +818,9 @@ public
 
     # Text from the the initial request, for use in summary display
     def initial_request_text
-        return '' if outgoing_messages.empty? # mainly for use with incomplete fixtures
-        outgoing_messages.first.get_text_for_indexing
+        return '' if outgoing_messages.empty?
+        body_opts = { :censor_rules => applicable_censor_rules }
+        outgoing_messages.first.try(:get_text_for_indexing, true, body_opts) or ''
     end
 
     # Returns index of last event which is described or nil if none described.
@@ -908,21 +917,24 @@ public
 
     # Completely delete this request and all objects depending on it
     def fully_destroy
-        self.track_things.each do |track_thing|
+        track_things.each do |track_thing|
             track_thing.track_things_sent_emails.each { |a| a.destroy }
             track_thing.destroy
         end
-        self.user_info_request_sent_alerts.each { |a| a.destroy }
-        self.info_request_events.each do |info_request_event|
+        user_info_request_sent_alerts.each { |a| a.destroy }
+        info_request_events.each do |info_request_event|
             info_request_event.track_things_sent_emails.each { |a| a.destroy }
             info_request_event.destroy
         end
-        self.mail_server_logs.each do |mail_server_log|
+        mail_server_logs.each do |mail_server_log|
             mail_server_log.destroy
         end
-        self.outgoing_messages.each { |a| a.destroy }
-        self.incoming_messages.each { |a| a.destroy }
-        self.destroy
+        outgoing_messages.each { |a| a.destroy }
+        incoming_messages.each { |a| a.destroy }
+        comments.each { |comment| comment.destroy }
+        censor_rules.each{ |censor_rule| censor_rule.destroy }
+
+        destroy
     end
 
     # Called by incoming_email - and used to be called to generate separate
@@ -1362,6 +1374,39 @@ public
                 order('last_event_time')
     end
 
+    def move_to_public_body(destination_public_body, opts = {})
+        old_body = public_body
+        editor = opts.fetch(:editor)
+
+        attrs = { :public_body => destination_public_body }
+
+        if destination_public_body
+          attrs.merge!({
+            :law_used => destination_public_body.law_only_short.downcase
+          })
+        end
+
+        if update_attributes(attrs)
+            log_event('move_request',
+                      :editor => editor,
+                      :public_body_url_name => public_body.url_name,
+                      :old_public_body_url_name => old_body.url_name)
+
+            reindex_request_events
+
+            public_body
+        end
+    end
+
+    # The DateTime of the last InfoRequestEvent belonging to the InfoRequest
+    # Only available if the last_event_time attribute has been set. This is
+    # currentlt only set through .find_in_state
+    #
+    # Returns a DateTime
+    def last_event_time
+        attributes['last_event_time'].try(:to_datetime)
+    end
+
     private
 
     def set_defaults
@@ -1373,8 +1418,9 @@ public
             # this should only happen on Model.exists?() call. It can be safely ignored.
             # See http://www.tatvartha.com/2011/03/activerecordmissingattributeerror-missing-attribute-a-bug-or-a-features/
         end
+
         # FOI or EIR?
-        if !self.public_body.nil? && self.public_body.eir_only?
+        if new_record? && public_body && public_body.eir_only?
             self.law_used = 'eir'
         end
     end