alex/GoSally
2
0
Fork 0
mirror of https://github.com/akyaiy/GoSally-mvp.git synced 2026-01-03 04:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

move error messages to variables

Browse Source
This commit is contained in:
Alexey
2025-10-10 19:26:57 +03:00
parent 5d49e0afc7
commit ba47ee4219
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
com/Unit/Create.lua
View File

@@ -15,6 +15,7 @@ local crypt = require("internal.crypt.bcrypt")
local sha256 = require("internal.crypt.sha256") local sha256 = require("internal.crypt.sha256")
local common = require("com/Unit/_common") local common = require("com/Unit/_common")
local errors = require("com/Unit/_errors")
-- Preparing for first db query -- Preparing for first db query
local function close_db() local function close_db()
@@ -30,7 +31,7 @@ local params = session.request.params.get()
local ok, mp = common.CheckMissingElement({"username", "password", "email"}, params) local ok, mp = common.CheckMissingElement({"username", "password", "email"}, params)
if not ok then if not ok then
close_db() close_db()
session.response.send_error(-32602, "Missing params", mp) session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp)
end end
local hashPass = crypt.generate(params.password, crypt.DefaultCost) local hashPass = crypt.generate(params.password, crypt.DefaultCost)
@@ -57,7 +58,7 @@ end
if existing and #existing > 0 then if existing and #existing > 0 then
close_db() close_db()
session.response.send_error(-32101, "Unit is already exists") session.response.send_error(errors.UNIT_EXISTS.code, errors.UNIT_EXISTS.message)
end end
-- Second db query: insert new unit -- Second db query: insert new unit
@@ -73,14 +74,14 @@ local ctx, err = db:exec(
if err ~= nil then if err ~= nil then
log.error("Insert failed: "..tostring(err)) log.error("Insert failed: "..tostring(err))
close_db() close_db()
session.response.send_error("Failed to create unit") session.response.send_error(errors.DB_INSERT_FAILED.code, errors.DB_INSERT_FAILED.message)
end end
local res, err = ctx:wait() local res, err = ctx:wait()
if err ~= nil then if err ~= nil then
log.error("Insert confirmation failed: "..tostring(err)) log.error("Insert confirmation failed: "..tostring(err))
close_db() close_db()
session.response.send_error("Failed to create unit") session.response.send_error(errors.DB_INSERT_FAILED.code, errors.DB_INSERT_FAILED.message)
end end
close_db() close_db()

9
com/Unit/Delete.lua
View File

@@ -9,6 +9,7 @@ local db = require("internal.database.sqlite").connect("db/unit.db", {log = true
local session = require("internal.session") local session = require("internal.session")
local common = require("com/Unit/_common") local common = require("com/Unit/_common")
local errors = require("com/Unit/_errors")
-- Preparing for first db query -- Preparing for first db query
local function close_db() local function close_db()
@@ -24,7 +25,7 @@ local params = session.request.params.get()
local ok, mp = common.CheckMissingElement({"user_id"}, params) local ok, mp = common.CheckMissingElement({"user_id"}, params)
if not ok then if not ok then
close_db() close_db()
session.response.send_error(-32602, "Missing params", mp) session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp)
end end
local existing, err = db:query([[ local existing, err = db:query([[
@@ -46,7 +47,7 @@ end
if existing and #existing == 0 then if existing and #existing == 0 then
close_db() close_db()
session.response.send_error(-32102, "Unit is not exists") session.response.send_error(errors.UNIT_NOT_FOUND.code, errors.UNIT_NOT_FOUND.message)
end end
local ctx, err = db:exec( local ctx, err = db:exec(
@@ -62,14 +63,14 @@ local ctx, err = db:exec(
if err ~= nil then if err ~= nil then
log.error("Soft delete failed: " .. tostring(err)) log.error("Soft delete failed: " .. tostring(err))
close_db() close_db()
session.response.send_error("Failed to delete unit") session.response.send_error(errors.DB_DELETE_FAILED.code, errors.DB_DELETE_FAILED.message)
end end
local res, err = ctx:wait() local res, err = ctx:wait()
if err ~= nil then if err ~= nil then
log.error("Soft delete confirmation failed: " .. tostring(err)) log.error("Soft delete confirmation failed: " .. tostring(err))
close_db() close_db()
session.response.send_error("Failed to delete unit") session.response.send_error(errors.DB_DELETE_FAILED.code, errors.DB_DELETE_FAILED.message)
end end
close_db() close_db()

9
com/Unit/Get.lua
View File

@@ -9,6 +9,7 @@ local db = require("internal.database.sqlite").connect("db/unit.db", {log = true
local session = require("internal.session") local session = require("internal.session")
local common = require("com/Unit/_common") local common = require("com/Unit/_common")
local errors = require("com/Unit/_errors")
-- Preparing for first db query -- Preparing for first db query
local function close_db() local function close_db()
@@ -24,12 +25,12 @@ local params = session.request.params.get()
local ok, mp = common.CheckMissingElement({"by", "value"}, params) local ok, mp = common.CheckMissingElement({"by", "value"}, params)
if not ok then if not ok then
close_db() close_db()
session.response.send_error(-32602, "Missing params", mp) session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp)
end end
if not (params.by == "email" or params.by == "username" or params.by == "user_id") then if not (params.by == "email" or params.by == "username" or params.by == "user_id") then
close_db() close_db()
session.response.send_error(-32602, "Invalid 'by' param") session.response.send_error(errors.INVALID_BY_PARAM.code, errors.INVALID_BY_PARAM.message)
end end
local unit, err = db:query_row( local unit, err = db:query_row(
@@ -42,12 +43,12 @@ local unit, err = db:query_row(
if err then if err then
close_db() close_db()
log.error("DB query error: " .. tostring(err)) log.error("DB query error: " .. tostring(err))
session.response.send_error("Database query failed") session.response.send_error()
end end
if not unit then if not unit then
close_db() close_db()
session.response.send_error(-32102, "Unit is not exists") session.response.send_error(errors.UNIT_NOT_FOUND.code, errors.UNIT_NOT_FOUND.message)
end end
close_db() close_db()