Merge pull request #102 from neo-technology/metadata-query

Refactor db.* procedure calls to be in one transaction

Author: oskarhane

app/scripts/services/Bolt.coffee

@@ -163,10 +163,10 @@ angular.module('neo4jApp.services')
           .catch((err) -> q.resolve([]))
         q.promise
 
-      metaResultToRESTResult = (labels, realtionshipTypes, propertyKeys) ->
-        labels: labels.map (o) -> o.get('label')
-        relationships: realtionshipTypes.map (o) -> o.get('relationshipType')
-        propertyKeys: propertyKeys.map (o) -> o.get('propertyKey')
+      metaResultToRESTResult = (labels, relationshipTypes, propertyKeys) ->
+        labels: labels.get(1)
+        relationships: relationshipTypes.get(1)
+        propertyKeys: propertyKeys.get(1)
 
       versionResultToRESTResult = (r) ->
         return null unless r.records
@@ -392,8 +392,8 @@ angular.module('neo4jApp.services')
         callProcedure: callProcedure,
         constructResult: (res) ->
           boltResultToRESTResult res
-        constructMetaResult: (labels, realtionshipTypes, propertyKeys) ->
-          metaResultToRESTResult labels, realtionshipTypes, propertyKeys
+        constructMetaResult: (labels, relationshipTypes, propertyKeys) ->
+          metaResultToRESTResult labels, relationshipTypes, propertyKeys
         constructSchemaResult: (indexes, constraints) ->
           schemaResultToRESTResult indexes, constraints
         constructJmxResult: jmxResultToRESTResult

app/scripts/services/UtilityBolt.coffee

@@ -41,12 +41,24 @@ angular.module('neo4jApp.services')
 
         getMeta: ->
           q = $q.defer()
-          $q.all([
-            Bolt.callProcedure("db.labels"),
-            Bolt.callProcedure("db.relationshipTypes"),
-            Bolt.callProcedure("db.propertyKeys")
-          ]).then((data) ->
-            q.resolve(Bolt.constructMetaResult data[0], data[1], data[2])
+          Bolt.boltTransaction(
+            """CALL db.labels() YIELD label
+            WITH COLLECT(label) AS labels
+            RETURN 'labels' as a, labels as result
+            UNION
+            CALL db.relationshipTypes() YIELD relationshipType
+            WITH COLLECT(relationshipType) AS relationshipTypes
+            RETURN 'relationshipTypes'as a, relationshipTypes as result
+            UNION
+            CALL db.propertyKeys() YIELD propertyKey
+            WITH COLLECT(propertyKey) AS propertyKeys
+            RETURN 'propertyKeys' as a, propertyKeys as result"""
+          ).promise.then((result) ->
+            return q.resolve(Bolt.constructMetaResult([], [], [])) unless result.records.length
+            res = result.records[0]
+            res2 = result.records[1]
+            res3 = result.records[2]
+            q.resolve(Bolt.constructMetaResult res, res2, res3)
           )
           q.promise