2 files changed, 19 insertions, 5 deletions

@@ -22,7 +22,9 @@ module Pokeviewer
           end
         end
 
-      pokemons = args["pokemon"].map do |param|
+      game.pokemon.clear
+
+      args["pokemon"].each do |param|
         pk = Pokemon.find_or_create_by!(key: param["key"]) do |r|
           r.species_id = param["species"]
           r.ot_name = param["otName"]
@@ -47,6 +49,18 @@ module Pokeviewer
           end
         end
 
+        pk.trainer = game
+
+        if param["storage"] == "party"
+          pk.box = nil
+        elsif param["storage"] == "box"
+          pk.box = param["box"]
+        end
+
+        pk.slot = param["slot"]
+
+        pk.save!
+
         rev = Revision.new(pokemon: pk)
         rev.nickname = param["nickname"]
         rev.experience = param["experience"]
@@ -85,11 +99,7 @@ module Pokeviewer
         if pk.revisions.empty? or rev.diff?(pk.revisions.last)
           rev.save!
         end
-
-        pk
       end
-
-      game.pokemon = pokemons
     end
   end
 end
@@ -36,6 +36,10 @@ module Pokeviewer
     enumerize :unown_letter, in: [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k,
       :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
       :question, :exclamation]
+      
+    validates :slot, presence: true,
+      uniqueness: { scope: [:trainer_id, :box] },
+      unless: Proc.new { |a| a.trainer.nil? }
 
     def to_param
       uuid