diff --git a/app/models/salary.rb b/app/models/salary.rb new file mode 100644 index 0000000..4ab2a7b --- /dev/null +++ b/app/models/salary.rb @@ -0,0 +1,2 @@ +class Salary < ApplicationRecord +end diff --git a/db/migrate/20201001160115_create_salaries.rb b/db/migrate/20201001160115_create_salaries.rb new file mode 100644 index 0000000..b9904ce --- /dev/null +++ b/db/migrate/20201001160115_create_salaries.rb @@ -0,0 +1,11 @@ +class CreateSalaries < ActiveRecord::Migration[6.0] + def change + create_table :salaries do |t| + t.integer :year + t.float :hourly_rate + t.json :hour_table + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 13e5e7a..292309f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_09_09_112404) do +ActiveRecord::Schema.define(version: 2020_10_01_160115) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,14 @@ ActiveRecord::Schema.define(version: 2020_09_09_112404) do t.index ["unlock_token"], name: "index_admins_on_unlock_token", unique: true end + create_table "salaries", force: :cascade do |t| + t.integer "year" + t.float "hourly_rate" + t.json "hour_table" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "tax_references", force: :cascade do |t| t.integer "year" t.float "hourly_wage" diff --git a/test/fixtures/salaries.yml b/test/fixtures/salaries.yml new file mode 100644 index 0000000..3bb6436 --- /dev/null +++ b/test/fixtures/salaries.yml @@ -0,0 +1,11 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + year: + hourly_rate: 1.5 + hour_table: + +two: + year: + hourly_rate: 1.5 + hour_table: diff --git a/test/models/salary_test.rb b/test/models/salary_test.rb new file mode 100644 index 0000000..9b40b69 --- /dev/null +++ b/test/models/salary_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class SalaryTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end