unfuck rebase

Author: ruiichen

backend/typescript/graphql/index.ts

@@ -19,9 +19,6 @@ import reviewDashboardResolvers from "./resolvers/reviewDashboardResolvers";
 import reviewDashboardType from "./types/reviewDashboardType";
 import adminCommentResolvers from "./resolvers/adminCommentsResolvers";
 import adminCommentType from "./types/adminCommentsType";
-import dashboardType from "./types/dashboardType";
-import dashboardResolvers from "./resolvers/dashboardResolvers";
-import reviewType from "./types/reviewType";
 import reviewPageType from "./types/reviewPageType";
 import reviewPageResolvers from "./resolvers/reviewPageResolvers";
 
@@ -47,7 +44,6 @@ const executableSchema = makeExecutableSchema({
     userType,
     reviewDashboardType,
     adminCommentType,
-    dashboardType,
     reviewPageType,
   ],
   resolvers: merge(
@@ -57,7 +53,6 @@ const executableSchema = makeExecutableSchema({
     userResolvers,
     reviewDashboardResolvers,
     adminCommentResolvers,
-    dashboardResolvers,
     reviewPageResolvers,
   ),
 });

backend/typescript/graphql/types/dashboardType.ts

@@ -1,6 +1,30 @@
 import { gql } from "apollo-server-express";
 
 const reviewPageType = gql`
+  type ApplicationDTO {
+    id: Int!
+    academicOrCoop: String!
+    academicYear: String!
+    email: String!
+    firstChoiceRole: String!
+    firstName: String!
+    heardFrom: String!
+    lastName: String!
+    locationPreference: String!
+    program: String!
+    pronouns: String!
+    pronounsSpecified: String!
+    resumeUrl: String!
+    roleSpecificQuestions: [String!]!
+    secondChoiceRole: String!
+    shortAnswerQuestions: [String!]!
+    status: String!
+    secondChoiceStatus: String!
+    term: String!
+    timesApplied: String!
+    timestamp: Int
+  }
+  
   extend type Query {
     reviewApplicantPage(reviewedApplicantRecordId: String!): ApplicationDTO!
   }

backend/typescript/graphql/types/reviewPageType.ts

@@ -33,26 +33,6 @@ export type UserDTO = {
   role: Role;
 };
 
-// DEPRECATED - TO BE REMOVED AT THE END OF S25
-export type ApplicationDashboardDTO = {
-  id: number;
-  reviewerEmail: string;
-  passionFSG: number;
-  teamPlayer: number;
-  desireToLearn: number;
-  skill: number;
-  skillCategory: string;
-  reviewerComments: string;
-  recommendedSecondChoice: string;
-  reviewerId: number;
-  applicationId: number;
-};
-
-export type ApplicationDashboardInput = Omit<
-  ApplicationDashboardDTO,
-  "applicationId"
->;
-
 export type ApplicationDTO = {
   id: number;
   academicOrCoop: string;