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

Fix race condition for base skill mismatch check

Browse source
This commit is contained in:
Justin Edmund 2022-12-03 18:21:15 -08:00
parent a08421722f
commit fc7cde4c5a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,7 +121,7 @@ class Api::V1::JobsController < Api::V1::ApiController
if skills.values.compact.length.positive? if skills.values.compact.length.positive?
max_skill_of_type = 2 max_skill_of_type = 2
skills_to_check = skills.compact.reject { |key, _| key == position } skills_to_check = skills.compact.reject { |key, _| key == position }
sum = skills_to_check.values.count { |value| value.send(type) } sum = skills_to_check.values.count { |value| value.send(type) }
sum + 1 <= max_skill_of_type sum + 1 <= max_skill_of_type
@ -133,7 +133,7 @@ class Api::V1::JobsController < Api::V1::ApiController
def mismatched_skill(job, skill) def mismatched_skill(job, skill)
mismatched_main = (skill.job.id != job.id) && skill.main && !skill.sub mismatched_main = (skill.job.id != job.id) && skill.main && !skill.sub
mismatched_emp = (skill.job.id != job.id) && skill.emp mismatched_emp = (skill.job.id != job.id) && skill.emp
mismatched_base = (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base mismatched_base = skill.job.base_job && (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base
if %w[4 5 ex2].include?(job.row) if %w[4 5 ex2].include?(job.row)
true if mismatched_emp || mismatched_base || mismatched_main true if mismatched_emp || mismatched_base || mismatched_main