Merge branch '153-savings' into staging

package.json

@@ -1,6 +1,6 @@
 {
   "name": "centsa",
-  "version": "2.15.3",
+  "version": "2.16.0",
   "description": "Centsa money managing solution",
   "main": "src/index.js",
   "directories": {
@@ -16,7 +16,8 @@
     "google-auth-library": "1.5.0",
     "mysql": "2.15.0",
     "otplib": "10.0.1",
-    "supports-color": "5.4.0"
+    "supports-color": "5.4.0",
+    "underscore": "^1.9.1"
   },
   "devDependencies": {
     "chai": "4.1.2",
@@ -29,7 +30,7 @@
   },
   "scripts": {
     "start": "node src/index.js",
-    "dev": "node-dev src/index.js",
+    "dev": "NODE_ENV=debug node-dev --inspect src/index.js",
     "debug": "NODE_ENV=debug node --inspect-brk=9009 src/index.js",
     "test": "DEBUG=centsa:* DB_IP=someip DB_PORT=1234 DB_USER=username DB_PASSWORD=password DB_NAME=testdb nyc mocha test/**/*Test.js --reporter mochawesome",
     "xtest": "DB_IP=someip DB_PORT=1234 DB_USER=username DB_PASSWORD=password DB_NAME=testdb nyc mocha --reporter mochawesome",

sql/setup.sql

@@ -23,8 +23,7 @@ CREATE TABLE notifications
     id BIGINT PRIMARY KEY AUTO_INCREMENT,
     message VARCHAR(500) NOT NULL,
     user_id BIGINT NOT NULL,
-    is_read BOOL NOT NULL DEFAULT FALSE,
-    UNIQUE(message,user_id)
+    is_read BOOL NOT NULL DEFAULT FALSE
 );
 CREATE TABLE usercontrol
 (
@@ -56,6 +55,7 @@ CREATE TABLE accounts
     id BIGINT PRIMARY KEY AUTO_INCREMENT,
     user_id BIGINT NOT NULL,
     name VARCHAR(50) NOT NULL,
+    savings BOOL NOT NULL DEFAULT FALSE,
     UNIQUE(user_id,name),
     FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
 );

sql/update_190118.sql

@@ -0,0 +1,2 @@
+/* #153 savings column  */
+ALTER TABLE accounts ADD COLUMN savings BOOL NOT NULL DEFAULT FALSE;

src/Accounts.js

@@ -1,4 +1,6 @@
 const { Router } = require('express');
+const _ = require('underscore');
+
 const dao = require('./dao/Accounts');
 const log = require('./log');
 
@@ -18,7 +20,6 @@ _route.getAll = (req, resp) => {
                 log.error(err);
                 resp.status(500).send(err);
             } else {
-                result.forEach(a => a.balance = a.balance || 0);
                 req.session.userData.accounts = result;
                 log('returning accounts');
                 resp.send(result);
@@ -29,15 +30,15 @@ _route.getAll = (req, resp) => {
 
 _route.insert = (req, resp) => {
     log('insert account');
-    const account = (({ name, id }) => ({ name, id }))(req.body || {});
+    const account = _.pick(req.body, 'name', 'id', 'savings');
     account['user_id'] = req.session.userData.user_id;
     if (!account.id) {
         delete account.id;
     }
     dao.insert(account, (err, id) => {
         if (err) {
             log.error(err);
-            resp.status(500).send(err);
+            resp.status(500).send(err.errno == 1062 ? 'An account with this name already exists' : err);
         } else {
             const { userData } = req.session;
             userData.accounts = [
@@ -50,9 +51,28 @@ _route.insert = (req, resp) => {
     });
 };
 
+_route.delete = (req, resp) => {
+    log('deleting account');
+    const {
+        params: { id },
+        query: { transfer },
+        session: { userData },
+    } = req;
+    dao.deleteAccount(userData.user_id, id, transfer, err => {
+        if (err) {
+            log.error(err);
+            resp.status(500).send(transfer == -1 && err.errno == 1451 ? "This account is part of a 'savings goal'. Please delete that first from the 'expenses' page" : err);
+        } else {
+            log('deleted account');
+            userData.accounts = userData.accounts.filter(a => a.id != id);
+            resp.sendStatus(201);
+        }
+    });
+};
 
 route.get('/', _route.getAll);
 route.post('/', _route.insert);
+route.delete('/:id', _route.delete);
 
 _route.use('/accounts', route);
 

src/Authentication.js

@@ -1,4 +1,6 @@
 const axios = require('axios');
+const _ = require('underscore');
+
 const Users = require('./Users');
 const UsersDao = require('./dao/Users');
 const log = require('./log');
@@ -192,7 +194,7 @@ const getDetailsFromGoogle = async token => {
         idToken: token,
         audience: CLIENT_ID 
     });
-    return (({name,email})=>({name,email}))(ticket.getPayload() || {});
+    return _.pick(ticket.getPayload(), 'name', 'email');
 };
 
 const getDetailsFromFB = async ({userID, accessToken} = {}) => {

src/Expenses.js

@@ -86,7 +86,7 @@ _route.insert = (req, resp) => {
                 dao.insert(expense, (err, id) => {
                     if (err) {
                         log.error(err);
-                        resp.status(500).send(err);
+                        resp.status(500).send(err.errno == 1062 ? 'An expense with this name already exists' : err);
                     } else {
                         if (expense.automatic) {
                             _route.applyAutoTransactions(true, id, new Date(req.get('x-date')));