Jessedbrown commited on
Commit
dbfa4ed
·
2 Parent(s): cae70c51c85752

Merge pull request #2 from lourencopassos/develop

Browse files
api/package.json CHANGED
@@ -6,7 +6,8 @@
6
  "scripts": {
7
  "test": "jest --forceExit",
8
  "start": "ts-node ./src/index.ts",
9
- "build": "tsc"
 
10
  },
11
  "repository": {
12
  "type": "git",
 
6
  "scripts": {
7
  "test": "jest --forceExit",
8
  "start": "ts-node ./src/index.ts",
9
+ "build": "tsc",
10
+ "migrate:up": "migrate-mongo up"
11
  },
12
  "repository": {
13
  "type": "git",
api/src/business/wallet-business.ts CHANGED
@@ -16,7 +16,7 @@ export class WalletBusiness {
16
  }
17
 
18
 
19
- async getStatement(user_id: string, skip: number, limit: 10, order_by: number) {
20
 
21
  if (!user_id) {
22
  return new MissingParameterError('user_id')
@@ -28,7 +28,7 @@ export class WalletBusiness {
28
  return new InvalidParameterError('user_id')
29
  }
30
 
31
- const userExists = UserModel.findById({ id: user_id })
32
 
33
  if (!userExists) {
34
  return new NotFoundError()
 
16
  }
17
 
18
 
19
+ async getStatement(user_id: string, skip: number, limit: number, order_by: number) {
20
 
21
  if (!user_id) {
22
  return new MissingParameterError('user_id')
 
28
  return new InvalidParameterError('user_id')
29
  }
30
 
31
+ const userExists = await this.userDatabase.getUserById(user_id)
32
 
33
  if (!userExists) {
34
  return new NotFoundError()
api/src/controller/wallet-controller.ts CHANGED
@@ -9,7 +9,9 @@ export class WalletController {
9
  try {
10
  const user_id = req.params.user_id
11
 
12
- const { limit, skip, order_by } = req.query as any;
 
 
13
 
14
  const walletDatabase = new WalletDatabase()
15
  const userDatabase = new UserDatabase()
 
9
  try {
10
  const user_id = req.params.user_id
11
 
12
+ const skip = Number(req.query.skip)
13
+ const limit = Number(req.query.limit)
14
+ const order_by = Number(req.query.order_by)
15
 
16
  const walletDatabase = new WalletDatabase()
17
  const userDatabase = new UserDatabase()
api/src/router/walletRouter.ts CHANGED
@@ -5,5 +5,5 @@ export const walletRouter = express.Router()
5
  const controller = new WalletController()
6
 
7
 
8
- walletRouter.get('/:userId', controller.getStatement);
9
  walletRouter.post('/', controller.handleTransaction);
 
5
  const controller = new WalletController()
6
 
7
 
8
+ walletRouter.get('/:user_id', controller.getStatement);
9
  walletRouter.post('/', controller.handleTransaction);