Merge pull request #159 from bdunne/more_pictures_edge_cases

Handle cases where a Picture with that id doesn't exist
(cherry picked from commit 40c5ced)

https://bugzilla.redhat.com/show_bug.cgi?id=1536046

db/migrate/20180111162442_move_pictures_blobs_to_pictures.rb

@@ -18,7 +18,7 @@ def up
 
     say_with_time("Moving picture content from BinaryBlobs to the pictures table") do
       BinaryBlob.in_my_region.includes(:binary_blob_parts).where(:resource_type => "Picture").find_each do |blob|
-        Picture.update(blob.resource_id, :content => blob.data, :extension => blob.data_type, :md5 => blob.md5) if blob.resource_id
+        Picture.where(:id => blob.resource_id).update_all(:content => blob.data, :extension => blob.data_type, :md5 => blob.md5) if blob.resource_id
         blob.destroy
       end
     end

spec/migrations/20180111162442_move_pictures_blobs_to_pictures_spec.rb

@@ -6,8 +6,32 @@
   let(:picture_stub)          { migration_stub :Picture }
 
   migration_context :up do
-    it 'Destroys picture blobs without a picture' do
+    it 'Destroys picture blobs with an invalid picture id' do
+      picture = picture_stub.create!
       blob    = binary_blob_stub.create!(
+        :data_type     => "png",
+        :md5           => "ce114e4501d2f4e2dcea3e17b546f339",
+        :part_size     => 1.megabyte,
+        :resource_id   => picture.id + 42,
+        :resource_type => "Picture",
+        :size          => 14,
+      )
+      binary_blob_part_stub.create!(
+        :binary_blob_id => blob.id,
+        :data           => "This is a test",
+        :md5            => "ce114e4501d2f4e2dcea3e17b546f339",
+        :size           => 14,
+      )
+
+      migrate
+
+      expect(picture_stub.count).to eq(1)
+      expect(binary_blob_stub.count).to eq(0)
+      expect(binary_blob_part_stub.count).to eq(0)
+    end
+
+    it 'Destroys picture blobs with a nil picture id' do
+      blob = binary_blob_stub.create!(
         :data_type     => "png",
         :md5           => "ce114e4501d2f4e2dcea3e17b546f339",
         :part_size     => 1.megabyte,