-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
User payment #15
Open
PluckySquirrel
wants to merge
1
commit into
awesome-academy:master
Choose a base branch
from
PluckySquirrel:payment
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
User payment #15
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1,5 +1,7 @@ | ||||||||
import { Request, Response } from 'express'; | ||||||||
import asyncHandler from 'express-async-handler'; | ||||||||
import { createPayment } from '@src/service/payment.service'; | ||||||||
import { getUserById } from '@src/service/user.service'; | ||||||||
import { getCoursesWithSectionsAndHours, filterAndSortCourses, getSectionsWithLessons, getCourseById, countEnrolledUsersInCourse, getProfessorByCourse} from '../service/course.service'; | ||||||||
|
||||||||
export const filterAndSort = asyncHandler(async (req: Request, res: Response) => { | ||||||||
|
@@ -76,3 +78,24 @@ export const getCourseDetail = asyncHandler(async (req: Request, res: Response) | |||||||
t: req.t | ||||||||
}); | ||||||||
}); | ||||||||
|
||||||||
export const createPaymentRecord = asyncHandler(async (req: Request, res: Response): Promise<void> => { | ||||||||
const { course_id } = req.params | ||||||||
const userId = req.user.id | ||||||||
|
||||||||
const user = await getUserById(userId); | ||||||||
if (!user) { | ||||||||
res.status(404).json({ message: 'User not found' }); | ||||||||
return; | ||||||||
} | ||||||||
|
||||||||
const course = await getCourseById(parseInt(course_id)) | ||||||||
if (!course) { | ||||||||
res.status(404).json({ message: 'Course not found' }); | ||||||||
return; | ||||||||
Comment on lines
+94
to
+95
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
} | ||||||||
|
||||||||
const payment = await createPayment(user, course); | ||||||||
|
||||||||
res.status(201).json(payment); | ||||||||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { Request, Response } from "express"; | ||
import asyncHandler from 'express-async-handler'; | ||
import { getPaymentById } from "../service/payment.service"; | ||
|
||
export const showPaymentPage = asyncHandler(async (req: Request, res: Response): Promise<void> => { | ||
const { payment_id } = req.params | ||
const userId = req.user.id | ||
|
||
const payment = await getPaymentById(parseInt(payment_id)); | ||
|
||
if (!payment || payment.user.id !== userId) { | ||
res.status(404).json({ message: "Payment not found or not authorized" }); | ||
return; | ||
Comment on lines
+12
to
+13
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sửa tương tự e nha |
||
} | ||
|
||
const course = payment.course; | ||
|
||
res.json({ payment, course, user: payment.user }); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { Router } from 'express'; | ||
import { showPaymentPage } from '../controller/payment.controller'; | ||
|
||
const router = Router(); | ||
|
||
// Define the payment route for a specific course | ||
router.get('/:payment_id', showPaymentPage); | ||
|
||
export default router; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import { AppDataSource } from "../repos/db"; | ||
import { Payment } from "../entity/Payment"; | ||
import { User } from "../entity/User"; | ||
import { Course } from "../entity/Course"; | ||
|
||
const paymentRepository = AppDataSource.getRepository(Payment); | ||
|
||
export const createPayment = async (user: User, course: Course) => { | ||
const payment = paymentRepository.create({ | ||
user: user, // In a real scenario, you'd fetch the actual user from your auth system | ||
course: course, | ||
amount: course.price, // Assuming the payment amount is the course price | ||
payment_date: new Date(), | ||
status: 'done', // Or set to 'pending' based on your logic | ||
}); | ||
|
||
return await paymentRepository.save(payment); | ||
} | ||
|
||
export const getPaymentById = async (id: number) => { | ||
return await paymentRepository.findOne({ | ||
where: { id: id }, | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
import 'express-serve-static-core'; | ||
import { User } from '.../entity/User'; | ||
|
||
declare module 'express-serve-static-core' { | ||
interface Response { | ||
setLocale?: (locale: string) => void; | ||
} | ||
} | ||
|
||
declare global { | ||
namespace Express { | ||
interface Request { | ||
user?: User; | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.