Updating the main branch to the latest develop code (#2329)

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

* Merge develop into main

---------

Co-authored-by: Peter Harrison <[email protected]>

README.md

@@ -54,4 +54,3 @@ Core features include:
 
 1. Visit our [YouTube Channel playlists](https://www.youtube.com/@PalisadoesOrganization/playlists) for more insights
    1. The "Getting Started - Developers" videos are extremely helpful for new open source contributors.
-

package.json

@@ -48,11 +48,11 @@
     "@graphql-inspector/cli": "^4.0.3",
     "@graphql-tools/resolvers-composition": "^7.0.1",
     "@graphql-tools/schema": "^10.0.0",
-    "@graphql-tools/utils": "^10.1.3",
+    "@graphql-tools/utils": "^10.2.0",
     "@parcel/watcher": "^2.4.1",
     "@types/graphql-upload": "^16.0.5",
     "@types/yargs": "^17.0.32",
-    "axios": "^1.6.8",
+    "axios": "^1.7.2",
     "bcryptjs": "^2.4.3",
     "bluebird": "3.7.2",
     "cls-hooked": "^4.2.2",
@@ -82,26 +82,26 @@
     "markdown-toc": "^1.2.0",
     "mongodb": "^6.3.0",
     "mongoose": "^8.3.2",
-    "mongoose-paginate-v2": "^1.8.0",
+    "mongoose-paginate-v2": "^1.8.1",
     "morgan": "^1.10.0",
     "nanoid": "^5.0.7",
     "nodemailer": "^6.9.12",
     "pm2": "^5.2.0",
-    "redis": "^4.6.13",
+    "redis": "^4.6.14",
     "rrule": "^2.8.1",
-    "typedoc-plugin-markdown": "^3.17.1",
+    "typedoc-plugin-markdown": "^4.0.1",
     "uuid": "^9.0.0",
-    "validator": "^13.7.0",
+    "validator": "^13.12.0",
     "winston": "^3.13.0",
-    "ws": "^8.15.0",
+    "ws": "^8.17.0",
     "yargs": "^17.7.2",
-    "zod": "^3.22.3",
+    "zod": "^3.23.8",
     "zod-error": "^1.5.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
-    "@graphql-codegen/typescript": "^4.0.6",
-    "@graphql-codegen/typescript-resolvers": "^4.0.6",
+    "@graphql-codegen/typescript": "^4.0.7",
+    "@graphql-codegen/typescript-resolvers": "^4.1.0",
     "@graphql-eslint/eslint-plugin": "^3.20.1",
     "@parcel/watcher": "^2.4.1",
     "@types/bcryptjs": "^2.4.6",
@@ -114,16 +114,16 @@
     "@types/i18n": "^0.13.12",
     "@types/inquirer": "^9.0.7",
     "@types/jsonwebtoken": "^9.0.5",
-    "@types/lodash": "^4.17.0",
+    "@types/lodash": "^4.17.4",
     "@types/mongoose-paginate-v2": "^1.6.5",
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.12.7",
-    "@types/nodemailer": "^6.4.14",
+    "@types/nodemailer": "^6.4.15",
     "@types/uuid": "^9.0.7",
-    "@types/validator": "^13.11.9",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
-    "@vitest/coverage-v8": "^1.5.2",
+    "@types/validator": "^13.11.10",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
+    "@vitest/coverage-v8": "^1.6.0",
     "cls-bluebird": "^2.1.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.56.0",
@@ -135,7 +135,7 @@
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
-    "rimraf": "^5.0.5",
+    "rimraf": "^5.0.7",
     "tsx": "^4.7.3",
     "typescript": "^5.4.5",
     "vitest": "^1.2.1"

requirements.txt

@@ -1,4 +1,4 @@
-black==24.3.0
+black==22.12.0
 pydocstyle==6.3.0
 pylint==2.15.10
 pymongo==4.3.3

schema.graphql

@@ -1434,6 +1434,7 @@ type Query {
   adminPlugin(orgId: ID!): [Plugin]
   advertisementsConnection(after: String, before: String, first: PositiveInt, last: PositiveInt): AdvertisementsConnection
   agendaCategory(id: ID!): AgendaCategory!
+  agendaItemCategoriesByOrganization(organizationId: ID!): [AgendaCategory]
   checkAuth: User!
   customDataByOrganization(organizationId: ID!): [UserCustomData!]!
   customFieldsByOrganization(id: ID!): [OrganizationCustomField]
@@ -1829,6 +1830,8 @@ type UserNotFoundError implements Error {
 }
 
 enum UserOrderByInput {
+  createdAt_ASC
+  createdAt_DESC
   email_ASC
   email_DESC
   firstName_ASC

setup.ts

@@ -574,7 +574,7 @@ export async function twoFactorAuth(): Promise<void> {
       type: "input",
       name: "email",
       message: "Enter your email:",
-      validate: (input: string) =>
+      validate: (input: string): string | boolean =>
         isValidEmail(input) || "Invalid email. Please try again.",
     },
     {
@@ -860,7 +860,7 @@ async function main(): Promise<void> {
       type: "input",
       name: "serverPort",
       message: "Enter the server port:",
-      default: 4000,
+      default: process.env.SERVER_PORT || 4000,
     },
   ]);
   if (process.env.NODE_ENV === "development") {
@@ -945,7 +945,7 @@ async function main(): Promise<void> {
         MAXIMUM_IMAGE_SIZE_LIMIT_KB / 1000
       }`,
       default: 3,
-      validate: (input: number) =>
+      validate: (input: number): boolean | string =>
         validateImageFileSize(input) ||
         `Enter a valid number between 0 and ${
           MAXIMUM_IMAGE_SIZE_LIMIT_KB / 1000

src/resolvers/FundraisingCampagin/campaignPledges.ts

@@ -10,6 +10,8 @@ export const pledges: FundraisingCampaignResolvers["pledges"] = async (
   parent,
 ) => {
   return await FundraisingCampaignPledge.find({
-    campaignId: parent._id,
-  }).lean();
+    campaigns: parent._id,
+  })
+    .populate("users")
+    .lean();
 };

src/resolvers/Mutation/removeAgendaSection.ts

@@ -82,7 +82,10 @@ export const removeAgendaSection: MutationResolvers["removeAgendaSection"] =
 
     // Check if the current user is the creator of the agenda section or is a superadmin
     if (
-      !agendaSection.createdBy.equals(currentUser._id) &&
+      !(
+        agendaSection.createdBy &&
+        agendaSection.createdBy.equals(currentUser._id)
+      ) &&
       !currentUserAppProfile.isSuperAdmin
     ) {
       throw new errors.UnauthorizedError(

src/resolvers/Mutation/updateAgendaSection.ts

@@ -88,7 +88,10 @@ export const updateAgendaSection: MutationResolvers["updateAgendaSection"] =
 
     // Check if the current user is the creator of the agenda section or is a superadmin
     if (
-      !agendaSection.createdBy.equals(currentUser._id) &&
+      !(
+        agendaSection.createdBy &&
+        agendaSection.createdBy.equals(currentUser._id)
+      ) &&
       !currentUserAppProfile.isSuperAdmin
     ) {
       throw new errors.UnauthorizedError(

src/resolvers/Organization/posts.ts

@@ -27,7 +27,11 @@ import { MAXIMUM_FETCH_LIMIT } from "../../constants";
  *
  * @throws GraphQLError Throws an error if the provided arguments are invalid.
  */
-export const posts: OrganizationResolvers["posts"] = async (parent, args) => {
+export const posts: OrganizationResolvers["posts"] = async (
+  parent,
+  args,
+  context,
+) => {
   const parseGraphQLConnectionArgumentsResult =
     await parseGraphQLConnectionArguments({
       args,
@@ -75,12 +79,21 @@ export const posts: OrganizationResolvers["posts"] = async (parent, args) => {
       .countDocuments()
       .exec(),
   ]);
+  const posts = objectList.map((post: InterfacePost) => ({
+    ...post,
+    imageUrl: post.imageUrl
+      ? new URL(post.imageUrl, context.apiRootUrl).toString()
+      : null,
+    videoUrl: post.videoUrl
+      ? new URL(post.videoUrl, context.apiRootUrl).toString()
+      : null,
+  }));
   return transformToDefaultGraphQLConnection<
     ParsedCursor,
     InterfacePost,
     InterfacePost
   >({
-    objectList,
+    objectList: posts,
     parsedArgs,
     totalCount,
   });

src/resolvers/Query/agendaItemCategoriesByOrganization.ts

@@ -0,0 +1,14 @@
+import type { QueryResolvers } from "../../types/generatedGraphQLTypes";
+import { AgendaCategoryModel } from "../../models";
+/**
+ * This query will fetch all categories for the organization from database.
+ * @param _parent-
+ * @param args - An object that contains `organizationId` which is the _id of the Organization.
+ * @returns A `categories` object that holds all categories for the Organization.
+ */
+export const agendaItemCategoriesByOrganization: QueryResolvers["agendaItemCategoriesByOrganization"] =
+  async (_parent, args) => {
+    return await AgendaCategoryModel.find({
+      organizationId: args.organizationId,
+    }).lean();
+  };

src/resolvers/Query/index.ts

@@ -5,7 +5,9 @@ import { actionItemsByEvent } from "./actionItemsByEvent";
 import { actionItemsByOrganization } from "./actionItemsByOrganization";
 import { advertisementsConnection } from "./advertisementsConnection";
 import { agendaCategory } from "./agendaCategory";
+import { agendaItemCategoriesByOrganization } from "./agendaItemCategoriesByOrganization";
 import { getAgendaItem } from "./agendaItemById";
+import { getAgendaSection } from "./getAgendaSection";
 import { checkAuth } from "./checkAuth";
 import { customDataByOrganization } from "./customDataByOrganization";
 import { customFieldsByOrganization } from "./customFieldsByOrganization";
@@ -22,6 +24,7 @@ import { getDonationById } from "./getDonationById";
 import { getDonationByOrgId } from "./getDonationByOrgId";
 import { getDonationByOrgIdConnection } from "./getDonationByOrgIdConnection";
 import { getFundById } from "./getFundById";
+import { getFundraisingCampaignById } from "./getFundraisingCampaign";
 import { getPlugins } from "./getPlugins";
 import { getlanguage } from "./getlanguage";
 import { me } from "./me";
@@ -45,9 +48,11 @@ export const Query: QueryResolvers = {
   actionItemsByEvent,
   agendaCategory,
   getAgendaItem,
+  getAgendaSection,
   getAllAgendaItems,
   actionItemsByOrganization,
   actionItemCategoriesByOrganization,
+  agendaItemCategoriesByOrganization,
   checkAuth,
   getCommunityData,
   customFieldsByOrganization,
@@ -79,6 +84,7 @@ export const Query: QueryResolvers = {
   users,
   usersConnection,
   getFundById,
+  getFundraisingCampaignById,
   venue,
   fundsByOrganization,
   getEventAttendee,

src/resolvers/index.ts

@@ -14,6 +14,9 @@ import GraphQLUpload from "graphql-upload/GraphQLUpload.mjs";
 import type { Resolvers } from "../types/generatedGraphQLTypes";
 import { ActionItem } from "./ActionItem";
 import { ActionItemCategory } from "./ActionItemCategory";
+import { AgendaItem } from "./AgendaItem";
+import { AgendaSection } from "./AgendaSection";
+import { AgendaCategory } from "./AgendaCategory";
 import { CheckIn } from "./CheckIn";
 import { Comment } from "./Comment";
 import { DirectChat } from "./DirectChat";
@@ -44,6 +47,9 @@ import { currentUserExists } from "./middleware/currentUserExists";
 const resolvers: Resolvers = {
   ActionItem,
   ActionItemCategory,
+  AgendaItem,
+  AgendaSection,
+  AgendaCategory,
   Advertisement,
   CheckIn,
   Comment,

src/typeDefs/enums.ts

@@ -100,6 +100,8 @@ export const enums = gql`
     lastName_DESC
     email_ASC
     email_DESC
+    createdAt_ASC
+    createdAt_DESC
   }
 
   enum UserType {

src/typeDefs/queries.ts

@@ -18,6 +18,9 @@ export const queries = gql`
     actionItemCategoriesByOrganization(
       organizationId: ID!
     ): [ActionItemCategory]
+
+    agendaItemCategoriesByOrganization(organizationId: ID!): [AgendaCategory]
+
     getAgendaItem(id: ID!): AgendaItem
 
     getAllAgendaItems: [AgendaItem]

src/types/generatedGraphQLTypes.ts

@@ -2229,6 +2229,7 @@ export type Query = {
   adminPlugin?: Maybe<Array<Maybe<Plugin>>>;
   advertisementsConnection?: Maybe<AdvertisementsConnection>;
   agendaCategory: AgendaCategory;
+  agendaItemCategoriesByOrganization?: Maybe<Array<Maybe<AgendaCategory>>>;
   checkAuth: User;
   customDataByOrganization: Array<UserCustomData>;
   customFieldsByOrganization?: Maybe<Array<Maybe<OrganizationCustomField>>>;
@@ -2312,6 +2313,11 @@ export type QueryAgendaCategoryArgs = {
 };
 
 
+export type QueryAgendaItemCategoriesByOrganizationArgs = {
+  organizationId: Scalars['ID']['input'];
+};
+
+
 export type QueryCustomDataByOrganizationArgs = {
   organizationId: Scalars['ID']['input'];
 };
@@ -2907,6 +2913,8 @@ export type UserNotFoundError = Error & {
 };
 
 export type UserOrderByInput =
+  | 'createdAt_ASC'
+  | 'createdAt_DESC'
   | 'email_ASC'
   | 'email_DESC'
   | 'firstName_ASC'
@@ -4442,6 +4450,7 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
   adminPlugin?: Resolver<Maybe<Array<Maybe<ResolversTypes['Plugin']>>>, ParentType, ContextType, RequireFields<QueryAdminPluginArgs, 'orgId'>>;
   advertisementsConnection?: Resolver<Maybe<ResolversTypes['AdvertisementsConnection']>, ParentType, ContextType, Partial<QueryAdvertisementsConnectionArgs>>;
   agendaCategory?: Resolver<ResolversTypes['AgendaCategory'], ParentType, ContextType, RequireFields<QueryAgendaCategoryArgs, 'id'>>;
+  agendaItemCategoriesByOrganization?: Resolver<Maybe<Array<Maybe<ResolversTypes['AgendaCategory']>>>, ParentType, ContextType, RequireFields<QueryAgendaItemCategoriesByOrganizationArgs, 'organizationId'>>;
   checkAuth?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
   customDataByOrganization?: Resolver<Array<ResolversTypes['UserCustomData']>, ParentType, ContextType, RequireFields<QueryCustomDataByOrganizationArgs, 'organizationId'>>;
   customFieldsByOrganization?: Resolver<Maybe<Array<Maybe<ResolversTypes['OrganizationCustomField']>>>, ParentType, ContextType, RequireFields<QueryCustomFieldsByOrganizationArgs, 'id'>>;

tests/resolvers/FundraisingCampaign/pledge.spec.ts

@@ -25,7 +25,7 @@ describe("resolvers->FundrasingCampaign->pledge", () => {
     if (parent) {
       const pledgesPayload = await pledgesResolver?.(parent, {}, {});
       const pledges = await FundraisingCampaignPledge.find({
-        campaignId: testFundCampaigns?._id,
+        campaigns: testFundCampaigns?._id,
       }).lean();
       expect(pledgesPayload).toEqual(pledges);
     }