diff --git a/com/Unit/Create.lua b/com/Unit/Create.lua index d770823..69292c1 100644 --- a/com/Unit/Create.lua +++ b/com/Unit/Create.lua @@ -15,6 +15,7 @@ local crypt = require("internal.crypt.bcrypt") local sha256 = require("internal.crypt.sha256") local common = require("com/Unit/_common") +local errors = require("com/Unit/_errors") -- Preparing for first db query local function close_db() @@ -30,7 +31,7 @@ local params = session.request.params.get() local ok, mp = common.CheckMissingElement({"username", "password", "email"}, params) if not ok then close_db() - session.response.send_error(-32602, "Missing params", mp) + session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp) end local hashPass = crypt.generate(params.password, crypt.DefaultCost) @@ -57,7 +58,7 @@ end if existing and #existing > 0 then close_db() - session.response.send_error(-32101, "Unit is already exists") + session.response.send_error(errors.UNIT_EXISTS.code, errors.UNIT_EXISTS.message) end -- Second db query: insert new unit @@ -73,14 +74,14 @@ local ctx, err = db:exec( if err ~= nil then log.error("Insert failed: "..tostring(err)) 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 local res, err = ctx:wait() if err ~= nil then log.error("Insert confirmation failed: "..tostring(err)) 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 close_db() diff --git a/com/Unit/Delete.lua b/com/Unit/Delete.lua index be3f96b..d272b65 100644 --- a/com/Unit/Delete.lua +++ b/com/Unit/Delete.lua @@ -9,6 +9,7 @@ local db = require("internal.database.sqlite").connect("db/unit.db", {log = true local session = require("internal.session") local common = require("com/Unit/_common") +local errors = require("com/Unit/_errors") -- Preparing for first db query local function close_db() @@ -24,7 +25,7 @@ local params = session.request.params.get() local ok, mp = common.CheckMissingElement({"user_id"}, params) if not ok then close_db() - session.response.send_error(-32602, "Missing params", mp) + session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp) end local existing, err = db:query([[ @@ -46,7 +47,7 @@ end if existing and #existing == 0 then 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 local ctx, err = db:exec( @@ -62,14 +63,14 @@ local ctx, err = db:exec( if err ~= nil then log.error("Soft delete failed: " .. tostring(err)) 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 local res, err = ctx:wait() if err ~= nil then log.error("Soft delete confirmation failed: " .. tostring(err)) 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 close_db() diff --git a/com/Unit/Get.lua b/com/Unit/Get.lua index 898c331..d89710f 100644 --- a/com/Unit/Get.lua +++ b/com/Unit/Get.lua @@ -9,6 +9,7 @@ local db = require("internal.database.sqlite").connect("db/unit.db", {log = true local session = require("internal.session") local common = require("com/Unit/_common") +local errors = require("com/Unit/_errors") -- Preparing for first db query local function close_db() @@ -24,12 +25,12 @@ local params = session.request.params.get() local ok, mp = common.CheckMissingElement({"by", "value"}, params) if not ok then close_db() - session.response.send_error(-32602, "Missing params", mp) + session.response.send_error(errors.MISSING_PARAMS.code, errors.MISSING_PARAMS.message, mp) end if not (params.by == "email" or params.by == "username" or params.by == "user_id") then 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 local unit, err = db:query_row( @@ -42,12 +43,12 @@ local unit, err = db:query_row( if err then close_db() log.error("DB query error: " .. tostring(err)) - session.response.send_error("Database query failed") + session.response.send_error() end if not unit then 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 close_db()