Fail less bafflingly

Fail in a less baffling way if the raw email is associated with an
incoming message or an info request that has not yet been saved to
the database.

1 files changed, 9 insertions, 1 deletions

diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index e15f499e9..3bb794684 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -21,6 +21,10 @@ class RawEmail < ActiveRecord::Base
 
     def directory
         request_id = self.incoming_message.info_request.id.to_s
+        if request_id.empty?
+            raise "Failed to find the id number of the associated request: has it been saved?"
+        end
+        
         if ENV["RAILS_ENV"] == "test"
             return File.join(Rails.root, 'files/raw_email_test')
         else
@@ -31,7 +35,11 @@ class RawEmail < ActiveRecord::Base
     end
 
     def filepath
-        File.join(self.directory, self.incoming_message.id.to_s)
+        incoming_message_id = self.incoming_message.id.to_s
+        if incoming_message_id.empty?
+            raise "Failed to find the id number of the associated incoming message: has it been saved?"
+        end
+        File.join(self.directory, incoming_message_id)
     end
 
     def data=(d)