Skip to content

Commit

Permalink
feature(Delete account data from database when deleted):Delete accoun…
Browse files Browse the repository at this point in the history
…t data from database when deleted

Delete account data from database when staff or admin delete an account, the account transacions should be deleted from the database
[Starts #165619691]
  • Loading branch information
Cavdy committed Apr 25, 2019
1 parent 8a4290b commit c500ea0
Show file tree
Hide file tree
Showing 6 changed files with 344 additions and 316 deletions.
119 changes: 61 additions & 58 deletions server/v1/config/database.js
Original file line number Diff line number Diff line change
@@ -1,58 +1,61 @@
import { Pool } from 'pg';
import debug from 'debug';
import { parse } from 'pg-connection-string';

let conString;

if (process.env.HEROKU_ACCESS === 'heroku_access') {
conString = parse(process.env.BANKA_DB);
} else {
conString = parse(process.env.DB_CONFIG);
}

const pool = new Pool(conString);

const dbConnection = {
/**
* Connect to database
* @constructor
* @param {*} passedQuery - passed in SQL query.
* @param {*} passedData -passed in db values
*/
async dbConnect(passedQuery, passedData) {
try {
return (async () => {
const client = await pool.connect();
try {
return await client.query(passedQuery, passedData);
} finally {
client.release();
}
})();
} catch (e) {
return debug('query')(e.stack);
}
},

/**
* Connect to database - For test
* @constructor
* @param {*} passedQuery - passed in SQL query.
*/
async dbTesting(passedQuery) {
try {
return (async () => {
const client = await pool.connect();
try {
return await client.query(passedQuery);
} finally {
client.release();
}
})();
} catch (e) {
return debug('query')(e.stack);
}
},
};

export default dbConnection;
import { Pool } from 'pg';
import dotenv from 'dotenv';
import debug from 'debug';
import { parse } from 'pg-connection-string';

dotenv.config();

let conString;

if (process.env.HEROKU_ACCESS === 'heroku_access') {
conString = parse(process.env.BANKA_DB);
} else {
conString = parse(process.env.DB_CONFIG);
}

const pool = new Pool(conString);

const dbConnection = {
/**
* Connect to database
* @constructor
* @param {*} passedQuery - passed in SQL query.
* @param {*} passedData -passed in db values
*/
async dbConnect(passedQuery, passedData) {
try {
return (async () => {
const client = await pool.connect();
try {
return await client.query(passedQuery, passedData);
} finally {
client.release();
}
})();
} catch (e) {
return debug('query')(e.stack);
}
},

/**
* Connect to database - For test
* @constructor
* @param {*} passedQuery - passed in SQL query.
*/
async dbTesting(passedQuery) {
try {
return (async () => {
const client = await pool.connect();
try {
return await client.query(passedQuery);
} finally {
client.release();
}
})();
} catch (e) {
return debug('query')(e.stack);
}
},
};

export default dbConnection;
20 changes: 15 additions & 5 deletions server/v1/routes/accounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ const router = express.Router();

// creating our routes
router.get('/', jwtMiddleware.verifyJwt, AccountsController.allAccounts);
router.get('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.specificAccounts);
router.get('/:accountNumber/transactions', jwtMiddleware.verifyJwt, AccountsController.allAccountTransaction);
router.post('/', jwtMiddleware.verifyJwt, AccountsController.createAccount);
router.patch('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.patchAccount);
router.delete('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.deleteAccount);
router.get('/:accountNumber',
jwtMiddleware.verifyJwt,
AccountsController.specificAccounts);
router.get('/:accountNumber/transactions',
jwtMiddleware.verifyJwt,
AccountsController.allAccountTransaction);
router.post('/',
jwtMiddleware.verifyJwt,
AccountsController.createAccount);
router.patch('/:accountNumber',
jwtMiddleware.verifyJwt,
AccountsController.patchAccount);
router.delete('/:accountNumber',
jwtMiddleware.verifyJwt,
AccountsController.deleteAccount);

export default router;
6 changes: 5 additions & 1 deletion server/v1/routes/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ const router = express.Router();
// creating our routes
router.post('/signin', jwtMiddleware.signinJwt, AuthController.loginUser);
router.post('/signup', jwtMiddleware.signinJwt, AuthController.registerUser);
router.post('/signup/addstaff', jwtMiddleware.checkToken, jwtMiddleware.signinJwt, jwtMiddleware.verifyJwt, AuthController.createStaffs);
router.post('/signup/addstaff',
jwtMiddleware.checkToken,
jwtMiddleware.signinJwt,
jwtMiddleware.verifyJwt,
AuthController.createStaffs);

export default router;
12 changes: 9 additions & 3 deletions server/v1/routes/transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ import TransactionController from '../controllers/transaction';
const router = express.Router();

// creating our routes
router.get('/:transactionid', jwtMiddleware.verifyJwt, TransactionController.getSpecificTransaction);
router.post('/:accountNumber/debit', jwtMiddleware.verifyJwt, TransactionController.debitTransaction);
router.post('/:accountNumber/credit', jwtMiddleware.verifyJwt, TransactionController.creditTransaction);
router.get('/:transactionid',
jwtMiddleware.verifyJwt,
TransactionController.getSpecificTransaction);
router.post('/:accountNumber/debit',
jwtMiddleware.verifyJwt,
TransactionController.debitTransaction);
router.post('/:accountNumber/credit',
jwtMiddleware.verifyJwt,
TransactionController.creditTransaction);

export default router;
4 changes: 3 additions & 1 deletion server/v1/routes/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ const router = express.Router();

// creating our routes
router.get('/', jwtMiddleware.verifyJwt, UsersController.getAllUsers);
router.get('/:email/accounts', jwtMiddleware.verifyJwt, UsersController.getUsersAccounts);
router.get('/:email/accounts',
jwtMiddleware.verifyJwt,
UsersController.getUsersAccounts);
router.delete('/:id', jwtMiddleware.verifyJwt, UsersController.deleteUser);

export default router;
Loading

0 comments on commit c500ea0

Please sign in to comment.