Merge branch 'fix' into 'master'

fix peut etre je sais pas trop

See merge request !9

controllers/resource_controller.py

@@ -5,7 +5,8 @@ from flask_restful import Api, Resource
 
 from consts.status import Status, response_offline
 from models.command import Command
-from utils.database_utils import get_resource, get_state, insert_command, update_state
+from utils.database_utils import (get_resource, get_state, insert_command,
+                                  update_state)
 from utils.http_utils import normalize_url, send_command_to_other_nodes
 
 resource_controller = Blueprint('resource_controller', __name__)
@@ -19,7 +20,7 @@ class ResourceResource(Resource):
 
         resource = get_resource(id)
         if resource:
-            return jsonify(resource)
+            return jsonify(resource.to_simple_dict())
         else:
             return {"message": "Resource not found"}, 404
 

controllers/resources_controller.py

@@ -5,8 +5,9 @@ from flask_restful import Api, Resource
 
 from consts.status import Status, response_offline
 from models.command import Command
-from utils.database_utils import get_resources, get_state, insert_command, insert_resource, update_state
 from models.resource import Resource as ResourceModel
+from utils.database_utils import (get_resources, get_state, insert_command,
+                                  insert_resource, update_state)
 from utils.http_utils import normalize_url, send_resource_to_other_nodes
 
 resources_controller = Blueprint('resources_controller', __name__)

utils/database_utils.py

@@ -67,7 +67,7 @@ def get_resources(with_commands: bool = False, page: int = 1, page_size=20) -> O
             if with_commands:
                 return [Resource.from_tuple(resource, commands=get_commands(resource[0])) for resource in resources]
 
-            return [Resource.from_tuple(resource, command_count=get_commands_count(resource[0])) for resource in resources]
+            return [Resource.from_tuple(resource, commands_count=get_commands_count(resource[0])) for resource in resources]
         except Exception as e:
             print(e, file=sys.stderr)
             return None