aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRan Guin <[email protected]>2021-05-11 19:02:36 -0700
committerAdam Soltys <[email protected]>2021-06-04 22:38:18 -0700
commit23fb7ff1c291935ae2873fec18cc188126fdcfac (patch)
tree9cd290b9b35f46743c7035d3a006245c03ed7b70
parent8992522a3c3781b83ad3e61e8118e981a0cbf6e6 (diff)
downloadcoinos-server-23fb7ff1c291935ae2873fec18cc188126fdcfac.tar.gz
coinos-server-23fb7ff1c291935ae2873fec18cc188126fdcfac.zip
prep for normalized models; fix typo
-rw-r--r--config/samples/private.json6
-rw-r--r--db/index.js27
2 files changed, 29 insertions, 4 deletions
diff --git a/config/samples/private.json b/config/samples/private.json
index e56a5906..b08cabee 100644
--- a/config/samples/private.json
+++ b/config/samples/private.json
@@ -23,11 +23,11 @@
"BITCOIN_KEY": "*****",
"LIQUID_KEY": "*****",
- "VAPID_KEY": "*****"
+ "VAPID_KEY": "*****",
"facebook": {
"appToken": "****",
- "specialFriend": "****",
- },
+ "specialFriend": "****"
+ }
}
diff --git a/db/index.js b/db/index.js
index 197a7f86..727ad8b2 100644
--- a/db/index.js
+++ b/db/index.js
@@ -1,5 +1,9 @@
const Sequelize = require("sequelize");
-const conf = config.dbOptions;
+const conf = config.dbOptions[process.env.NODE_ENV || "development"];
+const debug = require('debug')('db')
+
+debug('opt: ', JSON.stringify(conf))
+debug('dialect: ', JSON.stringify(conf.dialectOptions))
db = new Sequelize(conf.database, conf.username, conf.password, {
host: conf.host,
@@ -18,6 +22,27 @@ require("./models/orders.js");
require("./models/users.js");
require("./models/withdrawals.js");
+// require("./normalized/accounts.js");
+// require("./normalized/assets.js");
+// require("./normalized/codes.js");
+// require("./normalized/currencies.js");
+// require("./normalized/deposits.js");
+// require("./normalized/institutions.js");
+// require("./normalized/networks.js");
+// require("./normalized/non_custodial_accounts.js");
+// require("./normalized/payments.js");
+require("./normalized/referrals.js");
+// require("./normalized/user_keys.js");
+// require("./normalized/user_preferences.js");
+// require("./normalized/user_subscriptions.js");
+// require("./normalized/users.js");
+require("./normalized/waiting_list.js");
+// require("./normalized/withdrawals.js");
+
+// ** Need to add ? ***
+// require("./normalized/orders.js");
+// require("./normalized/invoices.js");
+
const { User, Account, Payment, Invoice, Key, Order } = db;
User.hasMany(Account, {