diff options
| -rw-r--r-- | db/index.js | 51 | ||||
| -rw-r--r-- | db/models/accounts.js | 2 | ||||
| -rw-r--r-- | db/models/codes.js | 2 | ||||
| -rw-r--r-- | db/models/deposits.js | 2 | ||||
| -rw-r--r-- | db/models/invoices.js | 2 | ||||
| -rw-r--r-- | db/models/keys.js | 2 | ||||
| -rw-r--r-- | db/models/orders.js | 2 | ||||
| -rw-r--r-- | db/models/payments.js | 2 | ||||
| -rw-r--r-- | db/models/referrals.js | 2 | ||||
| -rw-r--r-- | db/models/users.js | 2 | ||||
| -rw-r--r-- | db/models/waiting_list.js | 2 | ||||
| -rw-r--r-- | db/models/withdrawals.js | 2 | ||||
| -rw-r--r-- | index.js | 2 | ||||
| -rw-r--r-- | routes/assets.js | 3 | ||||
| -rw-r--r-- | routes/users.js | 1 |
15 files changed, 28 insertions, 51 deletions
diff --git a/db/index.js b/db/index.js index e37bae2a..a7d7c25c 100644 --- a/db/index.js +++ b/db/index.js @@ -1,54 +1,27 @@ import Sequelize from '@sequelize/core'; -import db from "/db"; +import db from "$db/db"; db.authenticate().catch((err) => { console.debug("Error connecting to database: " + err.message); console.log(dbOptions.connection.database + "." + dbOptions.connection.user); }); -import '/db/models/accounts'; -import '/db/models/codes'; -import '/db/models/deposits'; -import '/db/models/invoices'; -import '/db/models/keys'; -import '/db/models/payments'; -import '/db/models/orders'; -import '/db/models/users'; -import '/db/models/withdrawals'; +import './models/accounts'; +import './models/codes'; +import './models/deposits'; +import './models/invoices'; +import './models/keys'; +import './models/payments'; +import './models/orders'; +import './models/users'; +import './models/withdrawals'; -// Require models in order (to enable FK relationship specs in models) - -// require("./normalized/users.js"); -// require("./normalized/user_keys.js"); -// require("./normalized/user_preferences.js"); - -import '/db/models/referrals'; - -import '/db/models/waiting_list'; - -// require("./normalized/subscriptions.js"); -// require("./normalized/user_subscriptions.js"); - -// require("./normalized/assets.js"); -// require("./normalized/codes.js"); -// require("./normalized/currencies.js"); -// require("./normalized/networks.js"); -// require("./normalized/institutions.js"); - -// require("./normalized/accounts.js"); -// require("./normalized/non_custodial_accounts.js"); -// require("./normalized/deposits.js"); -// require("./normalized/withdrawals.js"); -// require("./normalized/payments.js"); - -// ** Need to add ? *** -// require("./normalized/orders.js"); -// require("./normalized/invoices.js"); +import './models/referrals'; +import './models/waiting_list'; const { User, Account, Payment, Invoice, Key, Order, Referral } = db; -// move relationships to specfic models User.hasMany(Account, { as: "accounts", foreignKey: "user_id", diff --git a/db/models/accounts.js b/db/models/accounts.js index 2bcdbe61..9485bc99 100644 --- a/db/models/accounts.js +++ b/db/models/accounts.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/codes.js b/db/models/codes.js index 1f15135e..0981ac5e 100644 --- a/db/models/codes.js +++ b/db/models/codes.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/deposits.js b/db/models/deposits.js index 5053e60a..c486f468 100644 --- a/db/models/deposits.js +++ b/db/models/deposits.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/invoices.js b/db/models/invoices.js index 9ecb63a4..9b68fc9a 100644 --- a/db/models/invoices.js +++ b/db/models/invoices.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/keys.js b/db/models/keys.js index 5d32c880..5a5fda0c 100644 --- a/db/models/keys.js +++ b/db/models/keys.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/orders.js b/db/models/orders.js index 71483a64..50a74c40 100644 --- a/db/models/orders.js +++ b/db/models/orders.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/payments.js b/db/models/payments.js index 5e063397..b3ac0b74 100644 --- a/db/models/payments.js +++ b/db/models/payments.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/referrals.js b/db/models/referrals.js index 561135dc..8aebde2e 100644 --- a/db/models/referrals.js +++ b/db/models/referrals.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/users.js b/db/models/users.js index 46577074..c17805e4 100644 --- a/db/models/users.js +++ b/db/models/users.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/waiting_list.js b/db/models/waiting_list.js index f1a4de3d..37f2889b 100644 --- a/db/models/waiting_list.js +++ b/db/models/waiting_list.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { diff --git a/db/models/withdrawals.js b/db/models/withdrawals.js index a9b02654..fa2afb22 100644 --- a/db/models/withdrawals.js +++ b/db/models/withdrawals.js @@ -1,4 +1,4 @@ -import db from "/db"; +import db from "$db/db"; import { DataTypes } from '@sequelize/core'; const attributes = { @@ -4,6 +4,7 @@ import config from "./config/index"; import store from "./lib/store"; import { l } from "./lib/logging"; +import "./db"; import "./lib/sockets"; import "./lib/webhooks"; import "./lib/passport"; @@ -14,6 +15,7 @@ import "./lib/sync"; import "./routes/assets"; import "./routes/info"; import "./routes/users"; + // if (config.bitcoin) store.networks.push("bitcoin"); // if (config.liquid) store.networks.push("liquid"); // if (config.lna) store.networks.push("lightning"); diff --git a/routes/assets.js b/routes/assets.js index eaf15398..4ff2577c 100644 --- a/routes/assets.js +++ b/routes/assets.js @@ -1,4 +1,6 @@ import store from "$lib/store"; +import db from "$db"; +import config from "$config"; import app from "$app"; import { auth } from "$lib/passport"; import axios from 'axios'; @@ -30,7 +32,6 @@ let fetchAssets; app.get( "/assets", async (req, res) => { - throw new Error("BOOM"); if (store.assets) { const accounts = await db.Account.findAll({ // group: ["asset"] diff --git a/routes/users.js b/routes/users.js index 7a8c6785..c6a8ec6a 100644 --- a/routes/users.js +++ b/routes/users.js @@ -13,6 +13,7 @@ import { fromBase58, fromPrivateKey } from "bip32"; import { Mutex } from "async-mutex"; import bip32 from "bip32"; import whitelist from "$lib/whitelist"; +import { l, err, warn } from "$lib/logging"; const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {}); |