Merge pull request #14 from gnosischain/fix/db

DB: fix issues with /info enpoint and missing DB data.

api/api/manage.py

@@ -40,11 +40,17 @@ def create_enabled_token_cmd(name, chain_id, address, max_amount_day, type):
         current_app.config['FAUCET_PRIVATE_KEY']
     )
 
+    # check if Token already exists
+    check_token = Token.get_by_address(w3.to_checksum_address(address))
+
+    if check_token:
+        raise Exception('Token %s already exists' % address)
+
     # Checks
-    if type.lower() != 'native' or type.lower() != 'erc20':
-        raise Exception('Type must be any of (erc20, native)')
+    if type.lower() not in ('native', 'erc20'):
+        raise Exception('Type must be any of (erc20, native) got %s' % type)
     if float(max_amount_day) <= 0:
-        raise Exception('Max amount per day must be greater than 0')
+        raise Exception('Max amount per day must be greater than 0, got %d' % float(max_amount_day))
 
     token = Token()
     token.name = name

api/api/routes.py

@@ -23,7 +23,8 @@ def info():
         {
             'address': t.address,
             'name': t.name,
-            'maximumAmount': t.max_amount_day
+            'maximumAmount': t.max_amount_day,
+            'type': t.type
         } for t in enabled_tokens
     ]
     return jsonify(

api/api/services/database.py

@@ -79,9 +79,11 @@ class Token(BaseModel):
 
     @classmethod
     def enabled_tokens(cls):
-        return cls.query.with_entities(cls.name,
-                                       cls.address,
-                                       cls.chain_id).filter_by(enabled=True).all()
+        return cls.query.filter_by(enabled=True).all()
+
+    @classmethod
+    def get_by_address(cls, address):
+        return cls.query.filter_by(address=address).first()
 
 
 class AccessKey(BaseModel):

api/tests/test_api.py

@@ -21,6 +21,10 @@ def test_status_route(self, client):
         assert response.status_code == 200
         assert response.get_json().get('status') == 'ok'
 
+    def test_info_route(self, client):
+        response = client.get(api_prefix + '/info')
+        assert response.status_code == 200
+
     def test_ask_route_parameters(self, client):
         response = client.post(api_prefix + '/ask', json={})
         assert response.status_code == 400