Cleanup model

pantographe · Oct 18, 2023 · 14b79bf · 14b79bf
1 parent bc37de1
commit 14b79bf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/app/controllers/changelog_entries_controller.rb b/app/controllers/changelog_entries_controller.rb
@@ -15,7 +15,11 @@ def scoped_object
 
       klass = params[:object_type].camelize.singularize.safe_constantize
 
-      klass&.find(params[:object_id])
+      if klass.respond_to?(:friendly)
+        klass&.friendly&.find(params[:object_id])
+      else
+        klass&.find(params[:object_id])
+      end
     end
   end
 

diff --git a/app/models/concerns/changelogable.rb b/app/models/concerns/changelogable.rb
@@ -32,7 +32,7 @@ def changelog_entry_on_destroy
   def _create_changelog_entry(action, object_changes: previous_changes, metadata: {})
     changelog_entries.create!(
       action: action,
-      object_changes: object_changes,
+      object_changed_attributes: object_changes,
       metadata: ChangelogContext.metadata.to_h.merge(metadata)
     )
   end

diff --git a/app/views/changelog_entries/show.html.erb b/app/views/changelog_entries/show.html.erb
@@ -22,7 +22,7 @@
 </dl>
 
 <h3>Changes</h3>
-<%= debug @changelog_entry.object_changes %>
+<%= debug @changelog_entry.object_changed_attributes %>
 
 <h3>Metadatas</h3>
 <dl class="dl-horizontal">

diff --git a/db/migrate/20231004123921_create_changelog_entries.rb b/db/migrate/20231004123921_create_changelog_entries.rb
@@ -6,7 +6,9 @@ def change
       t.references :object, polymorphic: true, null: false
       t.references :author, polymorphic: true, null: true
       t.string :action, null: false
-      t.jsonb :object_changes, null: false, default: {}
+      t.jsonb :object_changed_attributes, null: false, default: {}
+      t.jsonb :object_pre_change_attributes, null: false, default: {}
+      t.jsonb :object_post_change_attributes, null: false, default: {}
       t.jsonb :metadata, null: false, default: {}
 
       t.timestamps

diff --git a/db/schema.rb b/db/schema.rb
diff --git a/lib/tasks/convert_activities_to_changelog_entries.rake b/lib/tasks/convert_activities_to_changelog_entries.rake
@@ -31,7 +31,7 @@ task convert_activities_to_changelog_entries: :environment do
       author_id: activity.owner_id,
       author_type: activity.owner_type,
       action: activity.key.split(".").last,
-      object_changes: activity.parameters.presence || {},
+      object_changed_attributes: activity.parameters.presence || {},
       metadata: {
         activity_id: activity.id
       }