Merge branch 'main' of https://github.com/uwblueprint/website-bp-be into INTF25-applicant-record-review-query

Author: gavxue

backend/typescript/graphql/index.ts

@@ -15,9 +15,6 @@ import simpleEntityResolvers from "./resolvers/simpleEntityResolvers";
 import simpleEntityType from "./types/simpleEntityType";
 import userResolvers from "./resolvers/userResolvers";
 import userType from "./types/userType";
-import dashboardType from "./types/dashboardType";
-import dashboardResolvers from "./resolvers/dashboardResolvers";
-import reviewType from "./types/reviewType";
 import reviewDashboardResolvers from "./resolvers/reviewDashboardResolvers";
 import reviewDashboardType from "./types/reviewDashboardType";
 
@@ -38,19 +35,16 @@ const executableSchema = makeExecutableSchema({
     query,
     mutation,
     authType,
-    reviewType,
     entityType,
     simpleEntityType,
     userType,
-    dashboardType,
     reviewDashboardType,
   ],
   resolvers: merge(
     authResolvers,
     entityResolvers,
     simpleEntityResolvers,
     userResolvers,
-    dashboardResolvers,
     reviewDashboardResolvers,
   ),
 });
@@ -65,12 +59,6 @@ const graphQLMiddlewares = {
     entities: authorizedByAllRoles(),
     simpleEntity: authorizedByAllRoles(),
     simpleEntities: authorizedByAllRoles(),
-    dashboardById: authorizedByAllRoles(),
-    applicationsByRole: authorizedByAllRoles(),
-    applicationsBySecondChoiceRole: authorizedByAllRoles(),
-    applicationsById: authorizedByAllRoles(),
-    applicationTable: authorizedByAllRoles(),
-    secondChoiceRoleApplicationTable: authorizedByAllRoles(),
     userById: authorizedByAdmin(),
     userByEmail: authorizedByAdmin(),
     login: authorizedByAdmin(),
@@ -83,17 +71,16 @@ const graphQLMiddlewares = {
     createSimpleEntity: authorizedByAllRoles(),
     updateSimpleEntity: authorizedByAllRoles(),
     deleteSimpleEntity: authorizedByAllRoles(),
-    changeRating: authorizedByAllRoles(),
-    changeSkillCategory: authorizedByAllRoles(),
-    updateApplications: authorizedByAllRoles(),
-    modifyFinalComments: authorizedByAllRoles(),
     createUser: authorizedByAdmin(),
     updateUser: authorizedByAdmin(),
     deleteUserById: authorizedByAdmin(),
     deleteUserByEmail: authorizedByAdmin(),
     logout: isAuthorizedByUserId("userId"),
     resetPassword: isAuthorizedByEmail("email"),
     sendSignInLink: authorizedByAllRoles(),
+    createAdminComment: authorizedByAdmin(),
+    updateAdminComment: authorizedByAdmin(),
+    deleteAdminCommentById: authorizedByAdmin(),
   },
 };
 

backend/typescript/graphql/resolvers/adminCommentsResolvers.ts

@@ -0,0 +1,38 @@
+import AdminCommentService from "../../services/implementations/adminCommentService";
+import IAdminCommentService from "../../services/interfaces/adminCommentService";
+import { CreateAdminCommentDTO, AdminCommentDTO } from "../../types";
+
+const adminCommentService: IAdminCommentService = new AdminCommentService();
+
+const adminCommentResolvers = {
+  Mutation: {
+    createAdminComment: async (
+      _parent: undefined,
+      { adminComment }: { adminComment: CreateAdminCommentDTO },
+    ): Promise<AdminCommentDTO> => {
+      const newAdminComment = await adminCommentService.createAdminComment(
+        adminComment,
+      );
+      return newAdminComment;
+    },
+    updateAdminComment: async (
+      _parent: undefined,
+      { id, content }: { id: string; content: CreateAdminCommentDTO },
+    ): Promise<AdminCommentDTO> => {
+      const adminComment = await adminCommentService.updateAdminComment(
+        id,
+        content,
+      );
+      return adminComment;
+    },
+    deleteAdminCommentById: async (
+      _parent: undefined,
+      { id }: { id: string },
+    ): Promise<AdminCommentDTO> => {
+      const adminComment = await adminCommentService.deleteAdminCommentById(id);
+      return adminComment;
+    },
+  },
+};
+
+export default adminCommentResolvers;

backend/typescript/graphql/resolvers/authResolvers.ts

@@ -10,16 +10,13 @@ import FirebaseRestClient from "../../utilities/firebaseRestClient";
 import IUserService from "../../services/interfaces/userService";
 import User from "../../models/user.model";
 import { AuthDTO, RegisterUserDTO, Role } from "../../types";
-import IReviewService from "../../services/interfaces/reviewService";
-import ReviewService from "../../services/implementations/reviewService";
 
 const userService: IUserService = new UserService();
 const emailService: IEmailService = new EmailService(
   nodemailerConfig,
   "UW Blueprint Internal Tools Team",
 );
 const authService: IAuthService = new AuthService(userService, emailService);
-const reviewService: IReviewService = new ReviewService();
 
 // const cookieOptions: CookieOptions = {
 //   httpOnly: true,
@@ -56,15 +53,6 @@ const authResolvers = {
       );
       return isAuthorized;
     },
-    isAuthorizedToReview: async (
-      _parent: undefined,
-      {
-        applicationId,
-        reviewerUserId,
-      }: { applicationId: number; reviewerUserId: string },
-    ): Promise<boolean> => {
-      return reviewService.isAuthorizedToReview(applicationId, reviewerUserId);
-    },
   },
   Mutation: {
     login: async (

backend/typescript/graphql/resolvers/dashboardResolvers.ts

@@ -0,0 +1,29 @@
+import { gql } from "apollo-server-express";
+
+const adminCommentsType = gql`
+  type AdminCommentDTO {
+    id: String!
+    userId: Int!
+    applicantRecordId: String!
+    comment: String!
+    createdAt: String!
+    updatedAt: String!
+  }
+
+  input CreateAdminCommentDTO {
+    userId: Int!
+    applicantRecordId: String!
+    comment: String!
+  }
+
+  extend type Mutation {
+    createAdminComment(adminComment: CreateAdminCommentDTO!): AdminCommentDTO!
+    updateAdminComment(
+      id: String!
+      content: CreateAdminCommentDTO!
+    ): AdminCommentDTO!
+    deleteAdminCommentById(id: String!): AdminCommentDTO!
+  }
+`;
+
+export default adminCommentsType;