adds secondChoiceStatusType and ENUM

uwblueprint · Nov 2, 2023 · 45c52fe · 45c52fe
1 parent 6f42119
commit 45c52fe
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/backend/typescript/migrations/2023.04.05T17.43.42.ts b/backend/typescript/migrations/2023.04.05T17.43.42.ts
@@ -4,7 +4,8 @@ import { DataType } from "sequelize-typescript";
 
 import { Migration } from "../umzug";
 import allApplications from "./applicationlist.json";
-import { simpleEntityRequestDtoValidator } from "../middlewares/validators/simpleEntityValidators";
+import { DataTypes } from "sequelize";
+import { secondChoiceStatusType } from "../types";
 
 const TABLE_NAME = "applicantresponse";
 
@@ -97,7 +98,7 @@ export const up: Migration = async ({ context: sequelize }) => {
     },
     resumeUrl: {
       type: DataType.STRING(4000),
-      allowNull: true,
+    allowNull: true,
     },
     roleSpecificQuestions: {
       type: DataType.ARRAY(DataType.STRING(4000)),
@@ -116,9 +117,9 @@ export const up: Migration = async ({ context: sequelize }) => {
       allowNull: true,
     },
     secondChoiceStatus: {
-      type: DataType.ENUM("considered", "not considered", "n/a", "interview", "recommended", "in review", "interview", "no interview"),
-      defaultValue: "n/a",
-      allowNull: true,
+      type: DataTypes.ENUM(...Object.values(secondChoiceStatusType)),
+      allowNull: false,
+      defaultValue: secondChoiceStatusType.NOT_APPLICABLE
     },
     term: {
       type: DataType.STRING(4000),
@@ -137,7 +138,9 @@ export const up: Migration = async ({ context: sequelize }) => {
   });
 
   const SEEDED_DATA = importApplicationData();
+
   await sequelize.getQueryInterface().bulkInsert(TABLE_NAME, SEEDED_DATA);
+
 };
 
 export const down: Migration = async ({ context: sequelize }) => {

diff --git a/backend/typescript/models/application.model.ts b/backend/typescript/models/application.model.ts
@@ -2,6 +2,9 @@
 
 import { Column, DataType, HasMany, Model, Table } from "sequelize-typescript";
 import ApplicationDashboardTable from "./applicationDashboard.model";
+import { DataTypes, Sequelize } from "sequelize";
+import { secondChoiceStatusType } from "../types";
+
 
 @Table({ tableName: "applicantresponse" })
 export default class Application extends Model {
@@ -57,10 +60,10 @@ export default class Application extends Model {
   status!: string;
 
   @Column({
-    type: DataType.ENUM("considered", "not considered", "n/a", "recommended", "in review", "interview", "no interview"), 
-    defaultValue: "n/a"
+    type: DataTypes.ENUM(...Object.values(secondChoiceStatusType)),
+    defaultValue: secondChoiceStatusType.NOT_APPLICABLE
   })
-  secondChoiceStatus!: string;
+  secondChoiceStatus!: secondChoiceStatusType;
 
   @Column({ type: DataType.STRING })
   term!: string;

diff --git a/backend/typescript/types.ts b/backend/typescript/types.ts
@@ -1,5 +1,15 @@
 export type Role = "User" | "Admin";
 
+export enum secondChoiceStatusType {
+  CONSIDERED = "considered",
+  NOT_CONSIDERED = "not considered",
+  NOT_APPLICABLE = "n/a",
+  RECOMMENDED = "recommended",
+  IN_REVIEW = "in review",
+  INTERVIEW = "interview",
+  NO_INTERVIEW = "no interview"
+}
+
 export type Token = {
   accessToken: string;
   refreshToken: string;