fix followup campaign stage reply option not hitting webhook

Author: KingVics

model/MemberWhatsAppFields.js

@@ -19,6 +19,10 @@ const memberWhatsAppFields = {
     type: Date,
     default: null,
   },
+  whatsapplid:{
+    type: String,
+    default: null,
+  },
   whatsappConversationStage: {
     type: String,
     enum: [

services/followUpService.js

@@ -583,13 +583,22 @@ class FollowUpService {
 
   async handleReply(phone, messageBody) {
     console.log('Handling reply from phone:', phone, 'with message:', messageBody);
-    const cleanedPhone = await this._resolveRealPhoneFromJid(phone)
     const reply = this._normalizeInboundText(messageBody);
 
-    const memberByPhone = await MembersModel.findOne({
-      phone: cleanedPhone,
+    let memberByPhone = await MembersModel.findOne({
+      whatsapplid: phone,
     });
 
+    if (!memberByPhone) {
+      const cleanedPhone = await this._resolveRealPhoneFromJid(phone)
+      memberByPhone = await MembersModel.findOne({
+        phone: cleanedPhone,
+      });
+
+      memberByPhone.whatsapplid = phone;
+      await memberByPhone.save();
+    }
+
     console.log('Resolved member for phone:', cleanedPhone, 'is:', memberByPhone?.firstName);
 
     if (!memberByPhone) {
@@ -646,7 +655,7 @@ class FollowUpService {
     const lastOutbound = await WhatsappActivity.findOne({
       memberId: memberByPhone._id,
       direction: 'outbound',
-      conversationStage: 'awaiting_reply',
+      conversationStage: { $in: ['awaiting_reply', "welcome_sent"] },
       messageType: { $in: ['absent_reminder', 'follow_up', 'welcome'] }
     }).sort({ createdAt: -1 });