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",

eslint.config.mjs

@@ -2,19 +2,17 @@ import typescriptEslint from "@typescript-eslint/eslint-plugin";
 import tsdoc from "eslint-plugin-tsdoc";
 import _import from "eslint-plugin-import";
 import { fixupPluginRules } from "@eslint/compat";
-import globals from "globals";
 import tsParser from "@typescript-eslint/parser";
-import parser from "@graphql-eslint/eslint-plugin";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import js from "@eslint/js";
 import { FlatCompat } from "@eslint/eslintrc";
-import graphqlEslint from "@graphql-eslint/eslint-plugin";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-    baseDirectory: __dirname
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
 });
 
 export default [{
@@ -35,12 +33,8 @@ export default [{
     },
 
     languageOptions: {
-    env: {
-        node: true,  
+      parser: tsParser,  
     },
-    parser: tsParser,  
-}
-,
 
     rules: {
         "no-restricted-imports": ["error", {
@@ -50,7 +44,6 @@ export default [{
         "import/no-duplicates": "error",
         "tsdoc/syntax": "error",
         "@typescript-eslint/ban-ts-comment": "error",
-        "@typescript-eslint/ban-types": "error",
         "@typescript-eslint/no-duplicate-enum-values": "error",
         "@typescript-eslint/no-explicit-any": "warn",
         "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
@@ -117,11 +110,11 @@ export default [{
     files: ["./src/typeDefs/**/*.graphql"],
 
     plugins: {
-        "@graphql-eslint": graphqlEslint,
+        "@typescript-eslint": typescriptEslint,
     },
 
     languageOptions: {
-        parser: parser,
+        parser: tsParser,
     },
 }, {
     files: ["tests/**/*"],

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!]!
@@ -1044,16 +1030,6 @@ type Message {
   videoUrl: URL
 }
 
-type MessageChat {
-  _id: ID!
-  createdAt: DateTime!
-  languageBarrier: Boolean
-  message: String!
-  receiver: User!
-  sender: User!
-  updatedAt: DateTime!
-}
-
 input MessageChatInput {
   message: String!
   receiver: ID!
@@ -1080,9 +1056,7 @@ type Mutation {
   addPledgeToFundraisingCampaign(campaignId: ID!, pledgeId: ID!): FundraisingCampaignPledge!
   addUserCustomData(dataName: String!, dataValue: Any!, organizationId: ID!): UserCustomData!
   addUserImage(file: String!): User!
-  addUserToGroupChat(chatId: ID!, userId: ID!): GroupChat!
   addUserToUserFamily(familyId: ID!, userId: ID!): UserFamily!
-  adminRemoveGroup(groupId: ID!): GroupChat!
   assignUserTag(input: ToggleUserTagAssignInput!): User
   blockPluginCreationBySuperadmin(blockUser: Boolean!, userId: ID!): AppUserProfile!
   blockUser(organizationId: ID!, userId: ID!): User!
@@ -1096,18 +1070,16 @@ 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!
   createEventVolunteerGroup(data: EventVolunteerGroupInput!): EventVolunteerGroup!
   createFund(data: FundInput!): Fund!
   createFundraisingCampaign(data: FundCampaignInput!): FundraisingCampaign!
   createFundraisingCampaignPledge(data: FundCampaignPledgeInput!): FundraisingCampaignPledge!
-  createGroupChat(data: createGroupChatInput!): GroupChat!
   createMember(input: UserAndOrganizationInput!): CreateMemberPayload!
-  createMessageChat(data: MessageChatInput!): MessageChat!
   createNote(data: NoteInput!): Note!
   createOrganization(data: OrganizationInput, file: String): Organization!
   createPlugin(pluginCreatedBy: String!, pluginDesc: String!, pluginName: String!, uninstalledOrgs: [ID!]): Plugin!
@@ -1142,13 +1114,11 @@ type Mutation {
   removeAgendaItem(id: ID!): AgendaItem!
   removeAgendaSection(id: ID!): ID!
   removeComment(id: ID!): Comment
-  removeDirectChat(chatId: ID!, organizationId: ID!): DirectChat!
   removeEvent(id: ID!, recurringEventDeleteType: RecurringEventMutationType): Event!
   removeEventAttendee(data: EventAttendeeInput!): User!
   removeEventVolunteer(id: ID!): EventVolunteer!
   removeEventVolunteerGroup(id: ID!): EventVolunteerGroup!
   removeFundraisingCampaignPledge(id: ID!): FundraisingCampaignPledge!
-  removeGroupChat(chatId: ID!): GroupChat!
   removeMember(data: UserAndOrganizationInput!): Organization!
   removeOrganization(id: ID!): UserData!
   removeOrganizationCustomField(customFieldId: ID!, organizationId: ID!): OrganizationCustomField!
@@ -1157,16 +1127,14 @@ type Mutation {
   removeSampleOrganization: Boolean!
   removeUserCustomData(organizationId: ID!): UserCustomData!
   removeUserFamily(familyId: ID!): UserFamily!
-  removeUserFromGroupChat(chatId: ID!, userId: ID!): GroupChat!
   removeUserFromUserFamily(familyId: ID!, userId: ID!): UserFamily!
   removeUserImage: User!
   removeUserTag(id: ID!): UserTag
   resetCommunity: Boolean!
   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): ChatMessage!
   signUp(data: UserInput!, file: String): AuthData!
   togglePostPin(id: ID!, title: String): Post!
   unassignUserTag(input: ToggleUserTagAssignInput!): User
@@ -1493,12 +1461,11 @@ 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]
@@ -1526,8 +1493,6 @@ type Query {
   getUserTagAncestors(id: ID!): [UserTag]
   getVenueByOrgId(first: Int, orderBy: VenueOrderByInput, orgId: ID!, skip: Int, where: VenueWhereInput): [Venue]
   getlanguage(lang_code: String!): [Translation]
-  groupChatById(id: ID!): GroupChat
-  groupChatsByUserId(id: ID!): [GroupChat]
   hasSubmittedFeedback(eventId: ID!, userId: ID!): Boolean
   isSampleOrganization(id: ID!): Boolean!
   joinedOrganizations(id: ID): [Organization]
@@ -1628,9 +1593,7 @@ enum Status {
 }
 
 type Subscription {
-  directMessageChat: MessageChat
-  messageSentToDirectChat(userId: ID!): DirectChatMessage
-  messageSentToGroupChat(userId: ID!): GroupChatMessage
+  messageSentToChat(userId: ID!): ChatMessage
   onPluginUpdate: Plugin
 }
 
@@ -2047,16 +2010,14 @@ enum WeekDays {
   WEDNESDAY
 }
 
-input createChatInput {
+input chatInput {
+  image: String
+  isGroup: Boolean!
+  name: String
   organizationId: ID
   userIds: [ID!]!
 }
 
-type createDirectChatPayload {
-  directChat: DirectChat
-  userErrors: [CreateDirectChatError!]!
-}
-
 input createGroupChatInput {
   organizationId: ID!
   title: String!

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",