Merge branch 'main' into INTF23-secondChoiceTab

backend/typescript/graphql/index.ts

@@ -64,6 +64,7 @@ const graphQLMiddlewares = {
     dashboardById: authorizedByAllRoles(),
     applicationsByRole: authorizedByAllRoles(),
     applicationsBySecondChoiceRole: authorizedByAllRoles(),
+    applicationsById: authorizedByAllRoles(),
     applicationTable: authorizedByAllRoles(),
     secondChoiceRoleApplicationTable: authorizedByAllRoles(),
     userById: authorizedByAdmin(),

backend/typescript/graphql/resolvers/dashboardResolvers.ts

@@ -27,6 +27,14 @@ const dashboardResolvers = {
         firstChoice,
       );
       return applications;
+    },applicationsById: async (
+      _parent: undefined,
+      { id }: { id: number },
+    ): Promise<ApplicationDTO> => {
+      const application = await dashboardService.getApplicationsById(
+        id,
+      );
+      return application;
     },
     applicationsBySecondChoiceRole: async (
       _parent: undefined,

backend/typescript/graphql/types/dashboardType.ts

@@ -60,6 +60,7 @@ const dashboardType = gql`
     dashboardById(id: Int!): ApplicationDashboardDTO!
     applicationsByRole(firstChoice: String!): [ApplicationDTO]!
     applicationsBySecondChoiceRole(secondChoice: String!): [ApplicationDTO]!
+    applicationsById(id: Int!): ApplicationDTO!
     dashboardsByApplicationId(applicationId: Int!): [ApplicationDashboardDTO]!
     applicationTable(role: String!): [ApplicationDashboardRowDTO]!
     secondChoiceRoleApplicationTable(role: String!): [ApplicationDashboardRowDTO]!

backend/typescript/migrations/applicationlist.json

@@ -134,4 +134,4 @@
     "timesApplied": "This is my first time!",
     "timestamp": 1688143336170
   }
-]
+]

backend/typescript/services/implementations/appDashboardService.ts

@@ -180,6 +180,41 @@ class AppDashboardService implements IAppDashboardService {
     return applicationDashboardDTOs;
   }
 
+  async getDashboardsByApplicationId(
+    applicationId: number,
+  ): Promise<ApplicationDashboardDTO[]> {
+    let dashboards: ApplicationDashboardTable[] = [];
+    let applicationDashboardDTOs: Array<ApplicationDashboardDTO> = [];
+    try {
+      dashboards = await ApplicationDashboardTable.findAll({
+        where: { applicationId },
+      });
+      applicationDashboardDTOs = await dashboards.map((dashboard) => {
+        return {
+          id: dashboard.id,
+          reviewerEmail: dashboard.reviewerEmail,
+          passionFSG: dashboard.passionFSG,
+          teamPlayer: dashboard.teamPlayer,
+          desireToLearn: dashboard.desireToLearn,
+          skill: dashboard.skill,
+          skillCategory: dashboard.skillCategory,
+          reviewerComments: dashboard.reviewerComments,
+          recommendedSecondChoice: dashboard.recommendedSecondChoice,
+          reviewerId: dashboard.reviewerId,
+          applicationId: dashboard.applicationId,
+        };
+      });
+    } catch (error: unknown) {
+      Logger.error(
+        `Failed to get dashboards by this applicationId = ${applicationId}. Reason = ${getErrorMessage(
+          error,
+        )}`,
+      );
+      throw error;
+    }
+    return applicationDashboardDTOs;
+  }
+
   async getApplicationDashboardTable(
     role: ApplicantRole,
   ): Promise<ApplicationDashboardRowDTO[]> {

backend/typescript/services/interfaces/appDashboardService.ts

@@ -9,6 +9,8 @@ interface IAppDashboardService {
   getDashboardById(id: number): Promise<ApplicationDashboardDTO>;
   getApplicationsByRole(role: ApplicantRole): Promise<ApplicationDTO[]>;
   getApplicationsBySecondChoiceRole(role: ApplicantRole): Promise<ApplicationDTO[]>;
+  getApplicationsByRole(role: string): Promise<ApplicationDTO[]>;
+  getApplicationsById(id: number): Promise<ApplicationDTO>;
   getDashboardsByApplicationId(
     applicationId: number,
   ): Promise<ApplicationDashboardDTO[]>;

backend/typescript/types.ts

@@ -74,6 +74,7 @@ export type ApplicationDTO = {
   term: string;
   timesApplied: string;
   timestamp: bigint;
+
 };
 
 export type ApplicationDashboardRowDTO = {