Add public criteria for message event access methods

get_last_response_event and get_last_outgoing_event are used in various
places to determine which events to link to, use in queries etc.
Restrict them to refer to the last publicly visible event of the
relevant type, and rename them to make that clear.

2 files changed, 10 insertions, 9 deletions

diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb
index 42b4bcbc1..c374ff90d 100644
--- a/spec/controllers/admin_request_controller_spec.rb
+++ b/spec/controllers/admin_request_controller_spec.rb
@@ -77,7 +77,7 @@ describe AdminRequestController, "when administering the holding pen" do
         ir.handle_rejected_responses = 'holding_pen'
         ir.save!
         receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "frob@nowhere.com")
-        get :show_raw_email, :id => InfoRequest.holding_pen_request.get_last_response.raw_email.id
+        get :show_raw_email, :id => InfoRequest.holding_pen_request.get_last_public_response.raw_email.id
         response.should contain "Only the authority can reply to this request"
     end
 
@@ -88,7 +88,8 @@ describe AdminRequestController, "when administering the holding pen" do
         ir.save!
         mail_to = "request-#{ir.id}-asdfg@example.com"
         receive_incoming_mail('incoming-request-plain.email', mail_to)
-        interesting_email = InfoRequest.holding_pen_request.get_last_response.raw_email.id
+        interesting_email = InfoRequest.holding_pen_request.get_last_public_response
+.raw_email.id
         # now we add another message to the queue, which we're not interested in
         receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "")
         InfoRequest.holding_pen_request.incoming_messages.length.should == 2
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index c5ee8cbf7..ec10d99d8 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -1596,7 +1596,7 @@ describe RequestController, "when classifying an information request" do
                 @dog_request.reload
                 @dog_request.awaiting_description.should == false
                 @dog_request.described_state.should == 'rejected'
-                @dog_request.get_last_response_event.should == info_request_events(:useless_incoming_message_event)
+                @dog_request.get_last_public_response_event.should == info_request_events(:useless_incoming_message_event)
                 @dog_request.info_request_events.last.event_type.should == "status_update"
                 @dog_request.info_request_events.last.calculated_state.should == 'rejected'
             end
@@ -1749,13 +1749,13 @@ describe RequestController, "when classifying an information request" do
 
                 it 'should redirect to the "response url" when there is a last response' do
                     incoming_message = mock_model(IncomingMessage)
-                    @dog_request.stub!(:get_last_response).and_return(incoming_message)
+                    @dog_request.stub!(:get_last_public_response).and_return(incoming_message)
                     expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response/#{incoming_message.id}")
                 end
 
                 it 'should redirect to the "response no followup url" when there are no events
                     needing description' do
-                    @dog_request.stub!(:get_last_response).and_return(nil)
+                    @dog_request.stub!(:get_last_public_response).and_return(nil)
                     expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response")
                 end
 
@@ -1794,7 +1794,7 @@ describe RequestController, "when classifying an information request" do
             context 'when status is updated to "gone postal"' do
 
                 it 'should redirect to the "respond to last url"' do
-                    expect_redirect('gone_postal', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}?gone_postal=1")
+                    expect_redirect('gone_postal', "request/#{@dog_request.id}/response/#{@dog_request.get_last_public_response.id}?gone_postal=1")
                 end
 
             end
@@ -1836,7 +1836,7 @@ describe RequestController, "when classifying an information request" do
             context 'when status is updated to "user_withdrawn"' do
 
                 it 'should redirect to the "respond to last url url" ' do
-                    expect_redirect('user_withdrawn', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}")
+                    expect_redirect('user_withdrawn', "request/#{@dog_request.id}/response/#{@dog_request.get_last_public_response.id}")
                 end
 
             end
@@ -1889,7 +1889,7 @@ describe RequestController, "when sending a followup message" do
         # fake that this is a clarification
         info_requests(:fancy_dog_request).set_described_state('waiting_clarification')
         info_requests(:fancy_dog_request).described_state.should == 'waiting_clarification'
-        info_requests(:fancy_dog_request).get_last_response_event.calculated_state.should == 'waiting_clarification'
+        info_requests(:fancy_dog_request).get_last_public_response_event.calculated_state.should == 'waiting_clarification'
 
         # make the followup
         session[:user_id] = users(:bob_smith_user).id
@@ -1907,7 +1907,7 @@ describe RequestController, "when sending a followup message" do
         # and that the status changed
         info_requests(:fancy_dog_request).reload
         info_requests(:fancy_dog_request).described_state.should == 'waiting_response'
-        info_requests(:fancy_dog_request).get_last_response_event.calculated_state.should == 'waiting_clarification'
+        info_requests(:fancy_dog_request).get_last_public_response_event.calculated_state.should == 'waiting_clarification'
     end
 
     it "should give an error if the same followup is submitted twice" do