Skip to content
Merged
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
6 changes: 3 additions & 3 deletions apps/backend/src/applications/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Status of the application in the system/ review process
*/
export enum AppStatus {
APP_SUBMITTED = 'App submitted',
IN_REVIEW = 'In review',
FORMS_SENT = 'Forms sent',
APP_SUBMITTED = 'App Submitted',
IN_REVIEW = 'In Review',
FORMS_SIGNED = 'Forms Signed',
ACCEPTED = 'Accepted',
NO_AVAILABILITY = 'No Availability',
DECLINED = 'Declined',
Expand Down
45 changes: 45 additions & 0 deletions apps/backend/src/migrations/1775221059185-AlterApplication.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AlterApplication1775221059185 implements MigrationInterface {
name = 'AlterApplication1775221059185';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TYPE "public"."application_appstatus_enum" RENAME TO "application_appstatus_enum_old"`,
);
await queryRunner.query(
`CREATE TYPE "public"."application_appstatus_enum" AS ENUM('App Submitted', 'In Review', 'Forms Signed', 'Accepted', 'No Availability', 'Declined', 'Active', 'Inactive')`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" DROP DEFAULT`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" TYPE "public"."application_appstatus_enum" USING "appStatus"::"text"::"public"."application_appstatus_enum"`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" SET DEFAULT 'App Submitted'`,
);
await queryRunner.query(
`DROP TYPE "public"."application_appstatus_enum_old"`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TYPE "public"."application_appstatus_enum_old" AS ENUM('App submitted', 'In review', 'Forms sent', 'Accepted', 'No Availability', 'Declined', 'Active', 'Inactive')`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" DROP DEFAULT`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" TYPE "public"."application_appstatus_enum_old" USING "appStatus"::"text"::"public"."application_appstatus_enum_old"`,
);
await queryRunner.query(
`ALTER TABLE "application" ALTER COLUMN "appStatus" SET DEFAULT 'App submitted'`,
);
await queryRunner.query(`DROP TYPE "public"."application_appstatus_enum"`);
await queryRunner.query(
`ALTER TYPE "public"."application_appstatus_enum_old" RENAME TO "application_appstatus_enum"`,
);
}
}
16 changes: 15 additions & 1 deletion apps/frontend/src/api/apiClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import axios, { type AxiosInstance } from 'axios';
import { useCallback, useEffect, useState } from 'react';
import { Application, AvailabilityFields, LearnerInfo } from './types';
import {
Application,
AppStatus,
AvailabilityFields,
LearnerInfo,
} from './types';

const defaultBaseUrl =
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000';
Expand Down Expand Up @@ -34,6 +39,15 @@ export class ApiClient {
) as Promise<Application>;
}

public async updateApplicationStatus(
appId: number,
appStatus: AppStatus,
): Promise<Application> {
return this.patch(`/api/applications/${appId}/status`, {
appStatus,
}) as Promise<Application>;
}

public async getTotalApplicationsCount(): Promise<number> {
const response = (await this.get('/api/applications/count/total')) as {
count: number;
Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/src/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Status of the application in the system/ review process
*/
export enum AppStatus {
APP_SUBMITTED = 'App submitted',
IN_REVIEW = 'In review',
FORMS_SENT = 'Forms sent',
APP_SUBMITTED = 'App Submitted',
IN_REVIEW = 'In Review',
FORMS_SIGNED = 'Forms Signed',
ACCEPTED = 'Accepted',
NO_AVAILABILITY = 'No Availability',
DECLINED = 'Declined',
Expand Down
Loading
Loading