Various fixes

zou/app/blueprints/breakdown/resources.py

@@ -372,7 +372,7 @@ def get(self, scene_id):
         return breakdown_service.get_camera_instances_for_scene(scene_id)
 
 
-class ProjectEntityLinksResource(Resource):
+class ProjectEntityLinksResource(Resource, ArgsMixin):
     @jwt_required()
     def get(self, project_id):
         """
@@ -394,7 +394,11 @@ def get(self, project_id):
         """
         user_service.check_manager_project_access(project_id)
         projects_service.get_project(project_id)
-        return entities_service.get_entity_links_for_project(project_id)
+        page = self.get_page()
+        limit = self.get_limit()
+        return entities_service.get_entity_links_for_project(
+            project_id, page, limit
+        )
 
 
 class ProjectEntityLinkResource(Resource):

zou/app/blueprints/crud/project.py

@@ -1,4 +1,5 @@
 from flask_jwt_extended import jwt_required
+
 from flask_restful import Resource
 
 
@@ -96,7 +97,10 @@ def __init__(self):
         self.protected_fields.append("team")
 
     def check_read_permissions(self, project):
-        user_service.check_project_access(project["id"])
+        return user_service.check_project_access(project["id"])
+
+    def check_update_permissions(self, project, data):
+        return user_service.check_manager_project_access(project["id"])
 
     def pre_update(self, project_dict, data):
         if "team" in data:

zou/app/mixin.py

@@ -67,11 +67,18 @@ def clear_empty_fields(self, data):
 
     def get_page(self):
         """
-        Returns page requested by the user.
+        Returns page requested by the user as an integer.
         """
         options = request.args
         return int(options.get("page", "-1"))
 
+    def get_limit(self):
+        """
+        Returns limit requested by the user as an integer.
+        """
+        options = request.args
+        return int(options.get("limit", "-1"))
+
     def get_sort_by(self):
         """
         Returns sort by option value
@@ -115,14 +122,23 @@ def get_no_job(self):
         return self.get_bool_parameter("no_job")
 
     def get_text_parameter(self, field_name):
+        """
+        Returns text parameter value matching `field_name`.
+        """
         options = request.args
         return options.get(field_name, None)
 
     def get_bool_parameter(self, field_name, default="false"):
+        """
+        Returns bool parameter value matching `field_name`.
+        """
         options = request.args
         return options.get(field_name, default).lower() == "true"
 
     def get_date_parameter(self, field_name):
+        """
+        Returns date parameter value matching `field_name`.
+        """
         self.parse_date_parameter(self.get_text_parameter(field_name))
 
     def parse_date_parameter(self, param):

zou/app/services/entities_service.py

@@ -3,7 +3,7 @@
     projects_service,
     notifications_service,
 )
-from zou.app.utils import cache, events, fields
+from zou.app.utils import cache, events, fields, query as query_utils
 
 from zou.app.models.entity import Entity, EntityLink
 from zou.app.models.entity_type import EntityType
@@ -152,15 +152,33 @@ def get_entities_for_project(
     return Entity.serialize_list(result, obj_type=obj_type)
 
 
-def get_entity_links_for_project(project_id):
+def get_entity_links_for_project(project_id, page=None, limit=None):
     """
     Retrieve entity links for
     """
     query = EntityLink.query.join(
         Entity, EntityLink.entity_in_id == Entity.id
     ).filter(Entity.project_id == project_id)
-    result = query.all()
-    return Entity.serialize_list(result)
+
+    results = []
+    if page is not None and page > 0:
+        if limit < 1:
+            limit = None
+        results = query_utils.get_paginated_result(query, page, limit=limit)
+    else:
+        for entity_link in query.all():
+            results.append(
+                {
+                    "id": entity_link.id,
+                    "entity_in_id": entity_link.entity_in_id,
+                    "entity_out_id": entity_link.entity_out_id,
+                    "nb_occurences": entity_link.nb_occurences,
+                    "label": entity_link.label,
+                    "data": entity_link.data,
+                    "type": "EntityLink",
+                }
+            )
+    return results
 
 
 def get_entities_and_tasks(criterions={}):

zou/app/utils/query.py

@@ -29,15 +29,15 @@ def apply_criterions_to_db_query(model, db_query, criterions):
     return db_query.filter_by(**criterions)
 
 
-def get_paginated_results(query, page, relations=False):
+def get_paginated_results(query, page, limit=None, relations=False):
     """
     Apply pagination to the query object.
     """
     if page < 1:
         entries = query.all()
         return fields.serialize_models(entries, relations=relations)
     else:
-        limit = app.config["NB_RECORDS_PER_PAGE"]
+        limit = limit or app.config["NB_RECORDS_PER_PAGE"]
         total = query.count()
         offset = (page - 1) * limit