Latest Develop 20240724 (#2418)

* 20240727112603 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20240727112834 Merge develop into main

package.json

@@ -45,10 +45,10 @@
   "dependencies": {
     "@apollo/server": "^4.10.4",
     "@faker-js/faker": "^8.2.0",
-    "@graphql-inspector/cli": "^4.0.3",
+    "@graphql-inspector/cli": "^5.0.6",
     "@graphql-tools/resolvers-composition": "^7.0.1",
-    "@graphql-tools/schema": "^10.0.0",
-    "@graphql-tools/utils": "^10.2.0",
+    "@graphql-tools/schema": "^10.0.4",
+    "@graphql-tools/utils": "^10.3.2",
     "@parcel/watcher": "^2.4.1",
     "@types/graphql-upload": "^16.0.5",
     "@types/yargs": "^17.0.32",
@@ -63,8 +63,8 @@
     "dotenv": "^16.4.1",
     "express": "^4.19.2",
     "express-mongo-sanitize": "^2.2.0",
-    "express-rate-limit": "^7.2.0",
-    "graphql": "^16.8.1",
+    "express-rate-limit": "^7.3.1",
+    "graphql": "^16.9.0",
     "graphql-depth-limit": "^1.1.0",
     "graphql-scalars": "^1.20.1",
     "graphql-subscriptions": "^2.0.0",
@@ -80,28 +80,28 @@
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
     "markdown-toc": "^1.2.0",
-    "mongodb": "^6.3.0",
+    "mongodb": "^6.7.0",
     "mongoose": "^8.3.2",
-    "mongoose-paginate-v2": "^1.8.1",
+    "mongoose-paginate-v2": "^1.8.2",
     "morgan": "^1.10.0",
     "nanoid": "^5.0.7",
-    "nodemailer": "^6.9.12",
-    "pm2": "^5.2.0",
-    "redis": "^4.6.14",
+    "nodemailer": "^6.9.14",
+    "pm2": "^5.4.0",
+    "redis": "^4.6.15",
     "rrule": "^2.8.1",
-    "typedoc-plugin-markdown": "^4.0.1",
-    "uuid": "^9.0.0",
+    "typedoc-plugin-markdown": "^4.2.1",
+    "uuid": "^10.0.0",
     "validator": "^13.12.0",
     "winston": "^3.13.0",
-    "ws": "^8.17.0",
+    "ws": "^8.18.0",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
     "zod-error": "^1.5.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
-    "@graphql-codegen/typescript": "^4.0.7",
-    "@graphql-codegen/typescript-resolvers": "^4.1.0",
+    "@graphql-codegen/typescript": "^4.0.9",
+    "@graphql-codegen/typescript-resolvers": "^4.2.0",
     "@graphql-eslint/eslint-plugin": "^3.20.1",
     "@parcel/watcher": "^2.4.1",
     "@types/bcryptjs": "^2.4.6",
@@ -114,29 +114,29 @@
     "@types/i18n": "^0.13.12",
     "@types/inquirer": "^9.0.7",
     "@types/jsonwebtoken": "^9.0.5",
-    "@types/lodash": "^4.17.4",
+    "@types/lodash": "^4.17.6",
     "@types/mongoose-paginate-v2": "^1.6.5",
     "@types/morgan": "^1.9.9",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.14.9",
     "@types/nodemailer": "^6.4.15",
     "@types/uuid": "^9.0.7",
-    "@types/validator": "^13.11.10",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
+    "@types/validator": "^13.12.0",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.16.0",
     "@vitest/coverage-v8": "^1.6.0",
     "cls-bluebird": "^2.1.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-tsdoc": "^0.2.17",
+    "eslint-plugin-tsdoc": "^0.3.0",
     "get-graphql-schema": "^2.1.2",
     "graphql-markdown": "^7.0.0",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "husky": "^9.1.1",
+    "lint-staged": "^15.2.7",
     "prettier": "^3.2.5",
-    "rimraf": "^5.0.7",
-    "tsx": "^4.7.3",
+    "rimraf": "^6.0.1",
+    "tsx": "^4.16.2",
     "typescript": "^5.4.5",
     "vitest": "^1.2.1"
   },

schema.graphql

@@ -163,6 +163,19 @@ type AuthData {
   user: User!
 }
 
+enum CampaignOrderByInput {
+  endDate_ASC
+  endDate_DESC
+  fundingGoal_ASC
+  fundingGoal_DESC
+  startDate_ASC
+  startDate_DESC
+}
+
+input CampaignWhereInput {
+  name_contains: String
+}
+
 type CheckIn {
   _id: ID!
   createdAt: DateTime!
@@ -323,7 +336,7 @@ input CreateUserTagInput {
   name: String!
   organizationId: ID!
   parentTagId: ID
-  tagColor: String!
+  tagColor: String
 }
 
 enum Currency {
@@ -526,7 +539,7 @@ type DirectChat {
   createdAt: DateTime!
   creator: User
   messages: [DirectChatMessage]
-  organization: Organization!
+  organization: Organization
   updatedAt: DateTime!
   users: [User!]!
 }
@@ -809,7 +822,7 @@ enum Frequency {
 
 type Fund {
   _id: ID!
-  campaigns: [FundraisingCampaign!]
+  campaigns: [FundraisingCampaign]
   createdAt: DateTime!
   creator: User
   isArchived: Boolean!
@@ -848,6 +861,11 @@ input FundInput {
   taxDeductible: Boolean!
 }
 
+enum FundOrderByInput {
+  createdAt_ASC
+  createdAt_DESC
+}
+
 input FundWhereInput {
   name_contains: String
 }
@@ -897,6 +915,7 @@ type GroupChat {
   creator: User
   messages: [GroupChatMessage]
   organization: Organization!
+  title: String!
   updatedAt: DateTime!
   users: [User!]!
 }
@@ -1308,6 +1327,15 @@ enum PaginationDirection {
 
 scalar PhoneNumber
 
+enum PledgeOrderByInput {
+  amount_ASC
+  amount_DESC
+  endDate_ASC
+  endDate_DESC
+  startDate_ASC
+  startDate_DESC
+}
+
 type Plugin {
   _id: ID!
   pluginCreatedBy: String!
@@ -1434,17 +1462,20 @@ type Query {
   adminPlugin(orgId: ID!): [Plugin]
   advertisementsConnection(after: String, before: String, first: PositiveInt, last: PositiveInt): AdvertisementsConnection
   agendaCategory(id: ID!): AgendaCategory!
+  agendaItemByEvent(relatedEventId: ID!): [AgendaItem]
+  agendaItemByOrganization(organizationId: ID!): [AgendaItem]
   agendaItemCategoriesByOrganization(organizationId: ID!): [AgendaCategory]
   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]
   eventsByOrganizationConnection(first: Int, orderBy: EventOrderByInput, skip: Int, where: EventWhereInput): [Event!]!
-  fundsByOrganization(organizationId: ID!, where: FundWhereInput): [Fund]
+  fundsByOrganization(orderBy: FundOrderByInput, organizationId: ID!, where: FundWhereInput): [Fund]
   getAgendaItem(id: ID!): AgendaItem
   getAgendaSection(id: ID!): AgendaSection
   getAllAgendaItems: [AgendaItem]
@@ -1456,13 +1487,15 @@ type Query {
   getEventAttendee(eventId: ID!, userId: ID!): EventAttendee
   getEventAttendeesByEventId(eventId: ID!): [EventAttendee]
   getEventInvitesByUserId(userId: ID!): [EventAttendee!]!
-  getFundById(id: ID!): Fund!
-  getFundraisingCampaignById(id: ID!): FundraisingCampaign!
+  getFundById(id: ID!, orderBy: CampaignOrderByInput, where: CampaignWhereInput): Fund!
+  getFundraisingCampaignById(id: ID!, orderBy: PledgeOrderByInput): FundraisingCampaign!
   getFundraisingCampaignPledgeById(id: ID!): FundraisingCampaignPledge!
   getNoteById(id: ID!): Note!
   getPlugins: [Plugin]
   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]
@@ -1564,8 +1597,8 @@ enum Status {
 
 type Subscription {
   directMessageChat: MessageChat
-  messageSentToDirectChat: DirectChatMessage
-  messageSentToGroupChat: GroupChatMessage
+  messageSentToDirectChat(userId: ID!): DirectChatMessage
+  messageSentToGroupChat(userId: ID!): GroupChatMessage
   onPluginUpdate: Plugin
 }
 
@@ -1638,7 +1671,6 @@ input UpdateAgendaItemInput {
   relatedEvent: ID
   sequence: Int
   title: String
-  updatedBy: ID!
   urls: [String]
   users: [ID]
 }
@@ -1700,6 +1732,7 @@ input UpdateFundCampaignPledgeInput {
   currency: Currency
   endDate: Date
   startDate: Date
+  users: [ID]
 }
 
 input UpdateFundInput {
@@ -1884,6 +1917,7 @@ type UserTag {
 type UserTagsConnection {
   edges: [UserTagsConnectionEdge!]!
   pageInfo: DefaultConnectionPageInfo!
+  totalCount: PositiveInt
 }
 
 """A default connection edge on the UserTag type for UserTagsConnection."""
@@ -1979,7 +2013,7 @@ enum WeekDays {
 }
 
 input createChatInput {
-  organizationId: ID!
+  organizationId: ID
   userIds: [ID!]!
 }