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

Author: gavxue

backend/typescript/graphql/resolvers/authResolvers.ts

@@ -53,6 +53,19 @@ const authResolvers = {
       );
       return isAuthorized;
     },
+    isAuthorizedReviewer: async (
+      _parent: undefined,
+      {
+        accessToken,
+        applicantRecordId,
+      }: { accessToken: string; applicantRecordId: string },
+    ): Promise<boolean> => {
+      const isAuthorized = await authService.isAuthorizedReviewer(
+        accessToken,
+        applicantRecordId,
+      );
+      return isAuthorized;
+    },
   },
   Mutation: {
     login: async (

backend/typescript/graphql/resolvers/reviewPageResolvers.ts

@@ -1,4 +1,8 @@
-import { ApplicationDTO } from "../../types";
+import {
+  ApplicationDTO,
+  ReviewedApplicantRecordDTO,
+  ReviewedApplicantsDTO,
+} from "../../types";
 import ReviewPageService from "../../services/implementations/reviewPageService";
 import { getErrorMessage } from "../../utilities/errorUtils";
 
@@ -16,6 +20,33 @@ const reviewPageResolvers = {
         throw new Error(getErrorMessage(error));
       }
     },
+    getReviewedApplicantsByUserId: async (
+      _parent: undefined,
+      args: { userId: number },
+    ): Promise<ReviewedApplicantsDTO[]> => {
+      try {
+        return await reviewPageService.getReviewedApplicantsByUserId(
+          args.userId,
+        );
+      } catch (error) {
+        throw new Error(getErrorMessage(error));
+      }
+    },
+  },
+  Mutation: {
+    reportReviewConflict: async (
+      _parent: undefined,
+      args: { applicantRecordId: string; reviewerId: number },
+    ): Promise<ReviewedApplicantRecordDTO> => {
+      try {
+        return await reviewPageService.reportReviewConflict(
+          args.applicantRecordId,
+          args.reviewerId,
+        );
+      } catch (error) {
+        throw new Error(getErrorMessage(error));
+      }
+    },
   },
 };
 

backend/typescript/graphql/types/authType.ts

@@ -25,6 +25,10 @@ const authType = gql`
   extend type Query {
     login(email: String!, password: String!): loginOK!
     isAuthorizedByRole(accessToken: String!, roles: [Role!]!): Boolean!
+    isAuthorizedReviewer(
+      accessToken: String!
+      applicantRecordId: String!
+    ): Boolean!
   }
 
   extend type Mutation {

backend/typescript/graphql/types/reviewPageType.ts

@@ -25,8 +25,32 @@ const reviewPageType = gql`
     timestamp: Int
   }
 
+  type ReviewedApplicantsDTO {
+    applicantRecordId: String!
+    reviewStatus: String!
+    applicantFirstName: String!
+    applicantLastName: String!
+  }
+
+  type ReviewedApplicantRecordDTO {
+    applicantRecordId: String!
+    reviewerId: Int!
+    review: Review!
+    status: String!
+    score: Int
+    reviewerHasConflict: Boolean!
+  }
+
+  extend type Mutation {
+    reportReviewConflict(
+      applicantRecordId: String!
+      reviewerId: Int!
+    ): ReviewedApplicantRecordDTO!
+  }
+
   extend type Query {
     reviewApplicantPage(applicantRecordId: String!): ApplicationDTO!
+    getReviewedApplicantsByUserId(userId: Int!): [ReviewedApplicantsDTO!]!
   }
 `;
 

backend/typescript/migrations/20260207000000-create-files-table.ts

@@ -0,0 +1,49 @@
+import { DataTypes } from "sequelize";
+import { Migration } from "../umzug";
+
+const TABLE_NAME = "firebase_files";
+
+export const up: Migration = async ({ context: sequelize }) => {
+  await sequelize.getQueryInterface().createTable(TABLE_NAME, {
+    id: {
+      type: DataTypes.UUID,
+      defaultValue: DataTypes.UUIDV4,
+      allowNull: false,
+      primaryKey: true,
+    },
+    storagePath: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    originalFileName: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    uploadedUserId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: "users",
+        key: "id",
+      },
+    },
+    sizeBytes: {
+      type: DataTypes.BIGINT,
+      allowNull: false,
+    },
+    createdAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: DataTypes.NOW,
+    },
+    updatedAt: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: DataTypes.NOW,
+    },
+  });
+};
+
+export const down: Migration = async ({ context: sequelize }) => {
+  await sequelize.getQueryInterface().dropTable(TABLE_NAME);
+};

backend/typescript/models/file.model.ts

@@ -0,0 +1,43 @@
+import {
+  Column,
+  DataType,
+  ForeignKey,
+  Model,
+  Table,
+} from "sequelize-typescript";
+import User from "./user.model";
+
+@Table({ tableName: "firebase_files" })
+export default class File extends Model {
+  @Column({
+    type: DataType.UUID,
+    defaultValue: DataType.UUIDV4,
+    primaryKey: true,
+  })
+  id!: string;
+
+  @Column({ type: DataType.STRING, allowNull: false })
+  storagePath!: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: false,
+  })
+  originalFileName!: string;
+
+  @ForeignKey(() => User)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  uploadedUserId!: number;
+
+  @Column({ type: DataType.BIGINT, allowNull: false })
+  sizeBytes!: bigint;
+
+  @Column({ type: DataType.DATE, allowNull: false })
+  createdAt!: Date;
+
+  @Column({ type: DataType.DATE, allowNull: false })
+  updatedAt!: Date;
+}

backend/typescript/models/reviewedApplicantRecord.model.ts

@@ -59,4 +59,10 @@ export default class ReviewedApplicantRecord extends Model {
 
   @BelongsTo(() => User, { foreignKey: "reviewerId", targetKey: "id" })
   user?: NonAttribute<User>;
+
+  @BelongsTo(() => ApplicantRecord, {
+    foreignKey: "applicantRecordId",
+    targetKey: "id",
+  })
+  applicantRecord?: NonAttribute<ApplicantRecord>;
 }

backend/typescript/models/user.model.ts

@@ -39,7 +39,7 @@ export default class User extends Model {
 
   @HasMany(() => ReviewedApplicantRecord, {
     foreignKey: "reviewerId",
-    as: "user",
+    sourceKey: "id",
   })
   reviewedApplicantRecords?: NonAttribute<ReviewedApplicantRecord[]>;
 }

backend/typescript/services/implementations/authService.ts

@@ -7,6 +7,7 @@ import { AuthDTO, Role, Token } from "../../types";
 import { getErrorMessage } from "../../utilities/errorUtils";
 import FirebaseRestClient from "../../utilities/firebaseRestClient";
 import logger from "../../utilities/logger";
+import ReviewedApplicantRecord from "../../models/reviewedApplicantRecord.model";
 
 const Logger = logger(__filename);
 
@@ -272,6 +273,41 @@ class AuthService implements IAuthService {
       throw error;
     }
   }
+
+  async isAuthorizedReviewer(
+    accessToken: string,
+    applicantRecordId: string,
+  ): Promise<boolean> {
+    try {
+      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken =
+        await firebaseAdmin.auth().verifyIdToken(accessToken, true);
+      const userId = await this.userService.getUserIdByAuthId(
+        decodedIdToken.uid,
+      );
+
+      const firebaseUser = await firebaseAdmin
+        .auth()
+        .getUser(decodedIdToken.uid);
+
+      if (!firebaseUser.emailVerified) {
+        return false;
+      }
+
+      const reviewedApplicantRecord = await ReviewedApplicantRecord.findOne({
+        where: {
+          applicantRecordId,
+          reviewerId: Number(userId),
+        },
+      });
+
+      return reviewedApplicantRecord !== null;
+    } catch (error) {
+      Logger.error(
+        `Failed to verify if user is authorized reviewer for applicant record ${applicantRecordId}`,
+      );
+      throw error;
+    }
+  }
 }
 
 export default AuthService;