granblue.team/hensei-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug when desired position is empty

Browse source
This commit is contained in:
Justin Edmund 2022-12-03 14:10:18 -08:00
parent 27d31d61c0
commit 243ba2de3e
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/controllers/api/v1/jobs_controller.rb
View file

@ -42,12 +42,11 @@ class Api::V1::JobsController < Api::V1::ApiController
2 => @party.skill2, 2 => @party.skill2,
3 => @party.skill3 3 => @party.skill3
} }
new_skill_ids = new_skill_keys.map { |key| job_params[key] } new_skill_ids = new_skill_keys.map { |key| job_params[key] }
new_skill_ids.map do |id| new_skill_ids.map do |id|
skill = JobSkill.find(id) skill = JobSkill.find(id)
if mismatched_skill(@party.job, skill) raise Api::V1::IncompatibleSkillError.new(job: @party.job, skill: skill) if mismatched_skill(@party.job, skill)
raise Api::V1::IncompatibleSkillError.new(job: @party.job, skill: skill)
end
end end
positions = extract_positions_from_keys(new_skill_keys) positions = extract_positions_from_keys(new_skill_keys)
@ -80,19 +79,22 @@ class Api::V1::JobsController < Api::V1::ApiController
end end
def place_skill_in_existing_skills(existing_skills, skill, position) def place_skill_in_existing_skills(existing_skills, skill, position)
old_position = existing_skills.key(existing_skills.detect { |_, value| value.id == skill.id }) if !existing_skills[position]
if old_position
existing_skills = swap_skills_at_position(existing_skills, skill, position, old_position[0])
else
# Test if skill will exceed allowances of skill types
skill_type = skill.sub ? 'sub' : 'emp'
unless can_add_skill_of_type(existing_skills, position, skill_type)
raise Api::V1::TooManySkillsOfTypeError.new(skill_type: skill_type)
end
existing_skills[position] = skill existing_skills[position] = skill
else
old_position = existing_skills.key(existing_skills.detect { |_, value| value.id == skill.id })
if old_position
existing_skills = swap_skills_at_position(existing_skills, skill, position, old_position[0])
else
# Test if skill will exceed allowances of skill types
skill_type = skill.sub ? 'sub' : 'emp'
unless can_add_skill_of_type(existing_skills, position, skill_type)
raise Api::V1::TooManySkillsOfTypeError.new(skill_type: skill_type)
end
existing_skills[position] = skill
end
end end
existing_skills existing_skills