Merge pull request #45 from DataScience-GT/dev

Dev

app.ts

@@ -8,7 +8,19 @@ const app = express();
 app.use("/api/webhook", express.raw({ type: "*/*" }));
 app.use(express.json({ limit: "50mb" }));
 
-
+const allowedOrigins = [
+  "http://localhost:3000",
+  "http://localhost:3001",
+  "http://localhost:3002"
+]
+
+const corsOptions = {
+  origin: allowedOrigins,
+  optionsSuccessStatus: 200,
+}
+
+const cors = require("cors");
+app.use(cors(corsOptions));
 
 //setup logger
 // import { log, warning, error } from "./Logger";

data/migrations/20230920150004_create_project_app_table.ts

@@ -6,7 +6,7 @@ export async function up(knex: Knex): Promise<void> {
         .createTable("project_apps", function (table) {
             table.increments("project_inc").primary();
             table.string("project_name", 255).unique();
-            table.string("project_location", 255);
+            table.string("contact_email", 255);
             table.string("related_fields", 1000);
             table.string("project_description", 1000);
             table.integer("num_students").defaultTo(0);

data/migrations/20231011002038_update_project_apps.ts

@@ -0,0 +1,18 @@
+import { Knex } from "knex";
+
+
+export async function up(knex: Knex): Promise<void> {
+    return knex.schema.table('project_apps', function (table) {
+        table.string('project_hosts', 255);
+        table.string("contact_email", 255);
+    });
+}
+
+
+export async function down(knex: Knex): Promise<void> {
+    return knex.schema.table('project_apps', function (table) {
+        table.dropColumn('project_hosts');
+        table.dropColumn("contact_email");
+    });
+}
+

interfaces/ProjectApp.ts

@@ -1,6 +1,8 @@
 export interface ProjectAppInfo {
     projectName: string;
     projectLocation: string;
+    projectHosts: string;
+    projectContactEmail: string;
     relatedFields: string;
     relatedFieldOther: string;
     projectDescription: string;

model.ts

@@ -1155,22 +1155,27 @@ export const getUserDemographics = async () => {
  * attempts to insert prjoect application info into db
  * @param projectApp project application object
  */
-
 export const submitProjectAppInfo = async (projectApp: ProjectAppInfo) => {
-  const newRelatedFields = projectApp.relatedFields.concat(projectApp.relatedFieldOther)
-      .replaceAll("Other-Option", "");
-  const newDesiredSkills = projectApp.skillsDesired.concat(projectApp.skillDesiredOther)
-      .replaceAll("Other-Option2", "");
+  let newRelatedFields = projectApp.relatedFields.replaceAll(", Other-Option", "").replaceAll("-Option", "");
+  if (projectApp.relatedFieldOther) {
+    newRelatedFields = newRelatedFields.concat(", " + projectApp.relatedFieldOther);
+  }
+  let newSkills = projectApp.skillsDesired.replaceAll(", Other-Option2", "").replaceAll("-Option", "");;
+  if (projectApp.skillDesiredOther) {
+    newSkills = newSkills.concat(", " + projectApp.skillDesiredOther);
+  }
 
   await db.insert({
     project_name: projectApp.projectName,
     project_location: projectApp.projectLocation,
+    project_hosts: projectApp.projectHosts,
+    contact_email: projectApp.projectContactEmail,
     related_fields: newRelatedFields,
     project_description: projectApp.projectDescription,
     num_students: projectApp.numStudentsDesired,
     term_length: projectApp.termLength,
     compensation_hour: projectApp.compensationHour,
     start_date: projectApp.startDate,
-    desired_skills: newDesiredSkills
+    desired_skills: newSkills,
   }).into("project_apps");
 }

package.json

@@ -25,6 +25,7 @@
   "dependencies": {
     "@types/supertest": "^2.0.12",
     "concurrently": "^7.2.2",
+    "cors": "^2.8.5",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
     "fs": "^0.0.1-security",

routes/projects.ts

@@ -8,12 +8,14 @@ const router = express.Router();
 
 router.post(
     "/create",
-    RateLimit(20, 1000 * 60 * 60),
+    RateLimit(100, 1000 * 60 * 60),
     async (req: Request, res: Response, next: NextFunction) => {
 
         let p: ProjectAppInfo = {
             projectName: req.body.projectName,
             projectLocation: req.body.projectLocation,
+            projectHosts: req.body.projectHosts,
+            projectContactEmail: req.body.projectContactEmail,
             relatedFields: req.body.relatedFields,
             relatedFieldOther: req.body.relatedFieldOther,
             projectDescription: req.body.projectDescription,
@@ -28,7 +30,7 @@ router.post(
         if (!(
             p.projectName && p.projectLocation && p.relatedFields && p.projectDescription
             && p.numStudentsDesired && p.termLength && p.compensationHour && p.startDate
-            && p.skillsDesired
+            && p.skillsDesired && p.projectHosts && p.projectContactEmail
         )) {
             next(new StatusErrorPreset(ErrorPreset.MissingRequiredFields));
         }