Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion apps/admin-dashboard/app/routes/_dashboard.applications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import { z } from 'zod';

import { ListSearchParams } from '@oyster/core/admin-dashboard/ui';
import { listApplications } from '@oyster/core/applications';
import { type ApplicationRejectionReason } from '@oyster/core/applications/types';
import type {
ApplicationRejectionReason,
AutoReviewJobStatus,
} from '@oyster/core/applications/types';
import { ApplicationStatus } from '@oyster/core/applications/ui';
import { Application } from '@oyster/types';
import {
Expand Down Expand Up @@ -213,6 +216,33 @@ function ApplicationsTable() {
return `${reviewedByFirstName} ${reviewedByLastName}`;
},
},
{
displayName: 'Auto Review Job Status',
render: (application) => {
const jobStatus = application.autoReviewJobStatus as
| AutoReviewJobStatus
| undefined;

if (!jobStatus) {
return '-';
}

const JobStatusColor: Record<AutoReviewJobStatus, AccentColor> = {
DONE: 'lime-100',
FAILED: 'red-100',
QUEUED: 'amber-100',
};

const color = JobStatusColor[jobStatus];

return (
<Pill color={color as PillProps['color']}>
{toTitleCase(jobStatus)}
</Pill>
);
},
size: '200',
},
{
show: () => ['pending', 'rejected'].includes(status),
size: '48',
Expand Down
55 changes: 52 additions & 3 deletions packages/core/src/modules/applications/applications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
type ApplicationRejectionReason,
ApplicationStatus,
type ApplyInput,
AutoReviewJobStatus,
} from '@/modules/applications/applications.types';
import { ReferralStatus } from '@/modules/referrals/referrals.types';
import { STUDENT_PROFILE_URL } from '@/shared/env';
Expand All @@ -31,6 +32,29 @@ export async function countPendingApplications() {
.selectFrom('applications')
.select((eb) => eb.fn.countAll<string>().as('count'))
.where('status', '=', ApplicationStatus.PENDING)
.where((eb) =>
eb.or([
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.DONE),
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.FAILED),
])
)
.executeTakeFirstOrThrow();

const count = Number(result.count);

return count;
}

export async function countReviewedApplications() {
const result = await db
.selectFrom('applications')
.select((eb) => eb.fn.countAll<string>().as('count'))
.where((eb) =>
eb.or([
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.DONE),
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.FAILED),
])
)
.executeTakeFirstOrThrow();

const count = Number(result.count);
Expand Down Expand Up @@ -121,7 +145,14 @@ export async function listApplications({
})
.$if(status !== 'all', (qb) => {
return qb.where('applications.status', '=', status);
});
})
// Only show applications that have been reviewed (DONE or FAILED)
.where((eb) =>
eb.or([
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.DONE),
eb('applications.autoReviewJobStatus', '=', AutoReviewJobStatus.FAILED),
])
);

const orderDirection = status === 'pending' ? 'asc' : 'desc';

Expand All @@ -130,6 +161,7 @@ export async function listApplications({
.leftJoin('schools', 'schools.id', 'applications.schoolId')
.leftJoin('admins', 'admins.id', 'applications.reviewedById')
.select([
'applications.autoReviewJobStatus',
'applications.createdAt',
'applications.email',
'applications.firstName',
Expand Down Expand Up @@ -410,6 +442,7 @@ export async function apply(input: ApplyInput) {
await trx
.insertInto('applications')
.values({
autoReviewJobStatus: AutoReviewJobStatus.QUEUED,
contribution: input.contribution,
educationLevel: input.educationLevel,
email: input.email,
Expand Down Expand Up @@ -592,8 +625,24 @@ export const applicationWorker = registerWorker(
ApplicationBullJob,
async (job) => {
return match(job)
.with({ name: 'application.review' }, ({ data }) => {
return reviewApplication(data);
.with({ name: 'application.review' }, async ({ data }) => {
try {
await reviewApplication(data);
// Job completed successfully - mark as DONE
await db
.updateTable('applications')
.set({ autoReviewJobStatus: AutoReviewJobStatus.DONE })
.where('id', '=', data.applicationId)
.execute();
} catch (error) {
// Job failed - mark as FAILED
await db
.updateTable('applications')
.set({ autoReviewJobStatus: AutoReviewJobStatus.FAILED })
.where('id', '=', data.applicationId)
.execute();
throw error;
}
})
.exhaustive();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,20 @@ export const ApplicationStatus = {
REJECTED: 'rejected',
} as const;

export const AutoReviewJobStatus = {
DONE: 'DONE',
FAILED: 'FAILED',
QUEUED: 'QUEUED',
} as const;

export type ApplicationRejectionReason = ExtractValue<
typeof ApplicationRejectionReason
>;

export type ApplicationStatus = ExtractValue<typeof ApplicationStatus>;

export type AutoReviewJobStatus = ExtractValue<typeof AutoReviewJobStatus>;

// Use Cases

export const ApplyInput = Application.pick({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
} from '@oyster/email-templates';

import { sendEmail as sendPostmarkEmail } from '@/infrastructure/postmark';
import { getObject } from '@/infrastructure/s3';

Check warning on line 21 in packages/core/src/modules/notifications/use-cases/send-email.ts

View workflow job for this annotation

GitHub Actions / CI

'getObject' is defined but never used. Allowed unused vars must match /^_/u
import { ENVIRONMENT } from '@/shared/env';
import { getNodemailerTransporter } from '../shared/email.utils';

Expand Down Expand Up @@ -233,23 +233,13 @@
{ name: 'referral-sent' },
{ name: 'resume-submitted' },
{ name: 'student-anniversary' },
{ name: 'student-attended-onboarding' },
{ name: 'student-graduation' },
{ name: 'student-removed' },
() => {
return undefined;
}
)
.with({ name: 'student-attended-onboarding' }, async () => {
const file = await getObject({ key: 'onboarding-deck.pdf' });

return [
{
content: file.base64,
contentType: 'application/pdf',
name: 'ColorStack Onboarding Deck.pdf',
} as EmailAttachment,
];
})
.exhaustive();

return attachments;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { Kysely } from 'kysely';

export async function up(db: Kysely<any>) {
await db.schema
.alterTable('applications')
.addColumn('auto_review_job_status', 'text')
.execute();

// Set all existing applications to DONE
await db
.updateTable('applications')
.set({ auto_review_job_status: 'DONE' })
.execute();
}

export async function down(db: Kysely<any>) {
await db.schema
.alterTable('applications')
.dropColumn('auto_review_job_status')
.execute();
}
Loading