Updated chat schema

codegen.ts

@@ -46,10 +46,9 @@ const config: CodegenConfig = {
 
           Community: "../models/Community#InterfaceCommunity",
 
-          DirectChat: "../models/DirectChat#InterfaceDirectChat",
+          Chat: "../models/Chat#InterfaceChat",
 
-          DirectChatMessage:
-            "../models/DirectChatMessage#InterfaceDirectChatMessage",
+          ChatMessage: "../models/ChatMessage#InterfaceChatMessage",
 
           Donation: "../models/Donation#InterfaceDonation",
 
@@ -75,11 +74,6 @@ const config: CodegenConfig = {
 
           Group: "../models/Group#InterfaceGroup",
 
-          GroupChat: "../models/GroupChat#InterfaceGroupChat",
-
-          GroupChatMessage:
-            "../models/GroupChatMessage#InterfaceGroupChatMessage",
-
           // ImageHash: '../models/ImageHash#InterfaceImageHash',
 
           Language: "../models/Language#InterfaceLanguage",

schema.graphql

@@ -190,6 +190,32 @@ input CampaignWhereInput {
   organizationId: ID
 }
 
+type Chat {
+  _id: ID!
+  admins: [User]
+  createdAt: DateTime!
+  creator: User
+  image: String
+  isGroup: Boolean!
+  lastMessageId: String
+  messages: [ChatMessage]
+  name: String
+  organization: Organization
+  updatedAt: DateTime!
+  users: [User!]!
+}
+
+type ChatMessage {
+  _id: ID!
+  chatMessageBelongsTo: Chat!
+  createdAt: DateTime!
+  deletedBy: [User]
+  messageContent: String!
+  replyTo: ChatMessage
+  sender: User!
+  updatedAt: DateTime!
+}
+
 type CheckIn {
   _id: ID!
   createdAt: DateTime!
@@ -549,26 +575,6 @@ type DeletePayload {
   success: Boolean!
 }
 
-type DirectChat {
-  _id: ID!
-  createdAt: DateTime!
-  creator: User
-  messages: [DirectChatMessage]
-  organization: Organization
-  updatedAt: DateTime!
-  users: [User!]!
-}
-
-type DirectChatMessage {
-  _id: ID!
-  createdAt: DateTime!
-  directChatMessageBelongsTo: DirectChat!
-  messageContent: String!
-  receiver: User!
-  sender: User!
-  updatedAt: DateTime!
-}
-
 type Donation {
   _id: ID!
   amount: Float!
@@ -932,26 +938,6 @@ type Group {
   updatedAt: DateTime!
 }
 
-type GroupChat {
-  _id: ID!
-  createdAt: DateTime!
-  creator: User
-  messages: [GroupChatMessage]
-  organization: Organization!
-  title: String!
-  updatedAt: DateTime!
-  users: [User!]!
-}
-
-type GroupChatMessage {
-  _id: ID!
-  createdAt: DateTime!
-  groupChatMessageBelongsTo: GroupChat!
-  messageContent: String!
-  sender: User!
-  updatedAt: DateTime!
-}
-
 type InvalidCursor implements FieldError {
   message: String!
   path: [String!]!
@@ -1096,8 +1082,8 @@ type Mutation {
   createAgendaCategory(input: CreateAgendaCategoryInput!): AgendaCategory!
   createAgendaItem(input: CreateAgendaItemInput!): AgendaItem!
   createAgendaSection(input: CreateAgendaSectionInput!): AgendaSection!
+  createChat(data: chatInput!): Chat
   createComment(data: CommentInput!, postId: ID!): Comment
-  createDirectChat(data: createChatInput!): DirectChat!
   createDonation(amount: Float!, nameOfOrg: String!, nameOfUser: String!, orgId: ID!, payPalId: ID!, userId: ID!): Donation!
   createEvent(data: EventInput!, recurrenceRuleData: RecurrenceRuleInput): Event!
   createEventVolunteer(data: EventVolunteerInput!): EventVolunteer!
@@ -1165,8 +1151,7 @@ type Mutation {
   revokeRefreshTokenForUser: Boolean!
   saveFcmToken(token: String): Boolean!
   sendMembershipRequest(organizationId: ID!): MembershipRequest!
-  sendMessageToDirectChat(chatId: ID!, messageContent: String!): DirectChatMessage!
-  sendMessageToGroupChat(chatId: ID!, messageContent: String!): GroupChatMessage!
+  sendMessageToChat(chatId: ID!, messageContent: String!, replyTo: ID, type: String!): ChatMessage!
   signUp(data: UserInput!, file: String): AuthData!
   togglePostPin(id: ID!, title: String): Post!
   unassignUserTag(input: ToggleUserTagAssignInput!): User
@@ -1493,12 +1478,13 @@ type Query {
   agendaItemByEvent(relatedEventId: ID!): [AgendaItem]
   agendaItemByOrganization(organizationId: ID!): [AgendaItem]
   agendaItemCategoriesByOrganization(organizationId: ID!): [AgendaCategory]
+  chatById(id: ID!): Chat!
+  chatsByUserId(id: ID!): [Chat]
   checkAuth: User!
   customDataByOrganization(organizationId: ID!): [UserCustomData!]!
   customFieldsByOrganization(id: ID!): [OrganizationCustomField]
   directChatById(id: ID!): DirectChat
   directChatsByUserID(id: ID!): [DirectChat]
-  directChatsMessagesByChatID(id: ID!): [DirectChatMessage]
   event(id: ID!): Event
   eventVolunteersByEvent(id: ID!): [EventVolunteer]
   eventsByOrganization(id: ID, orderBy: EventOrderByInput): [Event]
@@ -1629,8 +1615,7 @@ enum Status {
 
 type Subscription {
   directMessageChat: MessageChat
-  messageSentToDirectChat(userId: ID!): DirectChatMessage
-  messageSentToGroupChat(userId: ID!): GroupChatMessage
+  messageSentToChat(userId: ID!): ChatMessage @auth
   onPluginUpdate: Plugin
 }
 
@@ -2047,7 +2032,10 @@ enum WeekDays {
   WEDNESDAY
 }
 
-input createChatInput {
+input chatInput {
+  image: String
+  isGroup: Boolean!
+  name: String
   organizationId: ID
   userIds: [ID!]!
 }

setup.ts

@@ -32,6 +32,7 @@ import { loadDefaultOrganiation } from "./src/utilities/loadDefaultOrg";
 import { isMinioInstalled } from "./src/setup/isMinioInstalled";
 import { installMinio } from "./src/setup/installMinio";
 
+
 dotenv.config();
 
 // Check if all the fields in .env.sample are present in .env

src/constants.ts

@@ -57,6 +57,13 @@ export const CHAT_NOT_FOUND_ERROR = Object.freeze({
   PARAM: "chat",
 });
 
+export const MESSAGE_NOT_FOUND_ERROR = Object.freeze({
+  DESC: "Message not found",
+  CODE: "message.notFound",
+  MESSAGE: "message.notFound",
+  PARAM: "message",
+});
+
 export const VENUE_ALREADY_EXISTS_ERROR = Object.freeze({
   DESC: "Venue already exists",
   CODE: "venue.alreadyExists",

src/models/DirectChat.ts → src/models/Chat.ts

@@ -1,34 +1,42 @@
 import type { PopulatedDoc, Types, Document, Model } from "mongoose";
 import { Schema, model, models } from "mongoose";
-import type { InterfaceDirectChatMessage } from "./DirectChatMessage";
 import type { InterfaceOrganization } from "./Organization";
 import type { InterfaceUser } from "./User";
 import { createLoggingMiddleware } from "../libraries/dbLogger";
+import type { InterfaceChatMessage } from "./ChatMessage";
 /**
  * Interface representing a document for direct chat in MongoDB.
  */
-export interface InterfaceDirectChat {
+export interface InterfaceChat {
   _id: Types.ObjectId;
+  isGroup: boolean;
+  name: string;
   users: PopulatedDoc<InterfaceUser & Document>[];
-  messages: PopulatedDoc<InterfaceDirectChatMessage & Document>[];
+  messages: PopulatedDoc<InterfaceChatMessage & Document>[];
   creatorId: PopulatedDoc<InterfaceUser & Document>;
   organization: PopulatedDoc<InterfaceOrganization & Document>;
   status: string;
+  admins: PopulatedDoc<InterfaceUser & Document>[];
   createdAt: Date;
   updatedAt: Date;
+  lastMessageId: string;
 }
 
 /**
- * Mongoose schema for a direct chat.
+ * Mongoose schema for a chat.
+ * @param isGroup - Indicates if the chat is a group chat.
+ * @param name - Name of the chat if its a group chat.
  * @param users - Users participating in the chat.
  * @param messages - Messages in the chat.
  * @param creatorId - Creator of the chat, reference to `User` model.
+ * @param admins - Admins of the chat if its a group chat, reference to `User` model.
  * @param organization - Organization associated with the chat, reference to `Organization` model.
  * @param status - Status of the chat (ACTIVE, BLOCKED, DELETED).
  * @param createdAt - Timestamp of chat creation.
  * @param updatedAt - Timestamp of chat update.
+ * @param lastMessageId - ID of the last message in the chat.
  */
-const directChatSchema = new Schema(
+const chatSchema = new Schema(
   {
     users: [
       {
@@ -37,39 +45,76 @@ const directChatSchema = new Schema(
         required: true,
       },
     ],
+    isGroup: {
+      type: Boolean,
+      required: true,
+    },
+    name: {
+      type: String,
+      required: false,
+    },
+    image: {
+      type: String,
+      require: false,
+    },
     messages: [
       {
         type: Schema.Types.ObjectId,
-        ref: "DirectChatMessage",
+        ref: "ChatMessage",
       },
     ],
     creatorId: {
       type: Schema.Types.ObjectId,
       ref: "User",
       required: true,
     },
+    admins: [
+      {
+        type: Schema.Types.ObjectId,
+        ref: "User",
+        required: false,
+      },
+    ],
     status: {
       type: String,
       required: true,
       enum: ["ACTIVE", "BLOCKED", "DELETED"],
       default: "ACTIVE",
     },
+    organization: {
+      type: Schema.Types.ObjectId,
+      ref: "Organization",
+      required: false,
+    },
+    createdAt: {
+      type: Date,
+      required: true,
+    },
+    updatedAt: {
+      type: Date,
+      required: true,
+    },
+    lastMessageId: {
+      type: String,
+      required: false,
+    },
   },
   {
     timestamps: true,
   },
 );
 
 // Add logging middleware for directChatSchema
-createLoggingMiddleware(directChatSchema, "DirectChat");
+createLoggingMiddleware(chatSchema, "Chat");
 
 /**
  * Retrieves or creates the Mongoose model for DirectChat.
  * Prevents Mongoose OverwriteModelError during testing.
  */
-const directChatModel = (): Model<InterfaceDirectChat> =>
-  model<InterfaceDirectChat>("DirectChat", directChatSchema);
+const chatModel = (): Model<InterfaceChat> =>
+  model<InterfaceChat>("Chat", chatSchema);
 
 // This syntax is needed to prevent Mongoose OverwriteModelError while running tests.
-export const DirectChat = (models.DirectChat ||
-  directChatModel()) as ReturnType<typeof directChatModel>;
+export const Chat = (models.Chat || chatModel()) as ReturnType<
+  typeof chatModel
+>;