Skip to content

Rcv money #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siddharth-lakhara wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Rcv money #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d429deb
receive money partially implemented
siddharth-lakhara Feb 12, 2018
482e83b
Approve request partially implemented
siddharth-lakhara Feb 12, 2018
f63f64d
Merge branch 'user-authentication' into rcv_money
siddharth-lakhara Feb 13, 2018
156828e
Modified config JSON for local
siddharth-lakhara Feb 13, 2018
66fa1c2
added userId from auth
siddharth-lakhara Feb 22, 2018
c6fbc8a
removed blockedMoney Table
siddharth-lakhara Feb 22, 2018
403861b
written joi validation
siddharth-lakhara Feb 22, 2018
fffa8d3
seeders made for transaction table
siddharth-lakhara Feb 22, 2018
ecfa893
added tests
siddharth-lakhara Feb 22, 2018
929d403
tested without auths
siddharth-lakhara Feb 22, 2018
66f3dcc
joi validation done, swagger added
siddharth-lakhara Feb 23, 2018
fd50d14
swagger
siddharth-lakhara Feb 23, 2018
a03dc42
bug with swagger fixed
siddharth-lakhara Feb 23, 2018
fcb9ed5
test written for receive
siddharth-lakhara Feb 23, 2018
93ecd9d
tests for approve
siddharth-lakhara Feb 23, 2018
2dc065a
updated package json
siddharth-lakhara Feb 23, 2018
ca098d4
Merge branch 'rcv_money' of https://github.com/TechUniv2018/WalletPro…
siddharth-lakhara Feb 23, 2018
aef1c7a
modified config json
siddharth-lakhara Feb 23, 2018
e508c7f
modified recieve to use transaction id
siddharth-lakhara Feb 25, 2018
d0c2c90
modified approve to use transaction id
siddharth-lakhara Feb 25, 2018
0a85d87
modified tests
siddharth-lakhara Feb 26, 2018
738ad20
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
601b95e
updating with socket-send
siddharth-lakhara Mar 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"development": {
"username": "teamsix",
"password": null,
"password": "root",
"database": "wallet_development",
"host": "127.0.0.1",
"dialect": "postgres"
},
"test": {
"username": "teamsix",
"password": null,
"password": "root",
"database": "wallet_test",
"host": "127.0.0.1",
"dialect": "postgres"
Expand Down
Loading