Refactor: move method to recreate the initial journals out of migration

c0d26da3 · Eric Davis · bbb4f63a · c0d26da3 · c0d26da3
Commit c0d26da3 authored Jul 22, 2011 by Eric Davis
Showing with 44 additions and 35 deletions

20100714111653_build_initial_journals_for_acts_as_journalized.rb ...4111653_build_initial_journals_for_acts_as_journalized.rb +2 -35

creation.rb ...s_as_journalized/lib/redmine/acts/journalized/creation.rb +42 -0

No files found.
--- a/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb
+++ b/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb
@@ -32,45 +32,12 @@ class BuildInitialJournalsForActsAsJournalized < ActiveRecord::Migration
        activity_type = p.activity_provider_options.keys.first
+        # Create initial journals
        p.find(:all).each do |o|
-          # Create initial journals
-          new_journal = o.journals.build
-          # Mock up a list of changes for the creation journal based on Class defaults
-          new_attributes = o.class.new.attributes.except(o.class.primary_key,
-                                                         o.class.inheritance_column,
-                                                         :updated_on,
-                                                         :updated_at,
-                                                         :lock_version,
-                                                         :lft,
-                                                         :rgt)
-          creation_changes = {}
-          new_attributes.each do |name, default_value|
-            # Set changes based on the initial value to current. Can't get creation value without
-            # rebuiling the object history
-            creation_changes[name] = [default_value, o.send(name)] # [initial_value, creation_value]
-          end
-          new_journal.changes = creation_changes
-          new_journal.version = 1
-          new_journal.activity_type = activity_type
-          if o.respond_to?(:author)
-            new_journal.user = o.author
-          elsif o.respond_to?(:user)
-            new_journal.user = o.user
-          end
          # Using rescue and save! here because either the Journal or the
          # touched record could fail. This will catch either error and continue
          begin
-            new_journal.save!
+            new_journal = o.recreate_initial_journal!
-            new_journal.reload
-            # Backdate journal
-            if o.respond_to?(:created_at)
-              new_journal.update_attribute(:created_at, o.created_at)
-            elsif o.respond_to?(:created_on)
-              new_journal.update_attribute(:created_at, o.created_on)
-            end
          rescue ActiveRecord::RecordInvalid => ex
            if new_journal.errors.count == 1 && new_journal.errors.first[0] == "version"
              # Skip, only error was from creating the initial journal for a record that already had one.

--- a/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/creation.rb
+++ b/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/creation.rb
@@ -68,6 +68,48 @@ module Redmine::Acts::Journalized
    # Instance methods that determine whether to save a journal and actually perform the save.
    module InstanceMethods
+      # Recreates the initial journal used to track the beginning state
+      # of the object. Useful for objects that didn't have an initial journal
+      # created (e.g. legacy data)
+      def recreate_initial_journal!
+        new_journal = journals.find_by_version(1)
+        new_journal ||= journals.build
+        # Mock up a list of changes for the creation journal based on Class defaults
+        new_attributes = self.class.new.attributes.except(self.class.primary_key,
+                                                          self.class.inheritance_column,
+                                                          :updated_on,
+                                                          :updated_at,
+                                                          :lock_version,
+                                                          :lft,
+                                                          :rgt)
+        creation_changes = {}
+        new_attributes.each do |name, default_value|
+          # Set changes based on the initial value to current. Can't get creation value without
+          # rebuiling the object history
+          creation_changes[name] = [default_value, self.send(name)] # [initial_value, creation_value]
+        end
+        new_journal.changes = creation_changes
+        new_journal.version = 1
+        new_journal.activity_type = self.class.send(:journalized_activity_hash, {})[:type]
+        if respond_to?(:author)
+          new_journal.user = author
+        elsif respond_to?(:user)
+          new_journal.user = user
+        end
+        new_journal.save!
+        new_journal.reload
+        # Backdate journal
+        if respond_to?(:created_at)
+          new_journal.update_attribute(:created_at, created_at)
+        elsif respond_to?(:created_on)
+          new_journal.update_attribute(:created_at, created_on)
+        end
+        new_journal
+      end
      private
        # Returns whether a new journal should be created upon updating the parent record.
        # A new journal will be created if