Skip to content

Commit dcf69de

Browse files
Oloyedesinmiloluwaascii-dev
authored andcommitted
enable ordering of comments and article
1 parent a6a7ea1 commit dcf69de

6 files changed

Lines changed: 9 additions & 42 deletions

File tree

controllers/ArticleController.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,11 @@ class ArticleController {
167167
}
168168
return Article
169169
.findAll({
170+
order: [['id', 'DESC']],
170171
include: [{
171172
model: User,
172173
as: 'author',
173-
attributes: { exclude: ['id', 'email', 'hashedPassword', 'createdAt', 'updatedAt'] }
174+
attributes: { exclude: ['id', 'email', 'hashedPassword', 'createdAt', 'updatedAt'] },
174175
},
175176
{
176177
model: Like,

controllers/CommentsController.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export default class CommentsController {
6363
*/
6464
static getComments(req, res, next) {
6565
Comment.findAll({
66+
order: [['id', 'ASC']],
6667
include: [{
6768
model: User,
6869
attributes: { exclude: ['id', 'email', 'hashedPassword', 'createdAt', 'updatedAt'] },

controllers/PaymentController.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ export default class PaymentController {
2121
* @returns {link} redirects to create payment
2222
*/
2323
static makePayment(req, res, next) {
24-
this.getStripe().customers.create({
24+
console.log(req.body);
25+
PaymentController.getStripe().customers.create({
2526
email: req.body.email,
2627
source: req.body.stripeToken
2728
})
28-
.then(customer => this.getStripe().charges.create({
29+
.then(customer => PaymentController.getStripe().charges.create({
2930
amount: req.body.amount * 100,
3031
description: `Payment for ${req.params.slug}`,
3132
currency: 'usd',

controllers/UsersController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export default class UsersController {
193193
return res.status(200).json({ message: 'The user has been verified' });
194194
} catch (err) {
195195
return res.status(400).json({
196-
errors: { body: ['Your verification link has expired or invalid'] }
196+
errors: { body: ['Your verification link has expired or is invalid'] }
197197
});
198198
}
199199
}

middlewares/beforePayment.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

routes/api/payments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PaymentController from '../../controllers/PaymentController';
44
import getArticle from '../../middlewares/getArticle';
55
import verifyToken from '../../middlewares/verifyToken';
66
import getUser from '../../middlewares/getUser';
7-
import beforePayment from '../../middlewares/beforePayment';
7+
// import beforePayment from '../../middlewares/beforePayment';
88

99
const router = Router();
1010

@@ -13,7 +13,7 @@ router.post(
1313
verifyToken,
1414
getUser,
1515
getArticle,
16-
beforePayment,
16+
// beforePayment,
1717
PaymentController.makePayment
1818
);
1919

0 commit comments

Comments
 (0)