diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 57a1a422f..8447dcbc4 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -17,7 +17,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.21 2008-01-02 18:16:39 francis Exp $ +# $Id: info_request.rb,v 1.22 2008-01-02 20:13:01 francis Exp $ require 'digest/sha1' @@ -92,7 +92,9 @@ class InfoRequest < ActiveRecord::Base overdue = false # XXX if a second outgoing message is really a new request, then this # is no good - earliest_sent = self.outgoing_messages.map { |om| om.sent_at }.min + # We use the last_sent_at date for each outgoing message, as fair + # enough if the first email bounced or something and it got recent. + earliest_sent = self.outgoing_messages.map { |om| om.last_sent_at }.min time_left = Time.now - earliest_sent # XXX use working days if time_left > 20.days diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 823557e6b..7cf92a4db 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -20,7 +20,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: outgoing_message.rb,v 1.16 2008-01-02 16:04:53 francis Exp $ +# $Id: outgoing_message.rb,v 1.17 2008-01-02 20:13:01 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request @@ -55,7 +55,7 @@ class OutgoingMessage < ActiveRecord::Base if self.message_type == 'initial_request' if self.status == 'ready' RequestMailer.deliver_initial_request(self.info_request, self) - self.sent_at = Time.now + self.last_sent_at = Time.now self.status = 'sent' self.save! self.info_request.log_event(log_event_type, { :email => self.info_request.recipient_email, :outgoing_message_id => self.id }) |