[BUGFIX] Corrected queries in `gargantext_web/api.py`

gargantext_web/api.py

@@ -82,7 +82,7 @@ class NodesChildrenNgrams(APIView):
     def get(self, request, node_id):
         # query ngrams
         ParentNode = aliased(Node)
-        ngrams_query = (Ngram
+        ngrams_query = (session
             .query(Ngram.terms, func.count().label('count'))
             # .query(Ngram.id, Ngram.terms, func.count().label('count'))
             .join(Node_Ngram, Node_Ngram.ngram_id == Ngram.id)
@@ -128,7 +128,7 @@ class NodesChildrenDuplicates(APIView):
             raise APIException('Missing GET parameter: "keys"', 400)
         keys = request.GET['keys'].split(',')
         # metadata retrieval
-        metadata_query = (Metadata
+        metadata_query = (session
             .query(Metadata)
             .filter(Metadata.name.in_(keys))
         )
@@ -213,7 +213,7 @@ class NodesChildrenMetatadata(APIView):
         
         # query metadata keys
         ParentNode = aliased(Node)
-        metadata_query = (Metadata
+        metadata_query = (session
             .query(Metadata)
             .join(Node_Metadata, Node_Metadata.metadata_id == Metadata.id)
             .join(Node, Node.id == Node_Metadata.node_id)
@@ -233,7 +233,7 @@ class NodesChildrenMetatadata(APIView):
             values_to = None
             if metadata.type != 'text':
                 value_column = getattr(Node_Metadata, 'value_' + metadata.type)
-                node_metadata_query = (Node_Metadata
+                node_metadata_query = (session
                     .query(value_column)
                     .join(Node, Node.id == Node_Metadata.node_id)
                     .filter(Node.parent_id == node_id)
@@ -381,9 +381,9 @@ class NodesChildrenQueries(APIView):
         for field_name in fields_names:
             split_field_name = field_name.split('.')
             if split_field_name[0] == 'metadata':
-                metadata = Metadata.query(Metadata).filter(Metadata.name == split_field_name[1]).first()
+                metadata = session.query(Metadata).filter(Metadata.name == split_field_name[1]).first()
                 if metadata is None:
-                    metadata_query = Metadata.query(Metadata.name).order_by(Metadata.name)
+                    metadata_query = session.query(Metadata.name).order_by(Metadata.name)
                     metadata_names = [metadata.name for metadata in metadata_query.all()]
                     raise APIException('Invalid key for "%s" in parameter "field", should be one of the following values: "%s". "%s" was found instead' % (field[0], '", "'.join(metadata_names), field[1]), 400)
                 # check or create Node_Metadata alias; join if necessary
@@ -422,7 +422,7 @@ class NodesChildrenQueries(APIView):
             )
 
         # starting the query!
-        document_type_id = NodeType.query(NodeType.id).filter(NodeType.name == 'Document').scalar()
+        document_type_id = session.query(NodeType.id).filter(NodeType.name == 'Document').scalar()
         query = (session
             .query(*fields_list)
             .select_from(Node)
@@ -451,9 +451,9 @@ class NodesChildrenQueries(APIView):
             # 
             if field[0] == 'metadata':
                 # which metadata?
-                metadata = Metadata.query(Metadata).filter(Metadata.name == field[1]).first()
+                metadata = session.query(Metadata).filter(Metadata.name == field[1]).first()
                 if metadata is None:
-                    metadata_query = Metadata.query(Metadata.name).order_by(Metadata.name)
+                    metadata_query = session.query(Metadata.name).order_by(Metadata.name)
                     metadata_names = [metadata.name for metadata in metadata_query.all()]
                     raise APIException('Invalid key for "%s" in parameter "field", should be one of the following values: "%s". "%s" was found instead' % (field[0], '", "'.join(metadata_names), field[1]), 400)                
                 # check or create Node_Metadata alias; join if necessary
@@ -475,7 +475,7 @@ class NodesChildrenQueries(APIView):
                 ))
             elif field[0] == 'ngrams': 
                 query = query.filter(
-                    Node.id.in_(Node_Metadata
+                    Node.id.in_(session
                         .query(Node_Ngram.node_id)
                         .filter(Node_Ngram.ngram_id == Ngram.id)
                         .filter(operator(
@@ -551,7 +551,7 @@ class NodesChildrenQueries(APIView):
 class NodesList(APIView):
 
     def get(self, request):
-        query = (Node
+        query = (session
             .query(Node.id, Node.name, NodeType.name.label('type'))
             .filter(Node.user_id == request.session._session_cache['_auth_user_id'])
             .join(NodeType)
@@ -626,7 +626,7 @@ class CorpusController:
 
         # build query
         ParentNode = aliased(Node)
-        query = (Ngram
+        query = (session
             .query(Ngram.terms, func.count('*'))
             .join(Node_Ngram, Node_Ngram.ngram_id == Ngram.id)
             .join(Node, Node.id == Node_Ngram.node_id)