wexa-chat 0.2.0 → 0.2.1

package/dist/index.d.cts

@@ -147,7 +147,7 @@ interface IMessage extends Document {
 /**
  * Create (or retrieve) Message model safely
  */
-declare function createMessageModel(options: InitOptions, conn?: Connection): Model<IMessage>;
+declare function createMessageModel(options: InitOptions, conn: Connection): Model<IMessage>;
 
 declare const modelRegistry: Map<string, mongoose.Model<any, {}, {}, {}, any, any>>;
 /**
@@ -266,7 +266,7 @@ interface IConversation extends Document {
 /**
  * Create (or retrieve) Conversation model safely
  */
-declare function createConversationModel(options: InitOptions, conn?: Connection): Model<IConversation>;
+declare function createConversationModel(options: InitOptions, conn: Connection): Model<IConversation>;
 
 /**
  * Pagination result interface

package/dist/index.d.ts

@@ -147,7 +147,7 @@ interface IMessage extends Document {
 /**
  * Create (or retrieve) Message model safely
  */
-declare function createMessageModel(options: InitOptions, conn?: Connection): Model<IMessage>;
+declare function createMessageModel(options: InitOptions, conn: Connection): Model<IMessage>;
 
 declare const modelRegistry: Map<string, mongoose.Model<any, {}, {}, {}, any, any>>;
 /**
@@ -266,7 +266,7 @@ interface IConversation extends Document {
 /**
  * Create (or retrieve) Conversation model safely
  */
-declare function createConversationModel(options: InitOptions, conn?: Connection): Model<IConversation>;
+declare function createConversationModel(options: InitOptions, conn: Connection): Model<IConversation>;
 
 /**
  * Pagination result interface

package/dist/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var mongoose = require('mongoose');
 var axios = require('axios');
 var Redis = require('ioredis');
 var ws = require('ws');
@@ -8,13 +7,12 @@ var url = require('url');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var mongoose__default = /*#__PURE__*/_interopDefault(mongoose);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var Redis__default = /*#__PURE__*/_interopDefault(Redis);
 var url__default = /*#__PURE__*/_interopDefault(url);
 
 // src/models/Conversation.model.ts
-function createConversationModel(options, conn = mongoose__default.default.connection) {
+function createConversationModel(options, conn) {
   const connectionId = conn.id || conn.name || "default";
   const registryKey = `${connectionId}:Conversation`;
   if (modelRegistry.has(registryKey)) {
@@ -26,7 +24,8 @@ function createConversationModel(options, conn = mongoose__default.default.conne
     modelRegistry.set(registryKey, existingModel);
     return existingModel;
   }
-  const ParticipantSchema = new mongoose.Schema(
+  const Schema = conn.base.Schema;
+  const ParticipantSchema = new Schema(
     {
       entityModel: {
         type: String,
@@ -45,7 +44,7 @@ function createConversationModel(options, conn = mongoose__default.default.conne
     },
     { _id: false }
   );
-  const ConversationSchema = new mongoose.Schema(
+  const ConversationSchema = new Schema(
     {
       organizationId: {
         type: String,
@@ -71,7 +70,7 @@ function createConversationModel(options, conn = mongoose__default.default.conne
       lastMessagePreview: String,
       lastMessageSenderId: String,
       lastMessageSenderModel: String,
-      metadata: mongoose.Schema.Types.Mixed
+      metadata: Schema.Types.Mixed
     },
     { timestamps: true }
   );
@@ -79,13 +78,15 @@ function createConversationModel(options, conn = mongoose__default.default.conne
   modelRegistry.set(registryKey, model);
   return model;
 }
+
+// src/models/Message.model.ts
 var sourceType = {
   LINKEDIN: "linkedin",
   WHATSAPP: "whatsapp",
   EMAIL: "email",
   CORE: "core"
 };
-function createMessageModel(options, conn = mongoose__default.default.connection) {
+function createMessageModel(options, conn) {
   const connectionId = conn.id || conn.name || "default";
   const registryKey = `${connectionId}:Message`;
   if (modelRegistry.has(registryKey)) {
@@ -97,7 +98,8 @@ function createMessageModel(options, conn = mongoose__default.default.connection
     modelRegistry.set(registryKey, existingModel);
     return existingModel;
   }
-  const MessageSchema = new mongoose.Schema(
+  const Schema = conn.base.Schema;
+  const MessageSchema = new Schema(
     {
       organizationId: {
         type: String,
@@ -305,13 +307,23 @@ function createConversationsService(models) {
      * Create a new conversation or find existing one between participants
      */
     async createOrFindConversation(args) {
+      console.log("Creating or finding conversation for users:", {
+        args
+      });
       const { organizationId, a, b } = args;
+      console.log("Creating or finding conversation for users:", {
+        organizationId,
+        a,
+        b
+      });
       try {
+        console.log("asdfa");
         const existingConversation = await searchByParticipantPair(Conversation, {
           organizationId,
           a,
           b
         });
+        console.log("Existing conversation:", existingConversation);
         if (existingConversation) {
           return existingConversation;
         }
@@ -334,7 +346,9 @@ function createConversationsService(models) {
           lastMessageAt: /* @__PURE__ */ new Date()
           // Set initial lastMessageAt
         });
+        console.log("New conversation:", newConversation);
         await newConversation.save();
+        console.log("Saved conversation:", newConversation);
         return newConversation;
       } catch (error) {
         console.error("Error in createOrFindConversation:", error);
@@ -687,18 +701,18 @@ function createMessagesService(models, hooks = {}) {
         }
         sendersByModel[senderModel].add(senderId);
       });
-      const mongoose3 = Message.base;
+      const mongoose = Message.base;
       const senders = {};
       await Promise.all(
         Object.entries(sendersByModel).map(async ([senderModel, senderIdsSet]) => {
           const modelName = modelMapping[senderModel] || senderModel;
           const senderIds = Array.from(senderIdsSet);
-          if (!mongoose3.modelNames().includes(modelName)) {
+          if (!mongoose.modelNames().includes(modelName)) {
             console.warn(`Model ${modelName} not found for sender population`);
             return;
           }
           try {
-            const SenderModel = mongoose3.model(modelName);
+            const SenderModel = mongoose.model(modelName);
             const modelSenders = await SenderModel.find({ _id: { $in: senderIds } }).select(fields).lean().exec();
             senders[senderModel] = {};
             modelSenders.forEach((sender) => {