update field name and make resolvers nullable

schema.graphql

@@ -2,23 +2,6 @@ directive @auth on FIELD_DEFINITION
 
 directive @role(requires: UserType) on FIELD_DEFINITION
 
-type ActionItem {
-  _id: ID!
-  assignedBy: User!
-  assignedTo: User!
-  assignmentDate: Date
-  category: Category!
-  completed: Boolean
-  completionDate: Date
-  createdAt: Date!
-  createdBy: User!
-  dueDate: Date
-  event: Event
-  postCompletionNotes: String
-  preCompletionNotes: String
-  updatedAt: Date!
-}
-
 type Address {
   city: String
   countryCode: CountryCode
@@ -67,16 +50,6 @@ type AuthData {
   user: User!
 }
 
-type Category {
-  _id: ID!
-  category: String!
-  createdAt: Date!
-  createdBy: User!
-  disabled: Boolean!
-  org: Organization!
-  updatedAt: Date!
-}
-
 type CheckIn {
   _id: ID!
   allotedRoom: String
@@ -125,17 +98,6 @@ type ConnectionPageInfo {
 
 scalar CountryCode
 
-input CreateActionItemInput {
-  assignedTo: ID!
-  assignmentDate: Date
-  completed: Boolean
-  completionDate: Date
-  dueDate: Date
-  event: ID
-  postCompletionNotes: String
-  preCompletionNotes: String
-}
-
 input CreateUserTagInput {
   name: String!
   organizationId: ID!
@@ -231,7 +193,6 @@ interface Error {
 
 type Event {
   _id: ID!
-  actionItems: [ActionItem]
   admins(adminId: ID): [User]
   allDay: Boolean!
   attendees: [User!]!
@@ -505,10 +466,8 @@ type Mutation {
   blockUser(organizationId: ID!, userId: ID!): User!
   cancelMembershipRequest(membershipRequestId: ID!): MembershipRequest!
   checkIn(data: CheckInInput!): CheckIn!
-  createActionItem(categoryId: ID!, data: CreateActionItemInput!): ActionItem!
   createAdmin(data: UserAndOrganizationInput!): User!
   createAdvertisement(endDate: Date!, link: String!, name: String!, orgId: ID!, startDate: Date!, type: String!): Advertisement!
-  createCategory(category: String!, orgId: ID!): Category!
   createComment(data: CommentInput!, postId: ID!): Comment
   createDirectChat(data: createChatInput!): DirectChat!
   createDonation(amount: Float!, nameOfOrg: String!, nameOfUser: String!, orgId: ID!, payPalId: ID!, userId: ID!): Donation!
@@ -536,7 +495,6 @@ type Mutation {
   registerForEvent(id: ID!): Event!
   rejectAdmin(id: ID!): Boolean!
   rejectMembershipRequest(membershipRequestId: ID!): MembershipRequest!
-  removeActionItem(id: ID!): ActionItem!
   removeAdmin(data: UserAndOrganizationInput!): User!
   removeAdvertisement(id: ID!): Advertisement
   removeComment(id: ID!): Comment
@@ -566,8 +524,6 @@ type Mutation {
   unlikeComment(id: ID!): Comment
   unlikePost(id: ID!): Post
   unregisterForEventByUser(id: ID!): Event!
-  updateActionItem(data: UpdateActionItemInput!, id: ID!): ActionItem
-  updateCategory(data: UpdateCategoryInput!, id: ID!): Category
   updateEvent(data: UpdateEventInput, id: ID!): Event!
   updateLanguage(languageCode: String!): User!
   updateOrganization(data: UpdateOrganizationInput, file: String, id: ID!): Organization!
@@ -586,7 +542,6 @@ input OTPInput {
 
 type Organization {
   _id: ID!
-  actionCategories: [Category]
   admins(adminId: ID): [User]
   apiUrl: URL!
   blockedUsers: [User]
@@ -816,11 +771,7 @@ input PostWhereInput {
 }
 
 type Query {
-  actionItem(id: ID!): ActionItem
-  actionItemsByEvent(eventId: ID!): [ActionItem]
   adminPlugin(orgId: ID!): [Plugin]
-  categoriesByOrganization(orgId: ID!): [Category]
-  category(id: ID!): Category
   checkAuth: User!
   customDataByOrganization(organizationId: ID!): [UserCustomData!]!
   customFieldsByOrganization(id: ID!): [OrganizationCustomField]
@@ -909,19 +860,6 @@ type UnauthorizedError implements Error {
   message: String!
 }
 
-input UpdateActionItemInput {
-  assignedTo: ID
-  completed: Boolean
-  dueDate: Date
-  postCompletionNotes: String
-  preCompletionNotes: String
-}
-
-input UpdateCategoryInput {
-  category: String
-  disabled: Boolean
-}
-
 input UpdateEventInput {
   allDay: Boolean
   description: String

src/models/ActionItem.ts

@@ -19,7 +19,7 @@ export interface InterfaceActionItem {
   dueDate: Date;
   completionDate: Date;
   completed: boolean;
-  event: PopulatedDoc<InterfaceEvent & Document>;
+  eventId: PopulatedDoc<InterfaceEvent & Document>;
   createdBy: PopulatedDoc<InterfaceUser & Document>;
   createdAt: Date;
   updatedAt: Date;
@@ -36,7 +36,7 @@ export interface InterfaceActionItem {
  * @param dueDate - Due date.
  * @param completionDate - Completion date.
  * @param completed - Whether the ActionItem has been completed.
- * @param event - Event to which the ActionItem is related, refer to the `Event` model.
+ * @param eventId - Event to which the ActionItem is related, refer to the `Event` model.
  * @param createdBy - User who created the ActionItem, refer to the `User` model.
  * @param createdAt - Timestamp when the ActionItem was created.
  * @param updatedAt - Timestamp when the ActionItem was last updated.
@@ -81,7 +81,7 @@ const actionItemSchema = new Schema(
       type: Boolean,
       default: false,
     },
-    event: {
+    eventId: {
       type: Schema.Types.ObjectId,
       ref: "Event",
     },

src/resolvers/ActionItem/event.ts

@@ -3,6 +3,6 @@ import { Event } from "../../models";
 
 export const event: ActionItemResolvers["event"] = async (parent) => {
   return Event.findOne({
-    _id: parent.event,
+    _id: parent.eventId,
   }).lean();
 };

src/resolvers/Mutation/createActionItem.ts

@@ -91,16 +91,16 @@ export const createActionItem: MutationResolvers["createActionItem"] = async (
 
   let currentUserIsEventAdmin = false;
 
-  if (args.data.event) {
+  if (args.data.eventId) {
     let currEvent: InterfaceEvent | null;
 
-    const eventFoundInCache = await findEventsInCache([args.data.event]);
+    const eventFoundInCache = await findEventsInCache([args.data.eventId]);
 
     currEvent = eventFoundInCache[0];
 
     if (eventFoundInCache[0] === null) {
       currEvent = await Event.findOne({
-        _id: args.data.event,
+        _id: args.data.eventId,
       }).lean();
 
       if (currEvent !== null) {
@@ -153,14 +153,14 @@ export const createActionItem: MutationResolvers["createActionItem"] = async (
     postCompletionNotes: args.data.postCompletionNotes,
     dueDate: args.data.dueDate,
     completionDate: args.data.completionDate,
-    event: args.data.event,
+    eventId: args.data.eventId,
     createdBy: context.userId,
   });
 
-  if (args.data.event) {
+  if (args.data.eventId) {
     await Event.findOneAndUpdate(
       {
-        _id: args.data.event,
+        _id: args.data.eventId,
       },
       {
         $push: { actionItems: createActionItem._id },

src/resolvers/Mutation/removeActionItem.ts

@@ -64,16 +64,16 @@ export const removeActionItem: MutationResolvers["removeActionItem"] = async (
 
   let currentUserIsEventAdmin = false;
 
-  if (actionItem.event) {
+  if (actionItem.eventId) {
     let currEvent: InterfaceEvent | null;
 
-    const eventFoundInCache = await findEventsInCache([actionItem.event]);
+    const eventFoundInCache = await findEventsInCache([actionItem.eventId]);
 
     currEvent = eventFoundInCache[0];
 
     if (eventFoundInCache[0] === null) {
       currEvent = await Event.findOne({
-        _id: actionItem.event,
+        _id: actionItem.eventId,
       }).lean();
 
       if (currEvent !== null) {
@@ -110,10 +110,10 @@ export const removeActionItem: MutationResolvers["removeActionItem"] = async (
     );
   }
 
-  if (actionItem.event) {
+  if (actionItem.eventId) {
     await Event.updateOne(
       {
-        _id: actionItem.event,
+        _id: actionItem.eventId,
       },
       {
         $pull: { actionItems: actionItem._id },

src/resolvers/Mutation/updateActionItem.ts

@@ -115,16 +115,16 @@ export const updateActionItem: MutationResolvers["updateActionItem"] = async (
 
   let currentUserIsEventAdmin = false;
 
-  if (actionItem.event) {
+  if (actionItem.eventId) {
     let currEvent: InterfaceEvent | null;
 
-    const eventFoundInCache = await findEventsInCache([actionItem.event]);
+    const eventFoundInCache = await findEventsInCache([actionItem.eventId]);
 
     currEvent = eventFoundInCache[0];
 
     if (eventFoundInCache[0] === null) {
       currEvent = await Event.findOne({
-        _id: actionItem.event,
+        _id: actionItem.eventId,
       }).lean();
 
       if (currEvent !== null) {

src/resolvers/Query/actionItemsByEvent.ts

@@ -11,7 +11,7 @@ export const actionItemsByEvent: QueryResolvers["actionItemsByEvent"] = async (
   args
 ) => {
   const actionItems = await ActionItem.find({
-    event: args.eventId,
+    eventId: args.eventId,
   }).lean();
 
   return actionItems;

src/typeDefs/inputs.ts

@@ -43,7 +43,7 @@ export const inputs = gql`
     dueDate: Date
     completionDate: Date
     completed: Boolean
-    event: ID
+    eventId: ID
   }
 
   input CursorPaginationInput {

src/typeDefs/types.ts

@@ -19,17 +19,17 @@ export const types = gql`
   # Action Item for a Category
   type ActionItem {
     _id: ID!
-    assignedTo: User!
-    assignedBy: User!
-    category: Category!
+    assignedTo: User
+    assignedBy: User
+    category: Category
     preCompletionNotes: String
     postCompletionNotes: String
     assignmentDate: Date
     dueDate: Date
     completionDate: Date
     completed: Boolean
     event: Event
-    createdBy: User!
+    createdBy: User
     createdAt: Date!
     updatedAt: Date!
   }
@@ -132,14 +132,14 @@ export const types = gql`
     latitude: Latitude
     longitude: Longitude
     organization: Organization
-    creator: User!
-    attendees: [User!]!
+    creator: User
+    attendees: [User!]
     # For each attendee, gives information about whether he/she has checked in yet or not
-    attendeesCheckInStatus: [CheckInStatus!]!
+    attendeesCheckInStatus: [CheckInStatus!]
     admins(adminId: ID): [User]
     actionItems: [ActionItem]
     status: Status!
-    feedback: [Feedback!]!
+    feedback: [Feedback!]
     averageFeedbackScore: Float
   }
 
@@ -221,23 +221,23 @@ export const types = gql`
     description: String!
     location: String
     isPublic: Boolean!
-    creator: User!
+    creator: User
     members: [User]
     admins(adminId: ID): [User]
     actionCategories: [Category]
     membershipRequests: [MembershipRequest]
     blockedUsers: [User]
     visibleInSearch: Boolean!
     apiUrl: URL!
-    createdAt: DateTime
+    createdAt: DateTime!
     pinnedPosts: [Post]
     userTags(
       after: String
       before: String
       first: PositiveInt
       last: PositiveInt
     ): UserTagsConnection
-    customFields: [OrganizationCustomField!]!
+    customFields: [OrganizationCustomField!]
   }
 
   type OrganizationCustomField {
@@ -334,9 +334,9 @@ export const types = gql`
   type Category {
     _id: ID!
     category: String!
-    org: Organization!
+    org: Organization
     disabled: Boolean!
-    createdBy: User!
+    createdBy: User
     createdAt: Date!
     updatedAt: Date!
   }