Add review complete to applicationdashboardtable

backend/typescript/graphql/index.ts

@@ -17,6 +17,7 @@ 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";
 
 const query = gql`
   type Query {
@@ -35,6 +36,7 @@ const executableSchema = makeExecutableSchema({
     query,
     mutation,
     authType,
+    reviewType,
     entityType,
     simpleEntityType,
     userType,

backend/typescript/graphql/resolvers/authResolvers.ts

@@ -11,10 +11,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);
 const authService: IAuthService = new AuthService(userService, emailService);
+const reviewService: IReviewService = new ReviewService();
 
 const cookieOptions: CookieOptions = {
   httpOnly: true,
@@ -51,6 +54,15 @@ 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

@@ -1,3 +1,4 @@
+import { auth } from "firebase-admin";
 import AppDashboardService from "../../services/implementations/appDashboardService";
 import IAppDashboardService from "../../services/interfaces/appDashboardService";
 import {
@@ -11,6 +12,12 @@ const dashboardService: IAppDashboardService = new AppDashboardService();
 
 const dashboardResolvers = {
   Query: {
+    dashboardsByApplicationAuthId: (
+      _parent: undefined,
+      { authId }: { authId: string },
+    ): Promise<ApplicationDashboardDTO[]> => {
+      return dashboardService.getDashboardsByApplicationAuthId(authId);
+    },
     dashboardById: async (
       _parent: undefined,
       { id }: { id: number },
@@ -44,6 +51,48 @@ const dashboardResolvers = {
     },
   },
   Mutation: {
+    createApplicationDashboard: async (
+      _parent: undefined,
+      {
+        reviewerEmail,
+        applicationId,
+        reviewerAuthId,
+        passionFSG,
+        teamPlayer,
+        desireToLearn,
+        skill,
+        skillCategory,
+        reviwerComments,
+        recommendedSecondChoice,
+        reviewComplete
+      }: {
+        reviewerEmail: string;
+        applicationId: number;
+        reviewerAuthId: string;
+        passionFSG: number;
+        teamPlayer: number;
+        desireToLearn: number;
+        skill: number;
+        skillCategory: string;
+        reviwerComments: string;
+        recommendedSecondChoice: string;
+        reviewComplete: boolean;
+      },
+    ): Promise<ApplicationDashboardDTO> => {
+      return dashboardService.createApplicationDashboard(
+        reviewerEmail,
+        applicationId,
+        reviewerAuthId,
+        passionFSG,
+        teamPlayer,
+        desireToLearn,
+        skill,
+        skillCategory,
+        reviwerComments,
+        recommendedSecondChoice,
+        reviewComplete
+      );
+    },
     changeRating: async (
       _parent: undefined,
       {
@@ -72,6 +121,13 @@ const dashboardResolvers = {
     ): Promise<Array<number>> => {
       return dashboardService.updateBulkApplications(applications);
     },
+    updateApplicationByAuthIdAndApplicationId: async (
+      _parent: undefined,
+      { applicationId, authId, application }: { applicationId: number, authId: string, application: ApplicationDashboardInput },
+    ): Promise<ApplicationDashboardDTO> => {
+      dashboardService.updateBulkApplications([application])
+      return dashboardService.updateApplicationByAuthIdAndApplicationId(applicationId, authId, application);
+    },
     modifyFinalComments: async (
       _parent: undefined,
       {

backend/typescript/graphql/types/dashboardType.ts

@@ -13,17 +13,32 @@ const dashboardType = gql`
     recommendedSecondChoice: String!
     reviewerId: Int!
     applicationId: Int!
+    reviewComplete: Boolean
   }
 
   input ApplicationDashboardInput {
     id: Int!
-    reviewerEmail: String
-    passionFSG: Int
-    teamPlayer: Int
-    desireToLearn: Int
-    skill: Int
-    skillCategory: String
-    reviewerId: Int
+    reviewerEmail: String!
+    passionFSG: Int!
+    teamPlayer: Int!
+    desireToLearn: Int!
+    skill: Int!
+    skillCategory: String!
+    reviewerComments: String!
+    recommendedSecondChoice: String!
+    reviewerId: Int!
+    reviewComplete: Boolean
+  }
+
+  input ApplicationDashBoardScoreUpdate {
+    passionFSG: Int!
+    teamPlayer: Int!
+    desireToLearn: Int!
+    skill: Int!
+    skillCategory: String!
+    reviewerComments: String!
+    recommendedSecondChoice: String!
+    reviewComplete: Boolean 
   }
 
   type ApplicationDTO {
@@ -73,6 +88,7 @@ const dashboardType = gql`
     applicationsByRole(firstChoice: String!): [ApplicationDTO]!
     dashboardsByApplicationId(applicationId: Int!): [ApplicationDashboardDTO]!
     applicationTable(role: String!): [ApplicationDashboardRowDTO]!
+    dashboardsByApplicationAuthId(authId: String!): [ApplicationDashboardDTO]!
   }
 
   extend type Mutation {
@@ -83,12 +99,26 @@ const dashboardType = gql`
     ): ApplicationDashboardDTO!
     changeSkillCategory(id: Int!, newValue: String!): ApplicationDashboardDTO!
     updateApplications(applications: [ApplicationDashboardInput]!): [Int]!
+    updateApplicationByAuthIdAndApplicationId(authId: String!, applicationId: Int!, application: ApplicationDashBoardScoreUpdate!): ApplicationDashboardDTO
     modifyFinalComments(
       id: Int!
       newComments: String!
       newSkillCategory: String!
       newRecommendedSecondChoice: String
     ): ApplicationDashboardDTO!
+    createApplicationDashboard(
+      reviewerEmail: String!
+      applicationId: Int!
+      reviewerAuthId: String!
+      passionFSG: Int!
+      teamPlayer: Int!
+      desireToLearn: Int!
+      skill: Int!
+      skillCategory: String!
+      reviwerComments: String!
+      recommendedSecondChoice: String!
+      reviewComplete: Boolean!
+    ): ApplicationDashboardDTO!
   }
 `;
 

backend/typescript/graphql/types/reviewType.ts

@@ -0,0 +1,9 @@
+import { gql } from "apollo-server-express";
+
+const reviewType = gql`
+  extend type Query {
+    isAuthorizedToReview(applicationId: Int!, reviewerUserId: String!): Boolean!
+  }
+`;
+
+export default reviewType;

backend/typescript/migrations/2023.02.18T17.43.41.create-user-table.ts

@@ -10,23 +10,20 @@ const SEEDED_DATA = [
     last_name: "Doe",
     email: "[email protected]",
     auth_id: "bide",
-    id: 1,
     role: "User",
   },
   {
     first_name: "Jane",
     last_name: "Doe",
     email: "[email protected]",
     auth_id: "none",
-    id: 2,
     role: "Admin",
   },
   {
     first_name: "UW",
     last_name: "Blueprint",
     email: "[email protected]",
     auth_id: "1Z4wyuonu9MhAi4VoAEiTMVj1iT2",
-    id: 4,
     role: "Admin",
   },
 ];

backend/typescript/migrations/2023.04.05T17.43.43.create-applicationDash-table.ts

@@ -8,7 +8,6 @@ const userEmails = ["[email protected]", "[email protected]"];
 
 const SEEDED_DATA = [
   {
-    id: 1,
     applicationId: 1,
     reviewerId: 1,
     reviewerEmail: userEmails[0],
@@ -19,9 +18,9 @@ const SEEDED_DATA = [
     reviewerComments: "Great job presenting your case study!",
     recommendedSecondChoice: "N/A",
     skillCategory: "junior",
+    reviewComplete: false,
   },
   {
-    id: 2,
     applicationId: 1,
     reviewerId: 2,
     reviewerEmail: userEmails[1],
@@ -32,6 +31,7 @@ const SEEDED_DATA = [
     reviewerComments: "Very good!",
     recommendedSecondChoice: "considered",
     skillCategory: "intermediate",
+    reviewComplete: true,
   },
 ];
 
@@ -42,6 +42,7 @@ export const up: Migration = async ({ context: sequelize }) => {
       allowNull: false,
       primaryKey: true,
       unique: true,
+      autoIncrement: true,
     },
     applicationId: {
       type: DataType.INTEGER,
@@ -91,6 +92,10 @@ export const up: Migration = async ({ context: sequelize }) => {
       type: DataType.ENUM("N/A", "considered", "not considered"),
       allowNull: false,
     },
+    reviewComplete: {
+      type: DataType.BOOLEAN,
+      allowNull: false,
+    },
     createdAt: DataType.DATE,
     updatedAt: DataType.DATE,
   });

backend/typescript/models/applicationDashboard.model.ts

@@ -16,7 +16,15 @@ export default class ApplicationDashboardTable extends Model {
   @Column({ type: DataType.STRING })
   reviewerEmail!: string;
 
-  @Column({ type: DataType.INTEGER, primaryKey: true, unique: true })
+  @Column({ type: DataType.BOOLEAN })
+  reviewComplete!: boolean;
+
+  @Column({
+    type: DataType.INTEGER,
+    primaryKey: true,
+    unique: true,
+    autoIncrement: true,
+  })
   id!: number;
 
   @Column({ type: DataType.INTEGER })