Validate applications before saving

Author: jlledom

lib/3scale/backend/application.rb

@@ -164,7 +164,7 @@ def with_app_id_from_params(service_id, app_id, user_key)
       end
 
       def save
-        raise ApplicationHasNoState.new(id) if !state
+        validate_attributes
 
         storage.pipelined do |pipeline|
           persist_attributes(pipeline)
@@ -319,6 +319,12 @@ def has_referrer_filters?
 
       private
 
+      def validate_attributes
+        raise ApplicationHasNoID.new unless id
+        raise ApplicationHasNoState.new(id) unless state
+        raise ApplicationStateInvalid.new(id, state) unless [:live, :active, :pending, :suspended].include?(state.to_sym)
+      end
+
       def persist_attributes(client)
         client.set(storage_key(:state), state.to_s) if state
         client.set(storage_key(:plan_id), plan_id) if plan_id

lib/3scale/backend/errors.rb

@@ -297,9 +297,21 @@ def initialize
       end
     end
 
+    class ApplicationHasNoID < BadRequest
+      def initialize
+        super %(Application has no id)
+      end
+    end
+
     class ApplicationHasNoState < BadRequest
       def initialize(id)
-        super %(Application with id="#{id}" has no state )
+        super %(Application with id="#{id}" has no state)
+      end
+    end
+
+    class ApplicationStateInvalid < BadRequest
+      def initialize(id, state)
+        super %(Application with id="#{id}" has an invalid state "#{state}")
       end
     end