X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2386475f3bf86824e320ad121838955278ed3083..2de827e57ae9ba1b0d322199d071ae900a5b7e0c:/services/api/app/models/log.rb

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index e9fe352675..66ba1d7ef5 100644
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -4,21 +4,31 @@ class Log < ArvadosModel
   include CommonApiTemplate
   serialize :properties, Hash
   before_validation :set_default_event_at
-  attr_accessor :object
+  attr_accessor :object, :object_kind
 
   api_accessible :user, extend: :common do |t|
-    t.add :object_kind
     t.add :object_uuid
-    t.add :object, :if => :object
+    t.add :object_owner_uuid
+    t.add :object_kind
     t.add :event_at
     t.add :event_type
     t.add :summary
     t.add :properties
   end
 
+  def object_kind
+    if k = ArvadosModel::resource_class_for_uuid(object_uuid)
+      k.kind
+    end
+  end
+
   def fill_object(thing)
-    self.object_kind ||= thing.kind
     self.object_uuid ||= thing.uuid
+    if respond_to? :object_owner_uuid=
+      # Skip this if the object_owner_uuid migration hasn't happened
+      # yet, i.e., we're in the process of migrating an old database.
+      self.object_owner_uuid = thing.owner_uuid
+    end
     self.summary ||= "#{self.event_type} of #{thing.uuid}"
     self
   end
@@ -29,7 +39,7 @@ class Log < ArvadosModel
   end
 
   def update_to(thing)
-    fill_properties('new', thing.andand.etag, thing.andand.attributes)
+    fill_properties('new', thing.andand.etag, thing.andand.logged_attributes)
     case event_type
     when "create"
       self.event_at = thing.created_at
@@ -57,7 +67,16 @@ class Log < ArvadosModel
     self.event_at ||= Time.now
   end
 
+  def log_start_state
+    # don't log start state on logs
+  end
+
   def log_change(event_type)
     # Don't log changes to logs.
   end
+
+  def ensure_valid_uuids
+    # logs can have references to deleted objects
+  end
+
 end