monthly draw fix
This commit is contained in:
parent
5ad7d62386
commit
d01cc13edc
|
|
@ -167,13 +167,16 @@ const createMonthlyDraw = async (req, res) => {
|
||||||
const totalMembers = eligibleMembers.length;
|
const totalMembers = eligibleMembers.length;
|
||||||
const calculatedPrizeAmount = prize_amount || chitGroup.total_value; // Use provided or default
|
const calculatedPrizeAmount = prize_amount || chitGroup.total_value; // Use provided or default
|
||||||
|
|
||||||
|
// For past draws, use all eligible members; for regular draws, use only available members
|
||||||
|
const membersForDraw = is_past_draw ? eligibleMembers : availableMembers;
|
||||||
|
|
||||||
// Create monthly draw
|
// Create monthly draw
|
||||||
const monthlyDraw = await MonthlyDraw.create({
|
const monthlyDraw = await MonthlyDraw.create({
|
||||||
group_id,
|
group_id,
|
||||||
month: monthInt,
|
month: monthInt,
|
||||||
year: yearInt,
|
year: yearInt,
|
||||||
draw_date: new Date(),
|
draw_date: new Date(),
|
||||||
eligible_members: availableMembers.map(member => ({
|
eligible_members: membersForDraw.map(member => ({
|
||||||
id: member.user_id,
|
id: member.user_id,
|
||||||
name: member.User.full_name,
|
name: member.User.full_name,
|
||||||
mobile: member.User.mobile_number
|
mobile: member.User.mobile_number
|
||||||
|
|
@ -196,8 +199,8 @@ const createMonthlyDraw = async (req, res) => {
|
||||||
message: 'Monthly draw completed successfully',
|
message: 'Monthly draw completed successfully',
|
||||||
data: {
|
data: {
|
||||||
...monthlyDraw.toJSON(),
|
...monthlyDraw.toJSON(),
|
||||||
winner: result.winner.User,
|
winner: selectedWinner.User,
|
||||||
eligible_count: availableMembers.length
|
eligible_count: membersForDraw.length
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue