5 files changed, 61 insertions, 55 deletions

@@ -3,10 +3,6 @@ module Pokeviewer
     belongs_to :pokemon
     acts_as_sequenced scope: :pokemon_id
 
-    has_many :revision_moves, -> { order "number ASC" }
-    has_many :moves, through: :revision_moves
-
-    validates :moves, presence: true
     validates :nickname, presence: true
 
     validates :experience, presence: true,
@@ -68,5 +64,34 @@ module Pokeviewer
         greater_than_or_equal_to: 0,
         less_than_or_equal_to: 10,
         only_integer: true }
+
+    belongs_to :move_1, class_name: "Move"
+    belongs_to :move_2, class_name: "Move", optional: true
+    belongs_to :move_3, class_name: "Move", optional: true
+    belongs_to :move_4, class_name: "Move", optional: true
+
+    validates :move_1_pp_bonuses, presence: true,
+      numericality: {
+        greater_than_or_equal_to: 0,
+        less_than_or_equal_to: 3,
+        only_integer: true}
+
+    validates :move_2_pp_bonuses, presence: true,
+      numericality: {
+        greater_than_or_equal_to: 0,
+        less_than_or_equal_to: 3,
+        only_integer: true}
+
+    validates :move_3_pp_bonuses, presence: true,
+      numericality: {
+        greater_than_or_equal_to: 0,
+        less_than_or_equal_to: 3,
+        only_integer: true}
+
+    validates :move_4_pp_bonuses, presence: true,
+      numericality: {
+        greater_than_or_equal_to: 0,
+        less_than_or_equal_to: 3,
+        only_integer: true}
   end
 end
@@ -1,19 +0,0 @@
-module Pokeviewer
-  class RevisionMove < ApplicationRecord
-    belongs_to :revision
-    belongs_to :move
-
-    validates :number, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 1,
-        less_than_or_equal_to: 4,
-        only_integer: true },
-      uniqueness: { scope: :revision_id }
-
-    validates :pp_bonuses, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 3,
-        only_integer: true}
-  end
-end
@@ -1,20 +0,0 @@
-class CreatePokeviewerRevisionMoves < ActiveRecord::Migration[5.1]
-  def change
-    create_table :pokeviewer_revision_moves do |t|
-      t.references :revision, null: false
-      t.references :move, null: false
-      t.integer :number, null: false
-      t.integer :pp_bonuses, null: false, default: 0
-
-      t.timestamps
-    end
-
-    add_index :pokeviewer_revision_moves, [:revision_id, :number], unique: true
-
-    add_foreign_key :pokeviewer_revision_moves, :pokeviewer_revisions,
-      column: :revision_id
-
-    add_foreign_key :pokeviewer_revision_moves, :pokeviewer_moves,
-      column: :move_id
-  end
-end
@@ -19,6 +19,14 @@ class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
       t.integer :toughness, null: false
       t.integer :sheen, null: false
       t.integer :hold_item, null: true
+      t.references :move_1, null: false
+      t.references :move_2, null: true
+      t.references :move_3, null: true
+      t.references :move_4, null: true
+      t.integer :move_1_pp_bonuses, null: false, default: 0
+      t.integer :move_2_pp_bonuses, null: false, default: 0
+      t.integer :move_3_pp_bonuses, null: false, default: 0
+      t.integer :move_4_pp_bonuses, null: false, default: 0
 
       t.timestamps
     end
@@ -27,5 +35,17 @@ class CreatePokeviewerRevisions < ActiveRecord::Migration[5.1]
 
     add_foreign_key :pokeviewer_revisions, :pokewalker_pokemon,
       column: :pokemon_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_1_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_2_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_3_id
+
+    add_foreign_key :pokeviewer_revisions, :pokewalker_moves,
+      column: :move_4_id
   end
 end
@@ -43,18 +43,6 @@ ActiveRecord::Schema.define(version: 20170917011258) do
     t.index ["uuid"], name: "index_pokeviewer_pokemon_on_uuid", unique: true
   end
 
-  create_table "pokeviewer_revision_moves", force: :cascade do |t|
-    t.integer "revision_id", null: false
-    t.integer "move_id", null: false
-    t.integer "number", null: false
-    t.integer "pp_bonuses", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["move_id"], name: "index_pokeviewer_revision_moves_on_move_id"
-    t.index ["revision_id", "number"], name: "index_pokeviewer_revision_moves_on_revision_id_and_number", unique: true
-    t.index ["revision_id"], name: "index_pokeviewer_revision_moves_on_revision_id"
-  end
-
   create_table "pokeviewer_revisions", force: :cascade do |t|
     t.integer "pokemon_id", null: false
     t.integer "sequential_id", null: false
@@ -74,8 +62,20 @@ ActiveRecord::Schema.define(version: 20170917011258) do
     t.integer "toughness", null: false
     t.integer "sheen", null: false
     t.integer "hold_item"
+    t.integer "move_1_id", null: false
+    t.integer "move_2_id"
+    t.integer "move_3_id"
+    t.integer "move_4_id"
+    t.integer "move_1_pp_bonuses", default: 0, null: false
+    t.integer "move_2_pp_bonuses", default: 0, null: false
+    t.integer "move_3_pp_bonuses", default: 0, null: false
+    t.integer "move_4_pp_bonuses", default: 0, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["move_1_id"], name: "index_pokeviewer_revisions_on_move_1_id"
+    t.index ["move_2_id"], name: "index_pokeviewer_revisions_on_move_2_id"
+    t.index ["move_3_id"], name: "index_pokeviewer_revisions_on_move_3_id"
+    t.index ["move_4_id"], name: "index_pokeviewer_revisions_on_move_4_id"
     t.index ["pokemon_id", "sequential_id"], name: "index_pokeviewer_revisions_on_pokemon_id_and_sequential_id", unique: true
     t.index ["pokemon_id"], name: "index_pokeviewer_revisions_on_pokemon_id"
   end