Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
da158c6
Code done
siddharth-lakhara Feb 9, 2018
5461add
fix conflict
siddharth-lakhara Feb 9, 2018
f92d737
seeds not working
siddharth-lakhara Feb 9, 2018
c2e8e16
OTP generation done, OTP not able to add to DB
siddharth-lakhara Feb 9, 2018
24be4fe
Bug with sequelize
siddharth-lakhara Feb 9, 2018
3d56fb1
OTP sent to user
siddharth-lakhara Feb 10, 2018
20ad17c
Bug with update: Always returns request timed out even when password …
siddharth-lakhara Feb 11, 2018
6eeec0d
Bug fixed
siddharth-lakhara Feb 11, 2018
bba0ff3
problem with tests, rest all done
siddharth-lakhara Feb 11, 2018
c345e1d
Forgot password implemented
siddharth-lakhara Feb 12, 2018
148a059
Final commit
siddharth-lakhara Feb 12, 2018
d429deb
receive money partially implemented
siddharth-lakhara Feb 12, 2018
482e83b
Approve request partially implemented
siddharth-lakhara Feb 12, 2018
7926078
send and request apis added
brahmbhatt Feb 12, 2018
14d9af0
fixed conflixed
brahmbhatt Feb 13, 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
3b4b027
modified server.js for jwt and swagger
siddharth-lakhara Feb 23, 2018
7735daf
merging with userauthentications
siddharth-lakhara Feb 23, 2018
7e1317b
merging with users authentication
siddharth-lakhara Feb 23, 2018
a93f9d5
swagger specs written
siddharth-lakhara Feb 23, 2018
a03dc42
bug with swagger fixed
siddharth-lakhara Feb 23, 2018
95092d7
created the models, migrations and seeder
abishekaditya Feb 23, 2018
fcb9ed5
test written for receive
siddharth-lakhara Feb 23, 2018
93ecd9d
tests for approve
siddharth-lakhara Feb 23, 2018
751e569
updated package json
siddharth-lakhara Feb 23, 2018
f6440c1
Added joi and swagger for add contacts
abishekaditya 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
5fef77c
added tests and code for adding a friend
abishekaditya Feb 23, 2018
8b7d08d
swagger specs and tests verified
siddharth-lakhara Feb 23, 2018
d648444
route and validation and swagger specs complete
ahamedshoaib Feb 23, 2018
2f4a891
created the models, migrations and seeder
abishekaditya Feb 23, 2018
56a4489
test cases added for send money api
brahmbhatt Feb 23, 2018
8e6e23f
testcases added for request money apoi
brahmbhatt Feb 23, 2018
6b3956d
Added joi and swagger for add contacts
abishekaditya Feb 23, 2018
eef922e
added tests and code for adding a friend
abishekaditya Feb 23, 2018
a65dc16
Fixed merge conflict in package json
abishekaditya Feb 23, 2018
c253c4b
joi validation
siddharth-lakhara Feb 23, 2018
94fec9c
merge
ahamedshoaib Feb 23, 2018
aef1c7a
modified config json
siddharth-lakhara Feb 23, 2018
c8d64c2
Fixed Server
brahmbhatt Feb 23, 2018
0bed576
merge margi
ahamedshoaib Feb 23, 2018
fafb860
merge
ahamedshoaib Feb 23, 2018
fd66f09
package lock
ahamedshoaib Feb 23, 2018
3d18abc
user gives new password with OTP
siddharth-lakhara Feb 25, 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
9db8966
modified tests
siddharth-lakhara Feb 26, 2018
af4c4e4
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
60eea83
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
738ad20
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
30b3e5c
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
70c7d20
Merge branch 'ForgetPassword' of https://github.com/TechUniv2018/Wall…
siddharth-lakhara Feb 26, 2018
e54503c
random commit
ahamedshoaib Mar 10, 2018
777bffb
Added routes to get details
abishekaditya Mar 11, 2018
57923ab
modified history to return name along with id
ahamedshoaib Mar 11, 2018
7ad3275
fixed a warning for not using where clause
ahamedshoaib Mar 11, 2018
e34942f
merging history changes
ahamedshoaib Mar 11, 2018
bc0904d
merge
ahamedshoaib Mar 11, 2018
523470d
merge
ahamedshoaib Mar 11, 2018
713b7d1
merge
ahamedshoaib Mar 11, 2018
b3a490e
removed auth from forgot password and made send imediate
ahamedshoaib Mar 11, 2018
75c3581
removed rcv money
ahamedshoaib Mar 11, 2018
23ec8a2
Merged with send and approve
abishekaditya Mar 11, 2018
9485ffc
removed console logs
abishekaditya Mar 11, 2018
0e0fc36
modified return data for FE compatibility
siddharth-lakhara Mar 11, 2018
65ac4ef
added delete contact
ahamedshoaib Mar 11, 2018
017caa2
added get users route
ahamedshoaib Mar 11, 2018
3401d12
Merge demo-test
abishekaditya Mar 11, 2018
33a4c98
Changed the send status and approve transactionID type
abishekaditya Mar 12, 2018
edcd609
corrected from and to id in approve for checking balance
abishekaditya Mar 12, 2018
038f051
addContact route modified
brahmbhatt Mar 14, 2018
256a1b4
changed contact routes
brahmbhatt Mar 16, 2018
8cad433
solved eslint error
brahmbhatt Mar 20, 2018
73ca305
verify otp API modified
brahmbhatt Mar 25, 2018
8ea65fa
simplified path
siddharth-lakhara Mar 25, 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
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"env": {
"jest": true
}
}
}
4 changes: 2 additions & 2 deletions config/config.json
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
27 changes: 27 additions & 0 deletions migrations/20180209081342-create-auth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
'use strict';
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('auths', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
token: {
type: Sequelize.STRING
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('auths');
}
};
29 changes: 29 additions & 0 deletions migrations/20180209140509-create-forgotpassword.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

module.exports = {
up: (queryInterface, Sequelize) => queryInterface.createTable('forgotpasswords', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
userId: {
type: Sequelize.INTEGER,
},
otp: {
type: Sequelize.INTEGER,
},
timestamp: {
type: Sequelize.STRING,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
}),
down: (queryInterface, Sequelize) => queryInterface.dropTable('forgotpasswords'),
};
30 changes: 30 additions & 0 deletions migrations/20180223033914-create-contacts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('contacts', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
userId: {
type: Sequelize.INTEGER
},
friendId: {
type: Sequelize.INTEGER
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('contacts');
}
};
23 changes: 23 additions & 0 deletions migrations/20180223063545-changetype-transaction-id.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@


module.exports = {
up: (queryInterface, Sequelize) => {
queryInterface.changeColumn(
'transactions',
'transactionId',
{
type: Sequelize.STRING,
},
);
},

down: (queryInterface, Sequelize) => {
queryInterface.changeColumn(
'transactions',
'transactionId',
{
type: Sequelize.STRING,
},
);
},
};
14 changes: 14 additions & 0 deletions models/auths.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@


module.exports = (sequelize, DataTypes) => {
const auths = sequelize.define('auths', {
token: DataTypes.STRING,
}, {
classMethods: {
associate(models) {
// associations can be defined here
},
},
});
return auths;
};
11 changes: 11 additions & 0 deletions models/contacts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
var contacts = sequelize.define('contacts', {
userId: DataTypes.INTEGER,
friendId: DataTypes.INTEGER
}, {});
contacts.associate = function(models) {
// associations can be defined here
};
return contacts;
};
15 changes: 15 additions & 0 deletions models/forgotpasswords.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

module.exports = (sequelize, DataTypes) => {
const forgotpasswords = sequelize.define('forgotpasswords', {
userId: DataTypes.INTEGER,
otp: DataTypes.INTEGER,
timestamp: DataTypes.STRING,
}, {
classMethods: {
associate(models) {
// associations can be defined here
},
},
});
return forgotpasswords;
};
Loading