From f6b8e5157b01cddd30b9e0674c0edc9de977cb42 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 3 Nov 2022 16:43:42 -0700 Subject: requests table --- db/index.js | 1 + db/models/requests.js | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.js | 1 + routes/requests.js | 15 ++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 db/models/requests.js create mode 100644 routes/requests.js diff --git a/db/index.js b/db/index.js index 81c0fe46..749f770b 100644 --- a/db/index.js +++ b/db/index.js @@ -13,6 +13,7 @@ import "./models/invoices"; import "./models/keys"; import "./models/payments"; import "./models/orders"; +import "./models/requests"; import "./models/users"; import "./models/withdrawals"; diff --git a/db/models/requests.js b/db/models/requests.js new file mode 100644 index 00000000..76703a72 --- /dev/null +++ b/db/models/requests.js @@ -0,0 +1,67 @@ +import db from "$db/db"; +import { DataTypes } from '@sequelize/core'; + +const attributes = { + id: { + type: DataTypes.INTEGER(11), + allowNull: false, + defaultValue: null, + primaryKey: true, + autoIncrement: true, + comment: null, + field: "id" + }, + requester_id: { + type: DataTypes.INTEGER(11), + allowNull: true, + defaultValue: null, + primaryKey: false, + autoIncrement: false, + comment: null, + field: "requester_id" + }, + recipient_id: { + type: DataTypes.INTEGER(11), + allowNull: true, + defaultValue: null, + primaryKey: false, + autoIncrement: false, + comment: null, + field: "recipient_id" + }, + memo: { + type: DataTypes.TEXT, + allowNull: true, + defaultValue: null, + primaryKey: false, + autoIncrement: false, + comment: null, + field: "memo" + }, + createdAt: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + primaryKey: false, + autoIncrement: false, + comment: null, + field: "createdAt" + }, + updatedAt: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + primaryKey: false, + autoIncrement: false, + comment: null, + field: "updatedAt" + }, +}; + +const options = { + tableName: "requests", + comment: "", + indexes: [] +}; + +db["Request"] = db.define("requests_model", attributes, options); diff --git a/index.js b/index.js index 0f0ad648..759893dc 100644 --- a/index.js +++ b/index.js @@ -22,6 +22,7 @@ import "./routes/info"; import "./routes/users"; import "./routes/invoices"; import "./routes/payments"; +import "./routes/requests"; import "./routes/lnurl"; import "./routes/tickets"; diff --git a/routes/requests.js b/routes/requests.js new file mode 100644 index 00000000..823e92c1 --- /dev/null +++ b/routes/requests.js @@ -0,0 +1,15 @@ +import app from "$app"; +import db from "$db"; +import { auth } from "$lib/passport"; + +app.post("/requests", auth, async (req, res) => { + try { + let { recipient: username, ...params } = req.body; + let { id: recipient_id } = await db.User.findOne({ where: { username }}); + + let request = await db.Request.create({ recipient_id, ...params }); + res.send(request); + } catch (e) { + res.code(500).send(e.message); + } +}); -- cgit v1.2.3 From c568a0c8fcde181cfcb83fe0e4408d3d602bfc31 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 5 Nov 2022 11:52:31 -0700 Subject: unused param --- routes/lnurl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/lnurl.js b/routes/lnurl.js index f84d8d1f..6fb6a45a 100644 --- a/routes/lnurl.js +++ b/routes/lnurl.js @@ -212,7 +212,7 @@ app.post("/pay", auth, async (req, res, next) => { const { amount, comment, - params: { callback, k1 } + params: { callback } } = req.body; let url = `${callback}${callback.includes("?") ? "&" : "?"}amount=${amount * -- cgit v1.2.3