fix(apply-jobpost): incorporate feedback (#168)

- remove 'submitted' status - add comments for 'rejected status'
atlp-rwanda · Dec 6, 2024 · c9b1a29 · c9b1a29
1 parent 9b4f163
commit c9b1a29
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 6 deletions.
diff --git a/src/models/JobApplication.ts b/src/models/JobApplication.ts
@@ -21,8 +21,12 @@ const jobApplicationSchema = new mongoose.Schema({
     },
     status:{
         type:String,
-        enum:['submitted','under-review','accepted','rejected'],
-        default:'submitted'
+        enum:['under-review','accepted','rejected'],
+        default:'under-review'
+    },
+    comment: {
+        type:String,
+        required: false
     }
 },{timestamps:true})
 

diff --git a/src/resolvers/jobApplicationResolver.ts b/src/resolvers/jobApplicationResolver.ts
@@ -18,7 +18,8 @@ interface getOneFormData {
 
 interface statusData {
     applicationId: string,
-    status: string
+    status: string,
+    comment: string
 }
 
 const formatDate = (date:Date) => {
@@ -114,6 +115,7 @@ export const jobApplicationResolver = {
                 essay: application.essay,
                 resume: application.resume,
                 status: application.status,
+                comment: application.comment,
                 jobId: application.jobId,
                 createdAt: formatDate(application.createdAt)
             }
@@ -175,10 +177,28 @@ export const jobApplicationResolver = {
 				);
 			}
 
-            const { status, applicationId } = input
-            await JobApplication.findByIdAndUpdate(applicationId, {status})
+            const { status, applicationId, comment } = input
+            if(comment){
+                await JobApplication.findByIdAndUpdate(applicationId, {status, comment})
+            }else{
+                await JobApplication.findByIdAndUpdate(applicationId, {status})
+            }
+
             const application = await JobApplication.findOne({_id:applicationId}).populate('userId').populate('jobId')
-            return application
+            if(!application){
+                throw new Error('Application not found');
+            }
+
+            return {
+                _id: application._id,
+                userId: application.userId,
+                essay: application.essay,
+                resume: application.resume,
+                status: application.status,
+                comment: application.comment,
+                jobId: application.jobId,
+                createdAt: formatDate(application.createdAt)
+            }
         } 
     },
 };
diff --git a/src/resolvers/scheduleInterviewResolver.ts b/src/resolvers/scheduleInterviewResolver.ts
@@ -1,4 +1,6 @@
 import { sendEmailTemplate } from "../helpers/bulkyMails";
+import { pusher } from "../helpers/pusher";
+import { ApplicantNotificationsModel } from "../models/applicantNotifications";
 import { LoggedUserModel } from "../models/AuthUser";
 import { RoleModel } from "../models/roleModel";
 import TechnicalInterview from "../models/technicalInterviewSchema";
@@ -220,6 +222,41 @@ export const technicalInterviewResolvers = {
         const applicantData = await TraineeApplicant.findById(applicantId);
         const coordinatorData = await LoggedUserModel.findById(coordinatorId);
 
+        // Create notification for applicant
+        const applicantNotification = await ApplicantNotificationsModel.create({
+          userId: applicantId,
+          message: `Technical Interview Scheduled for ${interview.scheduledDate.toLocaleString()}`,
+          eventType: "applicationUpdate",
+          relatedObjectId: interview._id,
+        });
+
+        // Create notification for coordinator
+        const coordinatorNotification =
+          await ApplicantNotificationsModel.create({
+            userId: coordinatorId,
+            message: `Technical Interview Assigned: Candidate ${applicantData?.firstName} ${applicantData?.lastName}`,
+            eventType: "applicationUpdate",
+            relatedObjectId: interview._id,
+          });
+
+        // Send Pusher notifications
+        await Promise.all([
+          pusher.trigger(`notifications-${applicantId}`, "new-notification", {
+            message: applicantNotification.message,
+            id: applicantNotification._id,
+            createdAt: applicantNotification.createdAt,
+            read: applicantNotification.read,
+          }),
+          pusher.trigger(`notifications-${coordinatorId}`, "new-notification", {
+            message: coordinatorNotification.message,
+            id: coordinatorNotification._id,
+            createdAt: coordinatorNotification.createdAt,
+            read: coordinatorNotification.read,
+          }),
+        ]).catch((error) => {
+          console.error("Error with Pusher triggers:", error);
+        });
+
         if (applicantData?.email && coordinatorData?.email) {
           const applicantEmailTemplate = `
           <!DOCTYPE html>

diff --git a/src/schema/jobApplicationSchema.ts b/src/schema/jobApplicationSchema.ts
@@ -23,6 +23,7 @@ export const jobApplicationTypeDefs = gql`
         essay: String!
         resume: String!
         status: String!
+        comment: String
         createdAt: String!
     }
 
@@ -39,6 +40,7 @@ export const jobApplicationTypeDefs = gql`
     input StatusInput {
         applicationId: ID!
         status: String!
+        comment: String
     }
 
     type checkIfUserAppliedOutput {