cleanup

Author: isabellehuangg

backend/typescript/graphql/resolvers/reviewedApplicantRecordResolver.ts

@@ -1,5 +1,9 @@
 import ReviewedApplicantRecordService from "../../services/implementations/reviewedApplicantRecordService";
-import { ReviewedApplicantRecordDTO, CreateReviewedApplicantRecordDTO } from "../../types";
+import { 
+  ReviewedApplicantRecordDTO, 
+  CreateReviewedApplicantRecordDTO,
+  DeleteReviewedApplicantRecord 
+} from "../../types";
 import { getErrorMessage } from "../../utilities/errorUtils";
 
 const reviewedApplicantRecordService = new ReviewedApplicantRecordService();
@@ -30,12 +34,11 @@ const reviewedApplicantRecordResolvers = {
 
     deleteReviewedApplicantRecord: async (
       _parent: undefined,
-      args: { applicantRecordId: string; reviewerId: number },
+      args: { input: DeleteReviewedApplicantRecord },
     ): Promise<ReviewedApplicantRecordDTO> => {
       try {
         return await reviewedApplicantRecordService.deleteReviewedApplicantRecord(
-          args.applicantRecordId,
-          args.reviewerId,
+          args.input
         );
       } catch (error) {
         throw new Error(getErrorMessage(error));
@@ -44,12 +47,11 @@ const reviewedApplicantRecordResolvers = {
 
     bulkDeleteReviewedApplicantRecord: async (
       _parent: undefined,
-      args: { applicantRecordIds: string[]; reviewerId: number },
+      args: { inputs: DeleteReviewedApplicantRecord[] },
     ): Promise<ReviewedApplicantRecordDTO[]> => {
       try {
         return await reviewedApplicantRecordService.bulkDeleteReviewedApplicantRecord(
-          args.applicantRecordIds,
-          args.reviewerId,
+          args.inputs
         );
       } catch (error) {
         throw new Error(getErrorMessage(error));

backend/typescript/graphql/types/reviewedApplicantRecordTypes.ts

@@ -17,6 +17,11 @@ const reviewedApplicantRecordTypes = gql`
     status: String
   }
 
+  input DeleteReviewedApplicantRecord {
+    applicantRecordId: ID!
+    reviewerId: Int!
+  }
+
   extend type Mutation {
     createReviewedApplicantRecord(
       input: CreateReviewedApplicantRecordInput!
@@ -27,13 +32,11 @@ const reviewedApplicantRecordTypes = gql`
     ): [ReviewedApplicantRecord!]!
 
     deleteReviewedApplicantRecord(
-      applicantRecordId: ID!
-      reviewerId: Int!
+      input: DeleteReviewedApplicantRecord!
     ): ReviewedApplicantRecord!
 
     bulkDeleteReviewedApplicantRecord(
-      applicantRecordIds: [ID!]!
-      reviewerId: Int!
+      inputs: [DeleteReviewedApplicantRecord!]!
     ): [ReviewedApplicantRecord!]!
   }
 `;

backend/typescript/services/implementations/reviewedApplicantRecordService.ts

@@ -2,10 +2,11 @@ import { sequelize } from "../../models";
 import ReviewedApplicantRecord from "../../models/reviewedApplicantRecord.model";
 import { 
     ReviewedApplicantRecordDTO, 
-    CreateReviewedApplicantRecordDTO 
+    CreateReviewedApplicantRecordDTO,
+    DeleteReviewedApplicantRecord
 } from "../../types";
 
-import IReviewApplicantRecordService from "../interfaces/reviewedApplicantRecordService";
+import IReviewApplicantRecordService from "../interfaces/IReviewedApplicantRecordService";
 
 class ReviewedApplicantRecordService implements IReviewApplicantRecordService {
 
@@ -33,7 +34,9 @@ class ReviewedApplicantRecordService implements IReviewApplicantRecordService {
     }
 
     // Methods deleteReviewedApplicantRecord and bulkDeleteReviewedApplicantRecord would be implemented here
-    async deleteReviewedApplicantRecord(applicantRecordId: string, reviewerId: number): Promise<ReviewedApplicantRecordDTO> {
+    async deleteReviewedApplicantRecord(deleteReviewedApplicantRecord: DeleteReviewedApplicantRecord): Promise<ReviewedApplicantRecordDTO> {
+        const applicantRecordId = deleteReviewedApplicantRecord.applicantRecordId;
+        const reviewerId = deleteReviewedApplicantRecord.reviewerId;
         const record = await ReviewedApplicantRecord.findOne({ where: { applicantRecordId, reviewerId } });
 
         if (!record) {
@@ -44,17 +47,25 @@ class ReviewedApplicantRecordService implements IReviewApplicantRecordService {
         return record.toJSON() as ReviewedApplicantRecordDTO;   
     }
 
-    async bulkDeleteReviewedApplicantRecord(applicantRecordIds: string[], reviewerId: number): Promise<ReviewedApplicantRecordDTO[]> {
+    async bulkDeleteReviewedApplicantRecord(deleteReviewedApplicantRecords: DeleteReviewedApplicantRecord[]): Promise<ReviewedApplicantRecordDTO[]> {
         const deletedRecords = await sequelize.transaction(async (t) => {
-            const records = await ReviewedApplicantRecord.findAll({
-                where: { applicantRecordId: applicantRecordIds, reviewerId },
-                transaction: t,
-            });
+            const records = await Promise.all(
+                deleteReviewedApplicantRecords.map(({ applicantRecordId, reviewerId }) =>
+                    ReviewedApplicantRecord.findOne({
+                        where: { applicantRecordId, reviewerId },
+                        transaction: t,
+                    })
+                )
+            );
 
-            if (records.length === 0) return [];
+            if (records.some((r) => !r)) {
+                throw new Error("Not all records were found, bulk delete aborted.");
+            }
 
-            await Promise.all(records.map((r) => r.destroy({ transaction: t })));
-            return records;
+            const existingRecords = records as ReviewedApplicantRecord[];
+            await Promise.all(existingRecords.map((r) => r.destroy({ transaction: t })));
+
+            return existingRecords;
         });
 
         return deletedRecords.map((r) => r.toJSON() as ReviewedApplicantRecordDTO);

…rfaces/reviewedApplicantRecordService.ts …faces/IReviewedApplicantRecordService.tsbackend/typescript/services/interfaces/reviewedApplicantRecordService.ts renamed to backend/typescript/services/interfaces/IReviewedApplicantRecordService.ts backend/typescript/services/interfaces/reviewedApplicantRecordService.ts renamed to backend/typescript/services/interfaces/IReviewedApplicantRecordService.ts

@@ -1,6 +1,7 @@
 import { 
     ReviewedApplicantRecordDTO, 
-    CreateReviewedApplicantRecordDTO 
+    CreateReviewedApplicantRecordDTO,
+    DeleteReviewedApplicantRecord
 } from "../../types";
 
 interface IReviewApplicantRecordService {
@@ -26,18 +27,15 @@ interface IReviewApplicantRecordService {
    * @Param reviewerId the ID of the reviewer
    */
   deleteReviewedApplicantRecord(
-    applicantRecordId: string,
-    reviewerId: number
+    deleteReviewedApplicantRecord: DeleteReviewedApplicantRecord
   ): Promise<ReviewedApplicantRecordDTO>;
 
   /**
    * Deletes multiple reviewed applicant record entries in bulk
-   * @Param applicantRecordIds array of applicant record IDs to delete
-   * @Param reviewerId the ID of the reviewer
+   * @Param deleteReviewedApplicantRecord array of data to delete reviewed applicant records
    */
   bulkDeleteReviewedApplicantRecord(
-    applicantRecordIds: string[],
-    reviewerId: number
+    deleteReviewedApplicantRecords: DeleteReviewedApplicantRecord[]
   ): Promise<ReviewedApplicantRecordDTO[]>;
 }
 

backend/typescript/types.ts

@@ -262,3 +262,8 @@ export type CreateReviewedApplicantRecordDTO = {
   review?: Review;
   reviewerHasConflict?: boolean;
 }
+
+export type DeleteReviewedApplicantRecord = {
+  applicantRecordId: string;
+  reviewerId: number;
+}