From d6f5368474240a394a5c952769480cad69093a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 20 Sep 2014 15:12:56 +0200
Subject: [PATCH] Handle already deleted photos gracefully in process photo job

---
 app/workers/process_photo.rb       | 1 +
 spec/workers/process_photo_spec.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/workers/process_photo.rb b/app/workers/process_photo.rb
index 00d959962..2fcdd3943 100644
--- a/app/workers/process_photo.rb
+++ b/app/workers/process_photo.rb
@@ -16,6 +16,7 @@ module Workers
       photo.processed_image.store!(unprocessed_image)
 
       photo.save!
+    rescue ActiveRecord::RecordNotFound # Deleted before the job was run
     end
   end
 end
diff --git a/spec/workers/process_photo_spec.rb b/spec/workers/process_photo_spec.rb
index 8294902ca..8e28fba74 100644
--- a/spec/workers/process_photo_spec.rb
+++ b/spec/workers/process_photo_spec.rb
@@ -61,6 +61,12 @@ describe Workers::ProcessPhoto do
     expect{
       result = Workers::ProcessPhoto.new.perform(p.id)
     }.to_not raise_error
-    
+
+  end
+
+  it 'handles already deleted photos gracefully' do
+    expect {
+      Workers::ProcessPhoto.new.perform(0)
+    }.to_not raise_error
   end
 end