Skip to content

Commit 0478f23

Browse files
committed
Logs for heroku test
1 parent 1d9655b commit 0478f23

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

api/src/app/routes/controllers/DebitsController.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ class DebitsController {
66
const { startDate, endDate } = req.query;
77
const { userid } = req.headers;
88

9+
console.log('Going to access DebitsService!');
10+
911
const debits = await DebitsService.index(startDate, endDate, userid);
1012

13+
console.log('Returning data from API');
14+
1115
return res.json(debits);
1216
}
1317

api/src/app/services/DebitsService.js

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
const {
2-
Debit,
3-
Credit,
4-
User,
5-
Sequelize,
6-
} = require('../../database/models');
1+
const { Debit, Credit, User, Sequelize } = require('../../database/models');
72

8-
const order = [
9-
['date', 'DESC'],
10-
];
3+
const order = [['date', 'DESC']];
114

125
class DebitsService {
136
async index(startDate, endDate, userId) {
7+
console.log('startDate: ', startDate);
8+
console.log('endDate: ', endDate);
9+
console.log('userId: ', userId);
10+
1411
const newEndDate = new Date(endDate);
12+
console.log('newEndDate: ', newEndDate);
1513
newEndDate.setDate(newEndDate.getDate() + 1);
14+
console.log('newEndDate after add: ', newEndDate);
1615

1716
const where = {
1817
user_id: userId,
1918
date: {
2019
[Sequelize.Op.and]: {
2120
[Sequelize.Op.gte]: startDate,
22-
[Sequelize.Op.lte]: newEndDate,
23-
},
24-
},
21+
[Sequelize.Op.lte]: newEndDate
22+
}
23+
}
2524
};
2625

26+
console.log('Going to access database!');
27+
2728
const debit = await Debit.findAll({ where, order });
2829

2930
return debit;
@@ -85,16 +86,20 @@ class DebitsService {
8586

8687
async getAllByCurrentMonth(userId) {
8788
const currentDay = new Date();
88-
const firstDayCurrentMonth = new Date(currentDay.getFullYear(), currentDay.getMonth(), 1);
89+
const firstDayCurrentMonth = new Date(
90+
currentDay.getFullYear(),
91+
currentDay.getMonth(),
92+
1
93+
);
8994

9095
const where = {
9196
user_id: userId,
9297
date: {
9398
[Sequelize.Op.and]: {
9499
[Sequelize.Op.gte]: firstDayCurrentMonth,
95-
[Sequelize.Op.lte]: currentDay,
96-
},
97-
},
100+
[Sequelize.Op.lte]: currentDay
101+
}
102+
}
98103
};
99104

100105
const debits = await Debit.findAll({ where, order });

0 commit comments

Comments
 (0)