Re-implement latest PRs on a clean Git history (#86)

* Add granblue_id to WeaponKeys (#77)

Reimplementing #77

* Adds Ultimate Mastery and renames Master Level (#78)

* Render :created view on remix (#84)

This view is required as it shows the `edit_key` for unauth users
This commit is contained in:
Justin Edmund 2023-03-17 05:03:50 -07:00 committed by GitHub
parent 472fb6816b
commit 27441146ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 13 deletions

View file

@ -17,7 +17,9 @@ module Api
]
end
fields :granblue_id, :row, :ml, :order, :accessory, :accessory_type
fields :granblue_id, :row, :order,
:master_level, :ultimate_mastery,
:accessory, :accessory_type
end
end
end

View file

@ -68,7 +68,9 @@ module Api
include_view :characters
include_view :job_skills
fields :local_id, :description, :charge_attack, :button_count, :turn_count, :chain_count
fields :local_id, :description, :charge_attack,
:button_count, :turn_count, :chain_count,
:master_level, :ultimate_mastery
association :accessory,
blueprint: JobAccessoryBlueprint

View file

@ -10,7 +10,7 @@ module Api
}
end
fields :slug, :series, :slot, :group, :order
fields :granblue_id, :slug, :series, :slot, :group, :order
end
end
end

View file

@ -65,7 +65,7 @@ module Api
new_party.local_id = party_params[:local_id] if !party_params.nil?
if new_party.save
render json: PartyBlueprint.render(new_party, view: :full, root: :party,
render json: PartyBlueprint.render(new_party, view: :created, root: :party,
meta: { remix: true })
else
render_validation_error_response(new_party)

View file

@ -0,0 +1,6 @@
class AddGranblueIdToWeaponKeys < ActiveRecord::Migration[7.0]
def change
# This needs to be NOT NULL, but initially it will be nullable until we migrate data
add_column :weapon_keys, :granblue_id, :integer, unique: true, null: true
end
end

View file

@ -0,0 +1,6 @@
class AddUltimateMastery < ActiveRecord::Migration[7.0]
def change
add_column :parties, :ultimate_mastery, :integer, null: true
add_column :jobs, :ultimate_mastery, :boolean, default: false, null: false
end
end

View file

@ -0,0 +1,7 @@
class RenameMlToMasterLevel < ActiveRecord::Migration[7.0]
def change
rename_column :parties, :ml, :master_level
rename_column :jobs, :ml, :master_level
change_column_null :jobs, :master_level, false
end
end

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.0].define(version: 2023_01_31_084343) do
ActiveRecord::Schema[7.0].define(version: 2023_03_15_103037) do
# These are extensions that must be enabled in order to support this database
enable_extension "btree_gin"
enable_extension "pg_trgm"
@ -154,7 +154,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_31_084343) do
t.integer "proficiency1"
t.integer "proficiency2"
t.string "row"
t.boolean "ml", default: false
t.boolean "master_level", default: false, null: false
t.boolean "ultimate_mastery", default: false, null: false
t.integer "order"
t.uuid "base_job_id"
t.string "granblue_id"
@ -213,7 +214,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_31_084343) do
t.integer "element"
t.integer "weapons_count"
t.uuid "job_id"
t.integer "ml"
t.integer "master_level"
t.integer "ultimate_mastery"
t.uuid "skill1_id"
t.uuid "skill2_id"
t.uuid "skill3_id"
@ -299,6 +301,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_31_084343) do
t.integer "group"
t.integer "order"
t.string "slug"
t.integer "granblue_id"
end
create_table "weapons", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|