Merge 3f33306 into 927c69a

lib/server/routes/coinpayments.js

@@ -29,15 +29,17 @@ inherits(CoinpaymentsRouter, Router);
 CoinpaymentsRouter.prototype._currentPrice = function () {
   return axios.get('https://min-api.cryptocompare.com/data/price?fsym=STORJ&tsyms=USD')
     .then((res) => {
-      const current_price = res.data.USD;
-      if (!current_price) {
-        return constants.STORJ_FALLBACK_PRICE
+      let currentPrice;
+      currentPrice = res.data.USD;
+
+      if (!currentPrice) {
+        currentPrice = constants.STORJ_FALLBACK_PRICE
       }
-      return current_price;
+      return currentPrice;
     })
     .catch((err) => {
       log.error('error getting STORJ price', err)
-      return current_price;
+      return constants.STORJ_FALLBACK_PRICE;
     });
 }
 
@@ -163,7 +165,7 @@ CoinpaymentsRouter.prototype.handleIPN = function (req, res) {
   }
 
   if (req.body.currency === 'ETH') {
-    return res.status(501).send(errors.NotImplementedError('bitcoin payments not supported at this time.'));
+    return res.status(501).send(errors.NotImplementedError('ethereum payments not supported at this time.'));
   }
 }
 

lib/server/routes/credits.js

@@ -43,7 +43,7 @@ CreditsRouter.prototype.handleSignups = function (req, res) {
       console.log('Error creating signup marketing: ', err);
       return res.status(500).send(err);
     }
-    console.log('CREATED MARKETING DOC: ', marketing);
+
     if (req.body.referralLink) {
       return self.handleReferralSignup(req, res);
     }

lib/server/routes/debits.js

@@ -7,8 +7,6 @@ const middleware = require('storj-service-middleware');
 const errors = require('storj-service-error-types');
 const logger = require('../../logger');
 
-// TODO: duplicated from service-storge-models `PaymentProcessor`
-
 function DebitsRouter(options) {
   if (!(this instanceof DebitsRouter)) {
     return new DebitsRouter(options);
@@ -102,23 +100,19 @@ DebitsRouter.prototype.getDebits = function(req, res, next) {
     return Debit.find({ user: req.user.id })
       .then((debits) => {
         const debitObjects = debits.map((debit) => debit.toObject());
-        res.status(200).send(debitObjects);
+        return res.status(200).send(debitObjects);
       })
       .catch((err) => next(new errors.InternalError(err.message)));
   }
 
-  Debit.find({
+  return Debit.find({
     user: req.user.id,
     created: {
       $gte: req.query.startDate,
       $lt: req.query.endDate
-    }
-  }, function(err, debits) {
-    if (err) {
-      return next(new errors.InternalError(err.message));
-    }
-    res.status(200).send(debits.map(debit => debit.toObject()));
-  })
+    }})
+    .then((debits) => res.status(200).send(debits.map(debit => debit.toObject())))
+    .catch((err) => next(new errors.InternalError(err.message)));
 };
 
 DebitsRouter.prototype._getBillingPeriodFor = function(referenceMoment = moment.utc(),