From d01cc13edcba70f6e549434cead24a139d186a0f Mon Sep 17 00:00:00 2001
From: Deep Koluguri <deepkoluguri@gmail.com>
Date: Thu, 6 Nov 2025 12:19:11 -0500
Subject: [PATCH] monthly draw fix

---
 backend/src/controllers/monthlyDrawController.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/monthlyDrawController.js b/backend/src/controllers/monthlyDrawController.js
index 146054b..bb797a6 100644
--- a/backend/src/controllers/monthlyDrawController.js
+++ b/backend/src/controllers/monthlyDrawController.js
@@ -167,13 +167,16 @@ const createMonthlyDraw = async (req, res) => {
     const totalMembers = eligibleMembers.length;
     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
     const monthlyDraw = await MonthlyDraw.create({
       group_id,
       month: monthInt,
       year: yearInt,
       draw_date: new Date(),
-      eligible_members: availableMembers.map(member => ({
+      eligible_members: membersForDraw.map(member => ({
         id: member.user_id,
         name: member.User.full_name,
         mobile: member.User.mobile_number
@@ -196,8 +199,8 @@ const createMonthlyDraw = async (req, res) => {
       message: 'Monthly draw completed successfully',
       data: {
         ...monthlyDraw.toJSON(),
-        winner: result.winner.User,
-        eligible_count: availableMembers.length
+        winner: selectedWinner.User,
+        eligible_count: membersForDraw.length
       }
     });
   } catch (error) {