fix(index.ts): remove CORS config

src/controllers/application.controller.ts

@@ -2,8 +2,8 @@ import { Application } from '../models';
 import { NextFunction, Request, Response } from 'express';
 
 const createApplication = async (req: Request, res: Response): Promise<void | Response> => {
-  const { companyName, position, method, date } = req.body;
-  if (!companyName || !position || !method || !date) {
+  const { companyName, position, method, date, employmentType, status } = req.body;
+  if (!companyName || !position || !method || !date || !employmentType || !status) {
     return res.status(400).json({
       status: 400,
       error: 'Bad Request: Please ensure all required parameters are sent.',
@@ -15,10 +15,13 @@ const createApplication = async (req: Request, res: Response): Promise<void | Re
       position,
       method,
       date,
+      status,
+      employmentType,
       user_id: res.locals.user_id,
     });
     res.status(201).json(application);
   } catch (err) {
+    console.error(err);
     res.status(500).json({
       status: 500,
       error: err,
@@ -50,13 +53,9 @@ const updateApplication = async (req: Request, res: Response): Promise<void | Re
 const getApplications = async (_: Request, res: Response, next: NextFunction): Promise<void | Response> => {
   if (!res.locals.user_id) return res.status(403).json({ status: 403, error: 'Bad Request: Please ensure appropriate information submitted.'});
   try {
-    const applications = await Application.findAll({ where: { _id: res.locals.user_id }, raw: true });
+    const applications = await Application.findAll({ where: { user_id: res.locals.user_id }, raw: true });
     res.locals.applications = applications;
-    applications.length ? next() : res.status(200).json({
-      applications: [],
-      offers: [],
-      interviews: [],
-    });
+    applications.length ? next() : res.status(200).json([]);
   } catch (err) {
     res.status(500).json({ status: 500, error: err });
   }

src/controllers/offer.controller.ts

@@ -55,9 +55,7 @@ const getOffers = async (_: Request, res: Response): Promise<void | Response> =>
     res.locals.applications.forEach(async (app: Application) => {
       app.offers = await Offer.findAll<Model<OfferInterface>>({ where: { application_id: app._id}, raw: true });
     });
-    res.status(200).json({
-      ...res.locals.applications,
-    })
+    res.status(200).json(res.locals.applications);
   } catch (err) {
     res.status(500).json({ status: 500, error: err });
   }

src/index.ts

@@ -9,13 +9,7 @@ dotenv.config();
 const app = express();
 
 const { PORT } = process.env;
-
-const corsConfig= {
-  origin: process.env.CORS_ORIGIN,
-  credentials: true
-}
-
-app.use(cors(corsConfig));
+app.use(cors());
 app.use(express.json());
 app.use(router);
 

src/middleware/auth.ts

@@ -9,6 +9,7 @@ const auth = admin.initializeApp({
 }).auth();
 
 const authenticate = async (req: Request, res: Response, next: NextFunction): Promise<void | Response> => {
+  console.log('Someone is making a request!');
   const token = req.headers['authorization']?.split(' ')[1];
   if (!token) return res.status(403).json({ status: 403, error: 'Incorrect Permissions'});
   try {
@@ -17,6 +18,7 @@ const authenticate = async (req: Request, res: Response, next: NextFunction): Pr
     res.locals.user_id = user_id;
     next();
   } catch (err) {
+    console.error(err);
     res.status(500).json({ status: 500, error: err });
   }
 } 

src/models/Application.model.ts

@@ -9,6 +9,10 @@ const Application = sequelize.define('application', {
     allowNull: false,
     defaultValue: uuid(),
   },
+  employmentType: {
+    type: DataTypes.STRING,
+    allowNull: false,
+  },
   companyName: {
     type: DataTypes.STRING,
     allowNull: false,
@@ -24,10 +28,9 @@ const Application = sequelize.define('application', {
   status: {
     type: DataTypes.STRING,
     allowNull: false,
-    defaultValue: 'Applied',
   },
   date: {
-    type: DataTypes.DATE,
+    type: DataTypes.STRING,
     allowNull: false,
   },
 });

src/models/Offer.model.ts

@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
 
 const Offer = sequelize.define('offer', {
   date: {
-    type: DataTypes.DATE,
+    type: DataTypes.STRING,
     allowNull: false,
   },
   _id: {

src/models/User.model.ts

@@ -22,7 +22,7 @@ const User = sequelize.define('user', {
     allowNull: true
   },
   dateStartedLooking: {
-    type: DataTypes.DATE,
+    type: DataTypes.STRING,
     allowNull: true
   },
   salaryTarget: {

src/router.ts

@@ -11,11 +11,11 @@ const router = Router();
 router.post('/user', authenticate, createUser);
 router.put('/user', authenticate, updateUser);
 router.post('/applications', authenticate, createApplication);
-router.put('/applications', authenticate, updateApplication);
+router.put('/applications/:_id', authenticate, updateApplication);
 router.post('/interviews', authenticate, createInterview);
 router.put('/interviews', authenticate, updateInterview);
 router.post('/offers', authenticate, createOffer);
 router.put('/offers', authenticate, updateOffer);
-router.get('/login', getApplications, getInterviews, getOffers);
+router.get('/applications', authenticate, getApplications, getInterviews, getOffers);
 
 export default router;

src/types/application.type.ts

@@ -8,8 +8,10 @@ export interface Application {
   _id: string;
   status: string;
   position: string;
+  salary?: number;
   user_id: string;
   companyName: string;
+  employmentType: string;
   interviews?: Model<InterviewInterface>[];
   offers?: Model<OfferInterface>[];
 }

src/types/offer.type.ts

@@ -5,4 +5,5 @@ export interface OfferInterface {
   salary: string;
   benefits: string[];
   application_id: string;
+  status: string;
 }