Add support for Volunteer Leaderboard, linking Volunteer/Groups/Membership & Integrated with Action Items

.github/workflows/pull-request.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
-          ./.github/workflows/countline.py --lines 600 --exclude_files src/types/generatedGraphQLTypes.ts tests src/typeDefs/types.ts src/constants.ts
+          ./.github/workflows/countline.py --lines 600 --exclude_files src/types/generatedGraphQLTypes.ts tests src/typeDefs/types.ts src/constants.ts src/typeDefs/inputs.ts
 
       - name: Check for TSDoc comments
         run: npm run check-tsdoc # Run the TSDoc check script

codegen.ts

@@ -98,6 +98,9 @@ const config: CodegenConfig = {
           User: "../models/User#InterfaceUser",
 
           Venue: "../models/Venue#InterfaceVenue",
+
+          VolunteerMembership:
+            "../models/VolunteerMembership#InterfaceVolunteerMembership",
         },
 
         useTypeImports: true,

schema.graphql

@@ -5,8 +5,11 @@ directive @role(requires: UserType) on FIELD_DEFINITION
 type ActionItem {
   _id: ID!
   actionItemCategory: ActionItemCategory
-  allotedHours: Float
-  assignee: User
+  allottedHours: Float
+  assignee: EventVolunteer
+  assigneeGroup: EventVolunteerGroup
+  assigneeType: String!
+  assigneeUser: User
   assigner: User
   assignmentDate: Date!
   completionDate: Date!
@@ -41,6 +44,7 @@ input ActionItemWhereInput {
   categoryName: String
   event_id: ID
   is_completed: Boolean
+  orgId: ID
 }
 
 enum ActionItemsOrderByInput {
@@ -310,8 +314,9 @@ interface ConnectionPageInfo {
 scalar CountryCode
 
 input CreateActionItemInput {
-  allotedHours: Float
+  allottedHours: Float
   assigneeId: ID!
+  assigneeType: String!
   dueDate: Date
   eventId: ID
   preCompletionNotes: String
@@ -675,6 +680,8 @@ type Event {
   startTime: Time
   title: String!
   updatedAt: DateTime!
+  volunteerGroups: [EventVolunteerGroup]
+  volunteers: [EventVolunteer]
 }
 
 type EventAttendee {
@@ -739,21 +746,25 @@ enum EventOrderByInput {
 
 type EventVolunteer {
   _id: ID!
+  assignments: [ActionItem]
   createdAt: DateTime!
   creator: User
   event: Event
-  group: EventVolunteerGroup
-  isAssigned: Boolean
-  isInvited: Boolean
-  response: String
+  groups: [EventVolunteerGroup]
+  hasAccepted: Boolean!
+  hoursHistory: [HoursHistory]
+  hoursVolunteered: Float!
+  isPublic: Boolean!
   updatedAt: DateTime!
   user: User!
 }
 
 type EventVolunteerGroup {
   _id: ID!
+  assignments: [ActionItem]
   createdAt: DateTime!
   creator: User
+  description: String
   event: Event
   leader: User!
   name: String
@@ -763,20 +774,32 @@ type EventVolunteerGroup {
 }
 
 input EventVolunteerGroupInput {
+  description: String
   eventId: ID!
-  name: String
+  leaderId: ID!
+  name: String!
+  volunteerUserIds: [ID!]!
   volunteersRequired: Int
 }
 
+enum EventVolunteerGroupOrderByInput {
+  assignments_ASC
+  assignments_DESC
+  volunteers_ASC
+  volunteers_DESC
+}
+
 input EventVolunteerGroupWhereInput {
   eventId: ID
+  leaderName: String
   name_contains: String
-  volunteerId: ID
+  orgId: ID
+  userId: ID
 }
 
 input EventVolunteerInput {
   eventId: ID!
-  groupId: ID!
+  groupId: ID
   userId: ID!
 }
 
@@ -785,6 +808,19 @@ enum EventVolunteerResponse {
   YES
 }
 
+input EventVolunteerWhereInput {
+  eventId: ID
+  groupId: ID
+  hasAccepted: Boolean
+  id: ID
+  name_contains: String
+}
+
+enum EventVolunteersOrderByInput {
+  hoursVolunteered_ASC
+  hoursVolunteered_DESC
+}
+
 input EventWhereInput {
   description: String
   description_contains: String
@@ -942,6 +978,11 @@ type Group {
   updatedAt: DateTime!
 }
 
+type HoursHistory {
+  date: Date!
+  hours: Float!
+}
+
 type InvalidCursor implements FieldError {
   message: String!
   path: [String!]!
@@ -1093,6 +1134,7 @@ type Mutation {
   createUserFamily(data: createUserFamilyInput!): UserFamily!
   createUserTag(input: CreateUserTagInput!): UserTag
   createVenue(data: VenueInput!): Venue
+  createVolunteerMembership(data: VolunteerMembershipInput!): VolunteerMembership!
   deleteAdvertisement(id: ID!): DeleteAdvertisementPayload
   deleteAgendaCategory(id: ID!): ID!
   deleteDonationById(id: ID!): DeletePayload!
@@ -1157,7 +1199,7 @@ type Mutation {
   updateCommunity(data: UpdateCommunityInput!): Boolean!
   updateEvent(data: UpdateEventInput!, id: ID!, recurrenceRuleData: RecurrenceRuleInput, recurringEventUpdateType: RecurringEventMutationType): Event!
   updateEventVolunteer(data: UpdateEventVolunteerInput, id: ID!): EventVolunteer!
-  updateEventVolunteerGroup(data: UpdateEventVolunteerGroupInput, id: ID!): EventVolunteerGroup!
+  updateEventVolunteerGroup(data: UpdateEventVolunteerGroupInput!, id: ID!): EventVolunteerGroup!
   updateFund(data: UpdateFundInput!, id: ID!): Fund!
   updateFundraisingCampaign(data: UpdateFundCampaignInput!, id: ID!): FundraisingCampaign!
   updateFundraisingCampaignPledge(data: UpdateFundCampaignPledgeInput!, id: ID!): FundraisingCampaignPledge!
@@ -1171,6 +1213,7 @@ type Mutation {
   updateUserProfile(data: UpdateUserInput, file: String): User!
   updateUserRoleInOrganization(organizationId: ID!, role: String!, userId: ID!): Organization!
   updateUserTag(input: UpdateUserTagInput!): UserTag
+  updateVolunteerMembership(id: ID!, status: String!): VolunteerMembership!
 }
 
 type Note {
@@ -1462,6 +1505,7 @@ type Query {
   actionItemCategoriesByOrganization(orderBy: ActionItemsOrderByInput, organizationId: ID!, where: ActionItemCategoryWhereInput): [ActionItemCategory]
   actionItemsByEvent(eventId: ID!): [ActionItem]
   actionItemsByOrganization(eventId: ID, orderBy: ActionItemsOrderByInput, organizationId: ID!, where: ActionItemWhereInput): [ActionItem]
+  actionItemsByUser(orderBy: ActionItemsOrderByInput, userId: ID!, where: ActionItemWhereInput): [ActionItem]
   adminPlugin(orgId: ID!): [Plugin]
   advertisementsConnection(after: String, before: String, first: PositiveInt, last: PositiveInt): AdvertisementsConnection
   agendaCategory(id: ID!): AgendaCategory!
@@ -1474,9 +1518,8 @@ type Query {
   customDataByOrganization(organizationId: ID!): [UserCustomData!]!
   customFieldsByOrganization(id: ID!): [OrganizationCustomField]
   event(id: ID!): Event
-  eventVolunteersByEvent(id: ID!): [EventVolunteer]
   eventsByOrganization(id: ID, orderBy: EventOrderByInput): [Event]
-  eventsByOrganizationConnection(first: Int, orderBy: EventOrderByInput, skip: Int, where: EventWhereInput): [Event!]!
+  eventsByOrganizationConnection(first: Int, orderBy: EventOrderByInput, skip: Int, upcomingOnly: Boolean, where: EventWhereInput): [Event!]!
   fundsByOrganization(orderBy: FundOrderByInput, organizationId: ID!, where: FundWhereInput): [Fund]
   getAgendaItem(id: ID!): AgendaItem
   getAgendaSection(id: ID!): AgendaSection
@@ -1489,7 +1532,8 @@ type Query {
   getEventAttendee(eventId: ID!, userId: ID!): EventAttendee
   getEventAttendeesByEventId(eventId: ID!): [EventAttendee]
   getEventInvitesByUserId(userId: ID!): [EventAttendee!]!
-  getEventVolunteerGroups(where: EventVolunteerGroupWhereInput): [EventVolunteerGroup]!
+  getEventVolunteerGroups(orderBy: EventVolunteerGroupOrderByInput, where: EventVolunteerGroupWhereInput!): [EventVolunteerGroup]!
+  getEventVolunteers(orderBy: EventVolunteersOrderByInput, where: EventVolunteerWhereInput!): [EventVolunteer]!
   getFundById(id: ID!, orderBy: CampaignOrderByInput, where: CampaignWhereInput): Fund!
   getFundraisingCampaignPledgeById(id: ID!): FundraisingCampaignPledge!
   getFundraisingCampaigns(campaignOrderby: CampaignOrderByInput, pledgeOrderBy: PledgeOrderByInput, where: CampaignWhereInput): [FundraisingCampaign]!
@@ -1498,6 +1542,8 @@ type Query {
   getPlugins: [Plugin]
   getUserTag(id: ID!): UserTag
   getVenueByOrgId(first: Int, orderBy: VenueOrderByInput, orgId: ID!, skip: Int, where: VenueWhereInput): [Venue]
+  getVolunteerMembership(orderBy: VolunteerMembershipOrderByInput, where: VolunteerMembershipWhereInput!): [VolunteerMembership]!
+  getVolunteerRanks(orgId: ID!, where: VolunteerRankWhereInput!): [VolunteerRank]!
   getlanguage(lang_code: String!): [Translation]
   hasSubmittedFeedback(eventId: ID!, userId: ID!): Boolean
   isSampleOrganization(id: ID!): Boolean!
@@ -1643,8 +1689,9 @@ input UpdateActionItemCategoryInput {
 }
 
 input UpdateActionItemInput {
-  allotedHours: Float
+  allottedHours: Float
   assigneeId: ID
+  assigneeType: String
   completionDate: Date
   dueDate: Date
   isCompleted: Boolean
@@ -1714,16 +1761,16 @@ input UpdateEventInput {
 }
 
 input UpdateEventVolunteerGroupInput {
-  eventId: ID
+  description: String
+  eventId: ID!
   name: String
   volunteersRequired: Int
 }
 
 input UpdateEventVolunteerInput {
-  eventId: ID
-  isAssigned: Boolean
-  isInvited: Boolean
-  response: EventVolunteerResponse
+  assignments: [ID]
+  hasAccepted: Boolean
+  isPublic: Boolean
 }
 
 input UpdateFundCampaignInput {
@@ -2050,6 +2097,53 @@ input VenueWhereInput {
   name_starts_with: String
 }
 
+type VolunteerMembership {
+  _id: ID!
+  createdAt: DateTime!
+  createdBy: User
+  event: Event!
+  group: EventVolunteerGroup
+  status: String!
+  updatedAt: DateTime!
+  updatedBy: User
+  volunteer: EventVolunteer!
+}
+
+input VolunteerMembershipInput {
+  event: ID!
+  group: ID
+  status: String!
+  userId: ID!
+}
+
+enum VolunteerMembershipOrderByInput {
+  createdAt_ASC
+  createdAt_DESC
+}
+
+input VolunteerMembershipWhereInput {
+  eventId: ID
+  eventTitle: String
+  filter: String
+  groupId: ID
+  status: String
+  userId: ID
+  userName: String
+}
+
+type VolunteerRank {
+  hoursVolunteered: Float!
+  rank: Int!
+  user: User!
+}
+
+input VolunteerRankWhereInput {
+  limit: Int
+  nameContains: String
+  orderBy: String!
+  timeFrame: String!
+}
+
 enum WeekDays {
   FRIDAY
   MONDAY

src/constants.ts

@@ -668,6 +668,13 @@ export const EVENT_VOLUNTEER_INVITE_USER_MISTMATCH = Object.freeze({
   PARAM: "eventVolunteers",
 });
 
+export const EVENT_VOLUNTEER_MEMBERSHIP_NOT_FOUND_ERROR = Object.freeze({
+  DESC: "Volunteer membership not found",
+  CODE: "volunteerMembership.notFound",
+  MESSAGE: "volunteerMembership.notFound",
+  PARAM: "volunteerMemberships",
+});
+
 export const USER_ALREADY_CHECKED_IN = Object.freeze({
   MESSAGE: "The user has already been checked in for this event.",
   CODE: "user.alreadyCheckedIn",