diff --git a/server/swagger.json b/server/swagger.json index edfda99..c6878c9 100644 --- a/server/swagger.json +++ b/server/swagger.json @@ -14,7 +14,7 @@ "v1/auth/signup": { "post": { "tags": [ - "Signup" + "Auth" ], "summary": "Users can signup", "description": "this endpoint uses get request to create users", @@ -65,7 +65,7 @@ "v1/auth/signup/addstaff": { "post": { "tags": [ - "Signup" + "Auth" ], "summary": "Admin can signup staffs", "description": "this endpoint uses get request to create users", @@ -135,7 +135,7 @@ "v1/auth/signin": { "post": { "tags": [ - "Signin" + "Auth" ], "summary": "Users can signup", "description": "this endpoint uses get request to create users", diff --git a/server/v1/model/transaction.js b/server/v1/model/transaction.js new file mode 100644 index 0000000..6538568 --- /dev/null +++ b/server/v1/model/transaction.js @@ -0,0 +1,10 @@ +export default class Transaction { + constructor() { + this.transactionId = null; + this.accountNumber = null; + this.amount = null; + this.cashier = null; // cashier id + this.transactionType = null; // credit or debit + this.accountBalance = null; + } +} diff --git a/server/v1/services/accounts.js b/server/v1/services/accounts.js index ebf8519..5e31f4a 100644 --- a/server/v1/services/accounts.js +++ b/server/v1/services/accounts.js @@ -18,7 +18,7 @@ const CreateAccountService = { // pulling users data from database const userDetails = await dbConnection - .dbConnect('SELECT id,firstname,lastname FROM users WHERE email=$1', + .dbConnect('SELECT * FROM users WHERE email=$1', [userData.email]); const { firstname, lastname, id } = userDetails.rows[0]; diff --git a/server/v1/services/transaction.js b/server/v1/services/transaction.js index 3c22b0f..970921e 100644 --- a/server/v1/services/transaction.js +++ b/server/v1/services/transaction.js @@ -33,9 +33,7 @@ const TransactionService = { ); const { accountnumber, balance } = accountDbData.rows[0]; - // check if a string - const checkForDigit = /^-?\d+\.?\d*$/; - if (checkForDigit.test(transactionData.amount)) { + if (typeof transactionData.amount === 'number') { // substract the passed in amount from the current balance const newBalance = balance - transactionData.amount; @@ -132,9 +130,7 @@ const TransactionService = { ); const { accountnumber, balance } = accountDbData.rows[0]; - // check if a string - const checkForDigit = /^-?\d+\.?\d*$/; - if (checkForDigit.test(transactionData.amount)) { + if (typeof transactionData.amount === 'number') { if (transactionData.amount <= 0) { returnStatus = 422; returnError = 'please credit an account with positive value';