Merge branch 'staging' of github.com:jedmund/hensei-api into staging

app/blueprints/api/v1/job_blueprint.rb

@@ -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

app/blueprints/api/v1/party_blueprint.rb

@@ -52,6 +52,7 @@ module Api
       end
 
       view :jobs do
+
         association :job,
                     blueprint: JobBlueprint
         include_view :job_skills
@@ -68,7 +69,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

db/migrate/20230315103026_add_ultimate_mastery.rb

@@ -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

db/migrate/20230315103037_rename_master_level.rb

@@ -0,0 +1,7 @@
+class RenameMasterLevel < 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

db/schema.rb

@@ -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_03_15_095656) 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"