lib/sandthorn/event_inspector.rb in sandthorn-0.13.0 vs lib/sandthorn/event_inspector.rb in sandthorn-1.0.0

@@ -44,31 +44,33 @@
       trace = has_trace? matching_events, options.fetch(:trace, {})
       !!(event_exists && trace)
     end
 
     def events_with_trace_info
-      saved = Sandthorn.get_aggregate_events(self.class, aggregate_id)
+      begin
+        saved = Sandthorn.find aggregate_id, self.class  
+      rescue Exception
+        saved = []
+      end
+      
       unsaved = self.aggregate_events
       all = saved
         .concat(unsaved)
         .sort { |a, b| a[:aggregate_version] <=> b[:aggregate_version] }
 
-      extracted = all.collect do |e| 
-        if e[:event_args].nil? && !e[:event_data].nil?
+      extracted = all.collect do |e|
+        if e[:event_data].nil? && !e[:event_data].nil?
           data = Sandthorn.deserialize e[:event_data]
         else
-          data = e[:event_args]
+          data = e[:event_data]
         end
 
-        unless data.nil? || !data.is_a?(Hash)
-          trace = data[:trace]
-        end
-
         {
           aggregate_version: e[:aggregate_version],
           event_name: e[:event_name].to_sym, 
-          trace: trace 
+          event_data: data,
+          event_metadata: e[:event_metadata]
         }
       end
 
       extracted
     end
@@ -78,10 +80,10 @@
     def get_unsaved_events event_name
       self.aggregate_events.select { |e| e[:event_name] == event_name.to_s  }
     end
 
     def get_saved_events event_name
-      saved_events = Sandthorn.get_aggregate_events self.aggregate_id, self.class
+      saved_events = Sandthorn.find self.class, self.aggregate_id
       saved_events.select { |e| e[:event_name] == event_name.to_s  }
     end
 
     def has_trace? events_to_check, trace_info
       return true if trace_info.empty?