starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-28 23:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(es_extended/server/modules/createJob): only insert what is missing

Browse Source 
The jobs row was inserted unconditionally, so adding a grade to an existing
job hit a duplicate primary key and rolled the whole transaction back. The
guard above it only caught the case where there was nothing to add, and it
read ESX.Jobs, which does not list jobs that have no grades yet.
This commit is contained in:
Selt
2026-07-28 01:51:54 +02:00
parent 527a99c851
commit 4b07899061
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/server/modules/createJob.lua
+28 -26
View File
@@ -5,22 +5,8 @@ local NOTIFY_TYPES = {
ERROR = "^5[%s]^7-^1[ERROR]^7 %s" ERROR = "^5[%s]^7-^1[ERROR]^7 %s"
} }
local function doesJobAndGradesExist(name, grades)
if not ESX.Jobs[name] then
return false
end
for _, grade in ipairs(grades) do
if not ESX.DoesJobExist(name, grade.grade) then
return false
end
end
return true
end
local function generateNewJobTable(name, label, grades, jobType) local function generateNewJobTable(name, label, grades, jobType)
local job = { name = name, label = label, type = jobType, grades = {} } local job = ESX.Jobs[name] or { name = name, label = label, type = jobType, grades = {} }
for _, v in pairs(grades) do for _, v in pairs(grades) do
job.grades[tostring(v.grade)] = { job_name = name, grade = v.grade, name = v.name, label = v.label, salary = v.salary, skin_male = v.skin_male or '{}', skin_female = v.skin_female or '{}' } job.grades[tostring(v.grade)] = { job_name = name, grade = v.grade, name = v.name, label = v.label, salary = v.salary, skin_male = v.skin_male or '{}', skin_female = v.skin_female or '{}' }
end end
@@ -66,22 +52,38 @@ function ESX.CreateJob(name, label, grades, jobType)
jobType = "civ" jobType = "civ"
end end
local currentJobExist = doesJobAndGradesExist(name, grades) local jobExists = MySQL.scalar.await('SELECT 1 FROM `jobs` WHERE `name` = ?', { name }) ~= nil
local existingGrades = {}
if currentJobExist then if jobExists then
notify("ERROR",currentResourceName, 'Job or grades already exists: `%s`', name) local rows = MySQL.query.await('SELECT `grade` FROM `job_grades` WHERE `job_name` = ?', { name })
return success
for i = 1, #(rows or {}) do
existingGrades[rows[i].grade] = true
end
end end
local queries = { local queries = {}
{ query = 'INSERT INTO `jobs` (`name`, `label`, `type`) VALUES (?, ?, ?)', values = { name, label, jobType } }
} if not jobExists then
queries[#queries + 1] = {
query = 'INSERT INTO `jobs` (`name`, `label`, `type`) VALUES (?, ?, ?)',
values = { name, label, jobType }
}
end
for _, grade in pairs(grades) do for _, grade in pairs(grades) do
queries[#queries + 1] = { if not existingGrades[grade.grade] then
query = 'INSERT INTO job_grades (job_name, grade, name, label, salary, skin_male, skin_female) VALUES (?, ?, ?, ?, ?, ?, ?)', queries[#queries + 1] = {
values = { name, grade.grade, grade.name, grade.label, grade.salary, grade.skin_male and json.encode(grade.skin_male) or '{}', grade.skin_female and json.encode(grade.skin_female) or '{}' } query = 'INSERT INTO job_grades (job_name, grade, name, label, salary, skin_male, skin_female) VALUES (?, ?, ?, ?, ?, ?, ?)',
} values = { name, grade.grade, grade.name, grade.label, grade.salary, grade.skin_male and json.encode(grade.skin_male) or '{}', grade.skin_female and json.encode(grade.skin_female) or '{}' }
}
end
end
if not queries[1] then
notify("ERROR",currentResourceName, 'Job or grades already exists: `%s`', name)
return success
end end
success = exports.oxmysql:transaction_async(queries) success = exports.oxmysql:transaction_async(queries)