Skip to content

Feature/task 132 vi #157

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.

Sign up for GitHub

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

Merged
theqi106 merged 2 commits into from
Aug 25, 2025
Merged

Feature/task 132 vi #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bbf9fe
Merge branch 'dev' into feature/task-132_vi
Aug 25, 2025
557d0e3
fix: fix get available discount
Aug 25, 2025
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
43 changes: 22 additions & 21 deletions src/controllers/discount.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,41 +133,41 @@ export const createDiscount = catchAsync(async (req: Request, res: Response, nex
// Get all discounts with pagination and filters
export const getAllDiscounts = catchAsync(async (req: Request, res: Response, next: NextFunction) => {
const { page = 1, limit = 10, search, discountType, accessType, isActive, businessId } = req.query;

const pageNum = parseInt(page as string);
const limitNum = parseInt(limit as string);
const skip = (pageNum - 1) * limitNum;

// Build filter
const filter: any = {};

if (search) {
filter.$or = [
{ code: { $regex: search, $options: 'i' } },
{ name: { $regex: search, $options: 'i' } },
{ description: { $regex: search, $options: 'i' } }
];
}

if (discountType) {
filter.discountType = discountType;
}

if (accessType) {
filter.accessType = accessType;
}

if (isActive !== undefined) {
filter.isActive = isActive === 'true';
}

if (businessId) {
filter.businessId = businessId;
}

// Get total count for pagination
const totalDiscounts = await DiscountModel.countDocuments(filter);

// Get discounts with pagination and populate
const discounts = await DiscountModel.find(filter)
.populate('courseIds', 'name description thumbnail price')
Expand Down Expand Up @@ -250,7 +250,7 @@ export const updateDiscount = catchAsync(async (req: Request, res: Response, nex

// Check if code already exists (if updating code)
if (updateData.code && updateData.code !== discount.code) {
const existingDiscount = await DiscountModel.findOne({
const existingDiscount = await DiscountModel.findOne({
code: updateData.code.toUpperCase(),
_id: { $ne: id }
});
Expand Down Expand Up @@ -304,14 +304,11 @@ export const updateDiscount = catchAsync(async (req: Request, res: Response, nex
updateData.allowedUsers = updateData.allowedUsers.filter((id: string) => id && id.trim() !== '');
}

const updatedDiscount = await DiscountModel.findByIdAndUpdate(
id,
updateData,
{ new: true, runValidators: true }
).populate('courseIds', 'name description thumbnail price')
.populate('businessId', 'businessName')
.populate('allowedUsers', 'name email')
.populate('allowedBusinesses', 'businessName');
const updatedDiscount = await DiscountModel.findByIdAndUpdate(id, updateData, { new: true, runValidators: true })
.populate('courseIds', 'name description thumbnail price')
.populate('businessId', 'businessName')
.populate('allowedUsers', 'name email')
.populate('allowedBusinesses', 'businessName');

res.status(200).json({
success: true,
Expand Down Expand Up @@ -355,7 +352,7 @@ export const validateDiscountCode = catchAsync(async (req: Request, res: Respons
const cleanBusinessId = businessId && businessId.trim() !== '' ? businessId : undefined;
const cleanCourseId = courseId && courseId.trim() !== '' ? courseId : undefined;

const discount = await DiscountModel.findOne({
const discount = await DiscountModel.findOne({
code: code.toUpperCase(),
isActive: true
});
Expand All @@ -365,7 +362,7 @@ export const validateDiscountCode = catchAsync(async (req: Request, res: Respons
}

const now = new Date();

// Check if discount is within valid date range
if (now < discount.startDate || now > discount.endDate) {
return next(new ErrorHandler('Discount code is not valid at this time', 400));
Expand Down Expand Up @@ -435,10 +432,10 @@ export const validateDiscountCode = catchAsync(async (req: Request, res: Respons
export const getDiscountStatistics = catchAsync(async (req: Request, res: Response, next: NextFunction) => {
const totalDiscounts = await DiscountModel.countDocuments({});
const activeDiscounts = await DiscountModel.countDocuments({ isActive: true });
const expiredDiscounts = await DiscountModel.countDocuments({
const expiredDiscounts = await DiscountModel.countDocuments({
endDate: { $lt: new Date() }
});
const upcomingDiscounts = await DiscountModel.countDocuments({
const upcomingDiscounts = await DiscountModel.countDocuments({
startDate: { $gt: new Date() }
});

Expand Down Expand Up @@ -486,7 +483,7 @@ export const getAvailableDiscounts = async (req: Request, res: Response) => {
try {
const userId = req.user?._id;
const businessId = req.user?.businessInfo?.businessId;

const role = req.user?.businessInfo?.role;
if (!userId && !businessId) {
res.status(400).json({ success: false, message: 'Missing userId or businessId' });
return;
Expand All @@ -511,6 +508,10 @@ export const getAvailableDiscounts = async (req: Request, res: Response) => {
conditions.push(privateCondition);
}

if (businessId && role === 'admin') {
conditions.push({ businessId: new mongoose.Types.ObjectId(String(businessId)) });
}

// Query
const discounts = await DiscountModel.find({
$or: conditions,
Expand Down