fix device date constraint #11

PnEcrins · Jun 8, 2020 · 48dffbc · 48dffbc
1 parent 275cd1e
commit 48dffbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/api/animals/__init__.py b/api/animals/__init__.py
@@ -144,12 +144,13 @@ def animals_validate_required(animal):
         name = animal.get('name').lower()
         name = name.strip()
         animal_exist = Animal.query.filter(Animal.name == name).first()
-        if (animal_exist and (animal_exist.json().get('id') != animal.get('id'))):
+        if (animal_exist and (animal_exist.json().get('id_animal') != animal.get('id'))):
             errors.append({
                 'name': 'attribute_already_exists',
                 'table': 'animals',
                 'column': 'name'
             })
+            print ('animal_exist', animal_exist)
     if len(errors) >= 0:
         return {'errors': errors}
     return True
@@ -160,9 +161,11 @@ def animals_validate_required(animal):
 def check_devices_available(id=id):
     try:
         id_device = int(request.args.get('deviceId'))
-        id_animal = int(request.args.get('animalId'))
     except Exception:
-        return jsonify(error='Invalid JSON.')
+        return jsonify(error='Invalid JSON.'),400
+    id_animal = request.args.get('animalId')
+    if id_animal:
+        id_animal = int(id_animal)
     try:
         now = datetime.now()
         device_exist = AnimalDevice.query.filter(

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -91,4 +91,4 @@ Mode developpement
 ::
 
     source venv/bin/activate
-    FLASK_APP=./appy FLASK_DEBUG=1 flask run
+    FLASK_APP=./app FLASK_DEBUG=1 flask run