adds totalScore and adminComments field

uwblueprint · Nov 29, 2023 · 724056e · 724056e
1 parent 475bb29
commit 724056e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/backend/typescript/migrations/2023.04.05T17.43.43.create-applicationDash-table.ts b/backend/typescript/migrations/2023.04.05T17.43.43.create-applicationDash-table.ts
@@ -11,23 +11,27 @@ const SEEDED_DATA = [
     applicationId: 1,
     reviewerId: 1,
     reviewerEmail: userEmails[0],
-    passionFSG: 0,
-    teamPlayer: 0,
-    desireToLearn: 0,
-    skill: 0,
+    passionFSG: 2,
+    teamPlayer: 3,
+    desireToLearn: 2,
+    skill: 4,
+    totalScore: 11,
     reviewerComments: "Great job presenting your case study!",
+    adminComments: "Good!",
     recommendedSecondChoice: "N/A",
     skillCategory: "junior",
   },
   {
     applicationId: 1,
     reviewerId: 2,
     reviewerEmail: userEmails[1],
-    passionFSG: 0,
-    teamPlayer: 0,
-    desireToLearn: 0,
-    skill: 0,
+    passionFSG: 5,
+    teamPlayer: 4,
+    desireToLearn: 4,
+    skill: 5,
+    totalScore: 18,
     reviewerComments: "Very good!",
+    adminComments: "Awesome job!",
     recommendedSecondChoice: "considered",
     skillCategory: "intermediate",
   },
@@ -78,6 +82,10 @@ export const up: Migration = async ({ context: sequelize }) => {
       type: DataType.INTEGER,
       allowNull: false,
     },
+    totalScore: {
+      type: DataType.INTEGER,
+      allowNull: false,
+    },
     skillCategory: {
       type: DataType.ENUM("junior", "intermediate", "senior"),
       allowNull: false,
@@ -86,6 +94,10 @@ export const up: Migration = async ({ context: sequelize }) => {
       type: DataType.STRING,
       allowNull: false,
     },
+    adminComments: {
+      type: DataType.STRING,
+      allowNull: false,
+    },
     recommendedSecondChoice: {
       type: DataType.ENUM("N/A", "considered", "not considered"),
       allowNull: false,

diff --git a/backend/typescript/models/applicationDashboard.model.ts b/backend/typescript/models/applicationDashboard.model.ts
@@ -7,6 +7,7 @@ import {
   ForeignKey,
   Model,
   Table,
+  BeforeSave,
 } from "sequelize-typescript";
 import Application from "./application.model";
 import User from "./user.model";
@@ -58,4 +59,19 @@ export default class ApplicationDashboardTable extends Model {
 
   @BelongsTo(() => Application)
   application!: Application;
+
+  @Column({ type: DataType.STRING })
+  adminComments!: string;
+
+  @Column({ type: DataType.INTEGER })
+  totalScore!: number;
+
+  @BeforeSave
+  static calculateTotalScore(instance: ApplicationDashboardTable) {
+    instance.totalScore =
+      instance.passionFSG +
+      instance.desireToLearn +
+      instance.skill +
+      instance.teamPlayer;
+  }
 }