Merge pull request #325 from mekanix/feature/cluster-service

Check if ID is valid
one-love · Jul 22, 2016 · a0f132d · a0f132d
2 parents 5868db6 + 877af4e
commit a0f132d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/onelove/api/cluster_services.py b/onelove/api/cluster_services.py
@@ -1,4 +1,5 @@
 from flask_restplus import abort
+from mongoengine.errors import ValidationError
 
 from ..models import Service
 from .fields.cluster_service import post_fields
@@ -45,6 +46,8 @@ def post(self, cluster_id):
             service = Service.objects.get(id=service_id)
         except Service.DoesNotExist:
             abort(404, 'No such service')
+        except ValidationError as e:
+            abort(409, e.message)
 
         cluster.services.append(service)
         cluster.save()

diff --git a/onelove/api/service.py b/onelove/api/service.py
@@ -55,8 +55,6 @@ def get(self, id):
         service = self._find_service(id)
         return service
 
-    @ns_service.expect(fields)
-    @ns_service.marshal_with(get_fields)
     @ns_service.expect(fields)
     @ns_service.marshal_with(get_fields)
     def patch(self, id):