[PATCH aeolus-conductor] BZ#754956 Return appropriate error code when parent not found

[Martyn Taylor]

From: Martyn Taylor

---
 src/app/controllers/api/builds_controller.rb       |    8 ++++++--
 .../controllers/api/provider_images_controller.rb  |    8 ++++----
 .../controllers/api/target_images_controller.rb    |    8 ++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/controllers/api/builds_controller.rb b/src/app/controllers/api/builds_controller.rb
index 90360dd..fdccf27 100644
--- a/src/app/controllers/api/builds_controller.rb
+++ b/src/app/controllers/api/builds_controller.rb
@@ -27,8 +27,12 @@ module Api
     layout :false

def index
-      if params[:image_id]
-        @builds = Aeolus::Image::Warehouse::Image.find(params[:image_id]).image_builds
+      if id = params[:image_id]
+        if image = Aeolus::Image::Warehouse::Image.find(id)
+          @builds = image.image_builds
+        else
+          raise(Aeolus::Conductor::API::ImageNotFound.new(500, t("api.error_messages.image_not_found", :image => params[:image_id])))
+        end
       else
         @builds = Aeolus::Image::Warehouse::ImageBuild.all
       end
diff --git a/src/app/controllers/api/provider_images_controller.rb b/src/app/controllers/api/provider_images_controller.rb
index 4c6e288..a448123 100644
--- a/src/app/controllers/api/provider_images_controller.rb
+++ b/src/app/controllers/api/provider_images_controller.rb
@@ -27,11 +27,11 @@ module Api
     layout :false

def index
-      if params[:target_image_id]
-        if @target_image = Aeolus::Image::Warehouse::TargetImage.find(params[:target_image_id])
-          @images = @target_image.provider_images
+      if id = params[:target_image_id]
+        if target_image = Aeolus::Image::Warehouse::TargetImage.find(params[:target_image_id])
+          @images = target_image.provider_images
         else
-          raise(Aeolus::Conductor::API::TargetImageNotFound.new(404, t("api.target_image_not_found")))
+          raise(Aeolus::Conductor::API::TargetImageNotFound.new(500, t("api.error_messages.target_image_not_found", :targetimage => id)))
         end
       else
         @images = Aeolus::Image::Warehouse::ProviderImage.all
diff --git a/src/app/controllers/api/target_images_controller.rb b/src/app/controllers/api/target_images_controller.rb
index 5fa8ac6..5a365a9 100644
--- a/src/app/controllers/api/target_images_controller.rb
+++ b/src/app/controllers/api/target_images_controller.rb
@@ -27,8 +27,12 @@ module Api
     layout :false

def index
-      if params[:build_id]
-        @images = Aeolus::Image::Warehouse::ImageBuild.find(params[:build_id]).target_images
+      if id = params[:build_id]
+        if build = Aeolus::Image::Warehouse::ImageBuild.find(params[:build_id])
+          @images = build.target_images
+        else
+          raise(Aeolus::Conductor::API::BuildNotFound.new(500, t("api.error_messages.build_not_found", :build => id)))
+        end
       else
         @images = Aeolus::Image::Warehouse::TargetImage.all
       end