2 files changed, 3 insertions, 6 deletions

@@ -4,6 +4,7 @@ module Pokeviewer
     extend ActiveModel::Naming
 
     has_many :revisions, -> { order "sequential_id ASC" }, dependent: :destroy
+    has_one :current, -> { order "sequential_id DESC" }, class_name: "Revision"
 
     belongs_to :trainer, optional: true
 
@@ -76,10 +77,6 @@ module Pokeviewer
       uuid
     end
 
-    def current
-      revisions.last
-    end
-
     def outsider?
       (trainer.nil?) or (ot_name != trainer.name) or (ot_number != trainer.number)
     end
@@ -39,11 +39,11 @@ module Pokeviewer
     validates :box_14_name, presence: true
 
     def party
-      pokemon.party.includes(revisions: [:species])
+      pokemon.party.includes(current: [:species])
     end
 
     def box(n)
-      pokemon.box(n).includes(revisions: [:species])
+      pokemon.box(n).includes(current: [:species])
     end
 
     def box_name(n)