3 files changed, 25 insertions, 3 deletions

@@ -7,8 +7,7 @@ module Pokeviewer
         order(trainer_id: :asc).
         order(box: :asc).
         order(slot: :asc).
-        select(:uuid).distinct.
-        order("pokeviewer_revisions.sequential_id DESC").
+        joins(:current).
         includes(:current).
         chunk do |p|
           if p.trainer_id.nil?
@@ -4,7 +4,9 @@ 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 :current, class_name: "Revision", optional: true
+    validate :current_is_cached
 
     belongs_to :trainer, optional: true
 
@@ -149,5 +151,17 @@ module Pokeviewer
       def uuid_is_constant
         errors.add(:uuid, "can't be changed") if self.uuid_changed?
       end
+
+      def current_is_cached
+        if self.revisions.empty?
+          unless self.current_id.nil?
+            errors.add(:current, "must be null when there are no revisions")
+          end
+        else
+          unless self.current_id = self.revisions.last.id
+            errors.add(:current, "is not up-to-date")
+          end
+        end
+      end
   end
 end
@@ -17,6 +17,8 @@ module Pokeviewer
     belongs_to :pokemon
     acts_as_sequenced scope: :pokemon_id
 
+    after_create :cache_pokemon_current
+
     belongs_to :species
 
     validates :nickname, presence: true
@@ -483,5 +485,12 @@ module Pokeviewer
 
       result
     end
+
+    private
+
+      def cache_pokemon_current
+        self.pokemon.current_id = self.id
+        self.pokemon.save!
+      end
   end
 end