From 2654073118d1485bf1de6e4bb54d8d9205158961 Mon Sep 17 00:00:00 2001 From: Frowmza <66181451+Frowmza@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:57:35 +0100 Subject: [PATCH 1/4] feat: select plate --- server/main.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 333b022..0e59481 100644 --- a/server/main.lua +++ b/server/main.lua @@ -36,6 +36,7 @@ exports('DoesPlayerVehiclePlateExist', doesEntityPlateExist) ---@field citizenid? string ---@field states? State|State[] ---@field garage? string +---@field plate? string ---@class PlayerVehiclesInternalFilters: PlayerVehiclesFilters ---@field vehicleId? number @@ -60,6 +61,11 @@ local function buildWhereClause(filters) whereClauseCrumbs[#whereClauseCrumbs+1] = 'garage = ?' placeholders[#placeholders+1] = filters.garage end + if filters.plate then + whereClauseCrumbs[#whereClauseCrumbs+1] = 'plate = ?' + placeholders[#placeholders+1] = filters.garage + end + if filters.states then if type(filters.states) ~= 'table' then ---@diagnostic disable-next-line: assign-type-mismatch @@ -81,7 +87,7 @@ end ---@param filters? PlayerVehiclesInternalFilters ---@return PlayerVehicle[] local function getPlayerVehiclesInternal(filters) - local query = 'SELECT id, citizenid, vehicle, mods, garage, state, depotprice FROM player_vehicles' + local query = 'SELECT id, citizenid, vehicle, mods, plate, garage, state, depotprice FROM player_vehicles' local whereClause, placeholders = buildWhereClause(filters) lib.print.debug(query .. whereClause) local results = MySQL.query.await(query .. whereClause, placeholders) @@ -91,6 +97,7 @@ local function getPlayerVehiclesInternal(filters) id = data.id, citizenid = data.citizenid, modelName = data.vehicle, + plate = data.plate, garage = data.garage, state = data.state, depotPrice = data.depotprice, From 436c6876184e011ce6431cf6db4677d583f41c5e Mon Sep 17 00:00:00 2001 From: Frowmza <66181451+Frowmza@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:53:44 +0100 Subject: [PATCH 2/4] Update main.lua --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 0e59481..204615a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -63,7 +63,7 @@ local function buildWhereClause(filters) end if filters.plate then whereClauseCrumbs[#whereClauseCrumbs+1] = 'plate = ?' - placeholders[#placeholders+1] = filters.garage + placeholders[#placeholders+1] = filters.plate end if filters.states then @@ -294,4 +294,4 @@ local function saveVehicle(vehicle, options) return true end -exports('SaveVehicle', saveVehicle) \ No newline at end of file +exports('SaveVehicle', saveVehicle) From eea5d777399a15a521f47f75945b679df137023c Mon Sep 17 00:00:00 2001 From: Frowmza <66181451+Frowmza@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:29:48 +0100 Subject: [PATCH 3/4] Update main.lua --- server/main.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/main.lua b/server/main.lua index 204615a..109dcb1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -36,7 +36,6 @@ exports('DoesPlayerVehiclePlateExist', doesEntityPlateExist) ---@field citizenid? string ---@field states? State|State[] ---@field garage? string ----@field plate? string ---@class PlayerVehiclesInternalFilters: PlayerVehiclesFilters ---@field vehicleId? number @@ -61,11 +60,6 @@ local function buildWhereClause(filters) whereClauseCrumbs[#whereClauseCrumbs+1] = 'garage = ?' placeholders[#placeholders+1] = filters.garage end - if filters.plate then - whereClauseCrumbs[#whereClauseCrumbs+1] = 'plate = ?' - placeholders[#placeholders+1] = filters.plate - end - if filters.states then if type(filters.states) ~= 'table' then ---@diagnostic disable-next-line: assign-type-mismatch From 9f1f601802d5b1e6a8f25d798195949d75eb149d Mon Sep 17 00:00:00 2001 From: Frowmza <66181451+Frowmza@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:28:10 +0100 Subject: [PATCH 4/4] Revert "feat: select plate" This reverts commit 2654073118d1485bf1de6e4bb54d8d9205158961. --- server/main.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 109dcb1..f2f126f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -81,7 +81,7 @@ end ---@param filters? PlayerVehiclesInternalFilters ---@return PlayerVehicle[] local function getPlayerVehiclesInternal(filters) - local query = 'SELECT id, citizenid, vehicle, mods, plate, garage, state, depotprice FROM player_vehicles' + local query = 'SELECT id, citizenid, vehicle, mods, garage, state, depotprice FROM player_vehicles' local whereClause, placeholders = buildWhereClause(filters) lib.print.debug(query .. whereClause) local results = MySQL.query.await(query .. whereClause, placeholders) @@ -91,7 +91,6 @@ local function getPlayerVehiclesInternal(filters) id = data.id, citizenid = data.citizenid, modelName = data.vehicle, - plate = data.plate, garage = data.garage, state = data.state, depotPrice = data.depotprice,