Events attended support added with fetching recurring event query

schema.graphql

@@ -1501,6 +1501,7 @@ type Query {
   directChatsMessagesByChatID(id: ID!): [DirectChatMessage]
   event(id: ID!): Event
   eventVolunteersByEvent(id: ID!): [EventVolunteer]
+  eventsAttendedByUser(id: ID, orderBy: EventOrderByInput): [Event]
   eventsByOrganization(id: ID, orderBy: EventOrderByInput): [Event]
   eventsByOrganizationConnection(first: Int, orderBy: EventOrderByInput, skip: Int, where: EventWhereInput): [Event!]!
   fundsByOrganization(orderBy: FundOrderByInput, organizationId: ID!, where: FundWhereInput): [Fund]
@@ -1522,6 +1523,7 @@ type Query {
   getNoteById(id: ID!): Note!
   getPledgesByUserId(orderBy: PledgeOrderByInput, userId: ID!, where: PledgeWhereInput): [FundraisingCampaignPledge]
   getPlugins: [Plugin]
+  getRecurringEvents(baseRecurringEventId: ID!): [Event]
   getUserTag(id: ID!): UserTag
   getUserTagAncestors(id: ID!): [UserTag]
   getVenueByOrgId(first: Int, orderBy: VenueOrderByInput, orgId: ID!, skip: Int, where: VenueWhereInput): [Venue]
@@ -1827,6 +1829,7 @@ type User {
   email: EmailAddress!
   employmentStatus: EmploymentStatus
   eventAdmin: [Event]
+  eventsAttended: [Event]
   firstName: String!
   gender: Gender
   identifier: Int!

src/models/User.ts

@@ -48,6 +48,7 @@ export interface InterfaceUser {
     mobile: string;
     work: string;
   };
+  eventsAttended: PopulatedDoc<InterfaceEvent & Document>[];
 
   registeredEvents: PopulatedDoc<InterfaceEvent & Document>[];
   status: string;
@@ -77,6 +78,7 @@ export interface InterfaceUser {
  * @param phone - User's contact numbers (home, mobile, work).
  * @param registeredEvents - Events the user has registered for.
  * @param status - User's status (ACTIVE, BLOCKED, DELETED).
+ * @param eventsAttended - Events the user has attended.
  * @param updatedAt - Timestamp of when the user was last updated.
  */
 const userSchema = new Schema(
@@ -220,6 +222,12 @@ const userSchema = new Schema(
         ref: "Event",
       },
     ],
+    eventsAttended: [
+      {
+        type: Schema.Types.ObjectId,
+        ref: "Event",
+      },
+    ],
     status: {
       type: String,
       required: true,

src/resolvers/Mutation/addEventAttendee.ts

@@ -172,5 +172,22 @@ export const addEventAttendee: MutationResolvers["addEventAttendee"] = async (
 
   await EventAttendee.create({ ...args.data });
 
-  return requestUser;
+  const updatedUser = await User.findByIdAndUpdate(
+    args.data.userId,
+    {
+      $push: {
+        eventsAttended: args.data.eventId,
+      },
+    },
+    { new: true },
+  );
+
+  if (!updatedUser) {
+    throw new errors.NotFoundError(
+      requestContext.translate(USER_NOT_AUTHORIZED_ERROR.MESSAGE),
+      USER_NOT_AUTHORIZED_ERROR.CODE,
+      USER_NOT_AUTHORIZED_ERROR.PARAM,
+    );
+  }
+  return updatedUser;
 };

src/resolvers/Query/eventsAttendedByUser.ts

@@ -0,0 +1,28 @@
+import type { QueryResolvers } from "../../types/generatedGraphQLTypes";
+import { Event } from "../../models";
+import { getSort } from "./helperFunctions/getSort";
+
+/**
+ * This query will fetch all the events for which user attended from the database.
+ * @param _parent-
+ * @param args - An object that contains `id` of the user and `orderBy`.
+ * @returns An object that contains the Event data.
+ * @remarks The query function uses `getSort()` function to sort the data in specified.
+ */
+export const eventsAttendedByUser: QueryResolvers["eventsAttendedByUser"] =
+  async (_parent, args) => {
+    const sort = getSort(args.orderBy);
+
+    return await Event.find({
+      registrants: {
+        $elemMatch: {
+          userId: args.id,
+          status: "ACTIVE",
+        },
+      },
+    })
+      .sort(sort)
+      .populate("creatorId", "-password")
+      .populate("admins", "-password")
+      .lean();
+  };

src/resolvers/Query/getRecurringEvents.ts

@@ -0,0 +1,25 @@
+import type { QueryResolvers } from "../../types/generatedGraphQLTypes";
+import { Event } from "../../models";
+
+/**
+ * This query will fetch all the events with the same BaseRecurringEventId from the database.
+ * @param _parent -
+ * @param args - An object that contains `baseRecurringEventId` of the base recurring event.
+ * @returns An array of `Event` objects that are instances of the base recurring event.
+ */
+
+export const getRecurringEvents: QueryResolvers["getRecurringEvents"] = async (
+  _parent,
+  args,
+) => {
+  try {
+    const recurringEvents = await Event.find({
+      baseRecurringEventId: args.baseRecurringEventId,
+    }).lean();
+
+    return recurringEvents;
+  } catch (error) {
+    console.error("Error fetching recurring events:", error);
+    throw error;
+  }
+};

src/resolvers/Query/index.ts

@@ -53,6 +53,9 @@ import { getEventAttendeesByEventId } from "./getEventAttendeesByEventId";
 import { getVenueByOrgId } from "./getVenueByOrgId";
 import { getAllNotesForAgendaItem } from "./getAllNotesForAgendaItem";
 import { getNoteById } from "./getNoteById";
+import { eventsAttendedByUser } from "./eventsAttendedByUser";
+import { getRecurringEvents } from "./getRecurringEvents";
+
 export const Query: QueryResolvers = {
   actionItemsByEvent,
   agendaCategory,
@@ -86,6 +89,7 @@ export const Query: QueryResolvers = {
   getNoteById,
   getlanguage,
   getPlugins,
+  getRecurringEvents,
   getUserTag,
   getUserTagAncestors,
   isSampleOrganization,
@@ -108,4 +112,5 @@ export const Query: QueryResolvers = {
   getEventAttendee,
   getEventAttendeesByEventId,
   getVenueByOrgId,
+  eventsAttendedByUser,
 };

src/resolvers/Query/organizationsMemberConnection.ts

@@ -141,6 +141,7 @@ export const organizationsMemberConnection: QueryResolvers["organizationsMemberC
         registeredEvents: user.registeredEvents,
         status: user.status,
         updatedAt: user.updatedAt,
+        eventsAttended: user.eventsAttended,
       }));
     } else {
       users = usersModel.docs.map((user) => ({
@@ -175,6 +176,7 @@ export const organizationsMemberConnection: QueryResolvers["organizationsMemberC
         registeredEvents: user.registeredEvents,
         status: user.status,
         updatedAt: user.updatedAt,
+        eventsAttended: user.eventsAttended,
       }));
     }
 

src/typeDefs/queries.ts

@@ -134,6 +134,8 @@ export const queries = gql`
 
     getAllNotesForAgendaItem(agendaItemId: ID!): [Note]
 
+    getRecurringEvents(baseRecurringEventId: ID!): [Event]
+
     advertisementsConnection(
       after: String
       before: String
@@ -200,5 +202,7 @@ export const queries = gql`
     ): [UserData]! @auth
 
     venue(id: ID!): Venue
+
+    eventsAttendedByUser(id: ID, orderBy: EventOrderByInput): [Event]
   }
 `;

src/typeDefs/types.ts

@@ -649,6 +649,7 @@ export const types = gql`
     phone: UserPhone
     membershipRequests: [MembershipRequest]
     registeredEvents: [Event]
+    eventsAttended: [Event]
     pluginCreationAllowed: Boolean!
     tagsAssignedWith(
       after: String

src/types/generatedGraphQLTypes.ts

@@ -2284,6 +2284,7 @@ export type Query = {
   directChatsMessagesByChatID?: Maybe<Array<Maybe<DirectChatMessage>>>;
   event?: Maybe<Event>;
   eventVolunteersByEvent?: Maybe<Array<Maybe<EventVolunteer>>>;
+  eventsAttendedByUser?: Maybe<Array<Maybe<Event>>>;
   eventsByOrganization?: Maybe<Array<Maybe<Event>>>;
   eventsByOrganizationConnection: Array<Event>;
   fundsByOrganization?: Maybe<Array<Maybe<Fund>>>;
@@ -2305,6 +2306,7 @@ export type Query = {
   getNoteById: Note;
   getPledgesByUserId?: Maybe<Array<Maybe<FundraisingCampaignPledge>>>;
   getPlugins?: Maybe<Array<Maybe<Plugin>>>;
+  getRecurringEvents?: Maybe<Array<Maybe<Event>>>;
   getUserTag?: Maybe<UserTag>;
   getUserTagAncestors?: Maybe<Array<Maybe<UserTag>>>;
   getVenueByOrgId?: Maybe<Array<Maybe<Venue>>>;
@@ -2419,6 +2421,12 @@ export type QueryEventVolunteersByEventArgs = {
 };
 
 
+export type QueryEventsAttendedByUserArgs = {
+  id?: InputMaybe<Scalars['ID']['input']>;
+  orderBy?: InputMaybe<EventOrderByInput>;
+};
+
+
 export type QueryEventsByOrganizationArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   orderBy?: InputMaybe<EventOrderByInput>;
@@ -2525,6 +2533,11 @@ export type QueryGetPledgesByUserIdArgs = {
 };
 
 
+export type QueryGetRecurringEventsArgs = {
+  baseRecurringEventId: Scalars['ID']['input'];
+};
+
+
 export type QueryGetUserTagArgs = {
   id: Scalars['ID']['input'];
 };
@@ -2939,6 +2952,7 @@ export type User = {
   email: Scalars['EmailAddress']['output'];
   employmentStatus?: Maybe<EmploymentStatus>;
   eventAdmin?: Maybe<Array<Maybe<Event>>>;
+  eventsAttended?: Maybe<Array<Maybe<Event>>>;
   firstName: Scalars['String']['output'];
   gender?: Maybe<Gender>;
   identifier: Scalars['Int']['output'];
@@ -4597,6 +4611,7 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
   directChatsMessagesByChatID?: Resolver<Maybe<Array<Maybe<ResolversTypes['DirectChatMessage']>>>, ParentType, ContextType, RequireFields<QueryDirectChatsMessagesByChatIdArgs, 'id'>>;
   event?: Resolver<Maybe<ResolversTypes['Event']>, ParentType, ContextType, RequireFields<QueryEventArgs, 'id'>>;
   eventVolunteersByEvent?: Resolver<Maybe<Array<Maybe<ResolversTypes['EventVolunteer']>>>, ParentType, ContextType, RequireFields<QueryEventVolunteersByEventArgs, 'id'>>;
+  eventsAttendedByUser?: Resolver<Maybe<Array<Maybe<ResolversTypes['Event']>>>, ParentType, ContextType, Partial<QueryEventsAttendedByUserArgs>>;
   eventsByOrganization?: Resolver<Maybe<Array<Maybe<ResolversTypes['Event']>>>, ParentType, ContextType, Partial<QueryEventsByOrganizationArgs>>;
   eventsByOrganizationConnection?: Resolver<Array<ResolversTypes['Event']>, ParentType, ContextType, Partial<QueryEventsByOrganizationConnectionArgs>>;
   fundsByOrganization?: Resolver<Maybe<Array<Maybe<ResolversTypes['Fund']>>>, ParentType, ContextType, RequireFields<QueryFundsByOrganizationArgs, 'organizationId'>>;
@@ -4618,6 +4633,7 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
   getNoteById?: Resolver<ResolversTypes['Note'], ParentType, ContextType, RequireFields<QueryGetNoteByIdArgs, 'id'>>;
   getPledgesByUserId?: Resolver<Maybe<Array<Maybe<ResolversTypes['FundraisingCampaignPledge']>>>, ParentType, ContextType, RequireFields<QueryGetPledgesByUserIdArgs, 'userId'>>;
   getPlugins?: Resolver<Maybe<Array<Maybe<ResolversTypes['Plugin']>>>, ParentType, ContextType>;
+  getRecurringEvents?: Resolver<Maybe<Array<Maybe<ResolversTypes['Event']>>>, ParentType, ContextType, RequireFields<QueryGetRecurringEventsArgs, 'baseRecurringEventId'>>;
   getUserTag?: Resolver<Maybe<ResolversTypes['UserTag']>, ParentType, ContextType, RequireFields<QueryGetUserTagArgs, 'id'>>;
   getUserTagAncestors?: Resolver<Maybe<Array<Maybe<ResolversTypes['UserTag']>>>, ParentType, ContextType, RequireFields<QueryGetUserTagAncestorsArgs, 'id'>>;
   getVenueByOrgId?: Resolver<Maybe<Array<Maybe<ResolversTypes['Venue']>>>, ParentType, ContextType, RequireFields<QueryGetVenueByOrgIdArgs, 'orgId'>>;
@@ -4722,6 +4738,7 @@ export type UserResolvers<ContextType = any, ParentType extends ResolversParentT
   email?: Resolver<ResolversTypes['EmailAddress'], ParentType, ContextType>;
   employmentStatus?: Resolver<Maybe<ResolversTypes['EmploymentStatus']>, ParentType, ContextType>;
   eventAdmin?: Resolver<Maybe<Array<Maybe<ResolversTypes['Event']>>>, ParentType, ContextType>;
+  eventsAttended?: Resolver<Maybe<Array<Maybe<ResolversTypes['Event']>>>, ParentType, ContextType>;
   firstName?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   gender?: Resolver<Maybe<ResolversTypes['Gender']>, ParentType, ContextType>;
   identifier?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;

tests/resolvers/Mutation/addEventAttendee.spec.ts

@@ -153,39 +153,41 @@ describe("resolvers -> Mutation -> addEventAttendee", () => {
   });
 
   it(`registers the request user for the event successfully and returns the request user`, async () => {
-    const eventOrganizationId = testEvent?.organization._id;
-    const userId = randomTestUser?._id;
+    if (testEvent?.organization) {
+      const eventOrganizationId = testEvent?.organization._id;
+      const userId = randomTestUser?._id;
 
-    await User.updateOne(
-      { _id: userId },
-      { $addToSet: { joinedOrganizations: eventOrganizationId } },
-    );
-
-    const args: MutationAddEventAttendeeArgs = {
-      data: {
-        userId: userId,
-        eventId: testEvent?._id ?? "",
-      },
-    };
-
-    const context = { userId: testUser?._id };
+      await User.updateOne(
+        { _id: userId },
+        { $addToSet: { joinedOrganizations: eventOrganizationId } },
+      );
 
-    const { addEventAttendee: addEventAttendeeResolver } = await import(
-      "../../../src/resolvers/Mutation/addEventAttendee"
-    );
-    const payload = await addEventAttendeeResolver?.({}, args, context);
+      const args: MutationAddEventAttendeeArgs = {
+        data: {
+          userId: userId,
+          eventId: testEvent?._id.toString() ?? "",
+        },
+      };
 
-    const requestUser = await User.findOne({
-      _id: userId?._id,
-    }).lean();
+      const context = { userId: testUser?._id };
 
-    const isUserRegistered = await EventAttendee.exists({
-      ...args.data,
-    });
-    expect(payload).toEqual(requestUser);
-    expect(isUserRegistered).toBeTruthy();
+      const { addEventAttendee: addEventAttendeeResolver } = await import(
+        "../../../src/resolvers/Mutation/addEventAttendee"
+      );
+      const payload = await addEventAttendeeResolver?.({}, args, context);
+
+      expect(payload).toBeDefined();
+
+      const requestUser = await User.findOne({
+        _id: userId?._id,
+      }).lean();
+      expect(payload).toEqual(expect.objectContaining(requestUser));
+      const isUserRegistered = await EventAttendee.exists({
+        ...args.data,
+      });
+      expect(isUserRegistered).toBeTruthy();
+    }
   });
-
   it(`throws UnauthorizedError if the requestUser is not a member of the organization`, async () => {
     const { requestContext } = await import("../../../src/libraries");
 
@@ -199,11 +201,10 @@ describe("resolvers -> Mutation -> addEventAttendee", () => {
     );
 
     try {
-      // Create a test user who is not a member of the organization
       const args: MutationAddEventAttendeeArgs = {
         data: {
           userId: testUser?._id,
-          eventId: testEvent!._id,
+          eventId: testEvent!._id.toString(),
         },
       };
 
@@ -291,4 +292,38 @@ describe("resolvers -> Mutation -> addEventAttendee", () => {
       );
     }
   });
+  it("throws NotFoundError if the user is not found after update", async () => {
+    const { requestContext } = await import("../../../src/libraries");
+
+    const spy = vi
+      .spyOn(requestContext, "translate")
+      .mockImplementationOnce((message) => `Translated ${message}`);
+
+    const mockFindByIdAndUpdate = vi
+      .spyOn(User, "findByIdAndUpdate")
+      .mockResolvedValueOnce(null);
+
+    const args: MutationAddEventAttendeeArgs = {
+      data: {
+        userId: testUser?._id,
+        eventId: testEvent?._id.toString() ?? "",
+      },
+    };
+
+    const context = { userId: testUser?._id };
+
+    try {
+      const { addEventAttendee: addEventAttendeeResolver } = await import(
+        "../../../src/resolvers/Mutation/addEventAttendee"
+      );
+
+      await addEventAttendeeResolver?.({}, args, context);
+    } catch (error: unknown) {
+      expect((error as Error).message).toEqual(
+        `Translated ${USER_NOT_AUTHORIZED_ERROR.MESSAGE}`,
+      );
+      expect(spy).toHaveBeenLastCalledWith(USER_NOT_AUTHORIZED_ERROR.MESSAGE);
+    }
+    mockFindByIdAndUpdate.mockRestore();
+  });
 });