Fix testkit request (WIP)

Author: nsauk

testkit-backend/lib/testkit/backend/messages/requests/execute_query.rb

@@ -1,16 +1,8 @@
-# frozen_string_literal: true
-
 module Testkit::Backend::Messages
   module Requests
     class ExecuteQuery < Request
       def response
-        Responses::Result.new(fetch(driver_id).execute_query(cypher, auth_token, config, decode(params)))
-      end
-
-      private
-
-      def auth_token
-        config.authorizationToken
+        Responses::EagerResult.new(fetch(driver_id).execute_query(cypher, auth_token, config, **decode(params)))
       end
     end
   end

testkit-backend/lib/testkit/backend/messages/requests/result_consume.rb

@@ -1,50 +1,10 @@
 module Testkit::Backend::Messages
   module Requests
     class ResultConsume < Request
-      def process
-        named_entity('Summary',
-                     **{
-                       serverInfo: to_map(summary.server, :protocol_version, :address, :agent),
-                       counters: to_map(summary.counters, *%w[constraints_added constraints_removed contains_system_updates? contains_updates? indexes_added
-          indexes_removed labels_added labels_removed nodes_created nodes_deleted properties_set relationships_created
-          relationships_deleted system_updates]),
-                       query: { text: summary.query.text, parameters: summary.query.parameters.transform_values(&method(:to_testkit)) },
-                       database: summary.database.name,
-                       queryType: summary.query_type,
-                       notifications: summary.notifications&.then(&method(:notifications)),
-                       plan: (plan_to_h(summary.plan) if summary.has_plan?),
-                       profile: summary.has_profile? ? summary.profile.then { |p| { db_hits: p.db_hits } } : nil,
-                     }.merge!(to_map(summary, *%w[result_available_after result_consumed_after])))
-      end
-
-      private
-
-      def summary
-        @object ||= fetch(result_id).consume
-      end
-
-      def to_map(o, *methods)
-        methods.map { |name| [key(name), o.send(name).then { |obj| block_given? ? yield(obj) : obj }] }.to_h
-      end
+      include SummaryHelper
 
-      def key(name)
-        name.to_s.gsub('?', '').camelize(:lower).to_sym
-      end
-
-      def map_entry(n, method, *methods)
-        n.send(method)&.then { |o| { key(method) => to_map(o, *methods) } } || {}
-      end
-
-      def notifications(ns)
-        ns.map do |n|
-          to_map(n, *%w[code title description raw_category severity raw_severity_level])
-            .merge(to_map(n, *%w[category severity_level]) { |o| o&.name || 'UNKNOWN' })
-            .merge(map_entry(n, :position, :column, :line, :offset))
-        end
-      end
-
-      def plan_to_h(plan)
-        plan.to_h.transform_keys(&method(:key)).tap {|hash| hash[:children]&.map!(&method(:plan_to_h))}
+      def process
+        summary_to_testkit(fetch(result_id).consume)
       end
     end
   end

testkit-backend/lib/testkit/backend/messages/responses/eager_result.rb

@@ -0,0 +1,34 @@
+module Testkit
+  module Backend
+    module Messages
+      module Responses
+        class EagerResult < Response
+          alias_method :response_to_testkit, :to_testkit
+
+          include Conversion
+          alias_method :value_to_testkit, :to_testkit
+
+          include SummaryHelper
+
+          def to_testkit(*args)
+            if args.empty?
+              response_to_testkit
+            else
+              value_to_testkit(*args)
+            end
+          end
+
+          def data
+            {
+              keys: @object.records.first&.keys || [],
+              records: @object.records.map do |record|
+                { values: record.values.map(&method(:to_testkit)) }
+              end,
+              summary: summary_to_testkit(@object.summary)[:data]
+            }
+          end
+        end
+      end
+    end
+  end
+end

testkit-backend/lib/testkit/backend/messages/summary_helper.rb

@@ -0,0 +1,50 @@
+module Testkit
+  module Backend
+    module Messages
+      module SummaryHelper
+        def summary_to_testkit(summary)
+          named_entity('Summary',
+                       **{
+                         serverInfo: to_map(summary.server, :protocol_version, :address, :agent),
+                         counters: to_map(summary.counters, *%w[constraints_added constraints_removed contains_system_updates? contains_updates? indexes_added indexes_removed labels_added labels_removed nodes_created nodes_deleted properties_set relationships_created relationships_deleted system_updates]),
+                         query: {
+                           text: summary.query.text,
+                           parameters: summary.query.parameters.transform_values(&method(:to_testkit))
+                         },
+                         database: summary.database.name,
+                         queryType: summary.query_type,
+                         notifications: summary.notifications&.then(&method(:notifications)),
+                         plan: (plan_to_h(summary.plan) if summary.has_plan?),
+                         profile: summary.has_profile? ? summary.profile.then { |p| { db_hits: p.db_hits } } : nil
+                       }.merge!(to_map(summary, *%w[result_available_after result_consumed_after])))
+        end
+
+        private
+
+        def to_map(o, *methods)
+          methods.map { |name| [key(name), o.send(name).then { |obj| block_given? ? yield(obj) : obj }] }.to_h
+        end
+
+        def key(name)
+          name.to_s.gsub('?', '').camelize(:lower).to_sym
+        end
+
+        def map_entry(n, method, *methods)
+          n.send(method)&.then { |o| { key(method) => to_map(o, *methods) } } || {}
+        end
+
+        def notifications(ns)
+          ns.map do |n|
+            to_map(n, *%w[code title description raw_category severity raw_severity_level])
+              .merge(to_map(n, *%w[category severity_level]) { |o| o&.name || 'UNKNOWN' })
+              .merge(map_entry(n, :position, :column, :line, :offset))
+          end
+        end
+
+        def plan_to_h(plan)
+          plan.to_h.transform_keys(&method(:key)).tap { |hash| hash[:children]&.map!(&method(:plan_to_h)) }
+        end
+      end
+    end
+  end
+end