updated auth

Author: ernest-phillips

README.md

@@ -12,7 +12,8 @@ These instructions will get you a copy of the project up and running on your loc
 
 ## Running the tests
 
-Explain how to run the automated tests for this system
+Tests completed with faker.js and Chai
+To supply data for testing and assertions
 
 ### Break down into end to end tests
 

app/auth/auth.router.js

@@ -26,10 +26,8 @@ function createJwtToken(user) {
     });
 }
 //Login endpoint
-authRouter.get('/login.html', (req, res) => {
+authRouter.get('/login.html', (req, res) => {});
 
-
-});
 authRouter.post('/login', localPassportMiddleware, (request, response) => {
     const user = request.user.serialize();
     const jwtToken = createJwtToken(user);
@@ -51,13 +49,23 @@ authRouter.post('/refresh', jwtPassportMiddleware, (request, response) => {
     });
 });
 
+<<<<<<< HEAD
 authRouter.post('/logout', localPassportMiddleware, (req, res) => {
         res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
     }
     module.exports = {
         authRouter
     });
 
+=======
+authRouter.post('/logout', (req, res) => {
+    console.log("logging out")
+    res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
+    res.json({
+
+    })
+});
+>>>>>>> 7867560ecc9fefea91206abd0e5963e313dce6b3
 module.exports = {
     authRouter
 };

app/exercise/exercise.model.js

@@ -8,10 +8,6 @@ const mongoose = require("mongoose");
 const Joi = require("joi");
 
 const exerciseSchema = new mongoose.Schema({
-    // user: {
-    //     type: mongoose.Schema.Types.ObjectId,
-    //     ref: "user"
-    // },
     exercise: {
         type: String,
         required: true
@@ -24,18 +20,13 @@ const exerciseSchema = new mongoose.Schema({
         type: String,
         enum: ["cardiovascular", "strength training"]
     }
+
 });
 
 exerciseSchema.methods.serialize = function() {
-    let user;
-    if (typeof this.user.serialize === "function") {
-        user = this.user.serialize();
-    } else {
-        user = this.user;
-    }
+
     return {
         id: this._id,
-        // user: user,
         exercise: this.exercise,
         bodypart: this.bodypart,
         ex_type: this.ex_type
@@ -56,5 +47,6 @@ const ExerciseJoiSchema = Joi.object().keys({
 });
 
 module.exports = {
-    Exercise
+    Exercise,
+    ExerciseJoiSchema
 };

app/exercise/exercise.router.js

@@ -18,7 +18,7 @@ const {
 exerciseRouter.post('/', (request, response) => {
 
     const newExercise = {
-        // user: request.user.id,
+
         exercise: request.body.exercise,
         ex_type: request.body.ex_type,
         bodypart: request.body.bodypart
@@ -48,10 +48,9 @@ exerciseRouter.get('/', (request, response) => {
     console.log("Retrieving All Exercises");
     Exercise.find()
         .then(exercises => {
-            // Step 2A: Return the correct HTTP status code, and the users correctly formatted via serialization.
-
             return response.status(HTTP_STATUS_CODES.OK).json(
                 exercises.map(exercise => exercise.serialize())
+
             );
         })
         .catch(error => {
@@ -60,14 +59,16 @@ exerciseRouter.get('/', (request, response) => {
         });
 });
 // RETRIEVE ONE EXERCISE
-exerciseRouter.get('/:exerciseid', (request, response) => {
+exerciseRouter.get('/:id', (request, response) => {
+
     // Step 1: Attempt to retrieve a specific user using Mongoose.Model.findById()
     // https://mongoosejs.com/docs/api.html#model_Model.findById
-    Exercise.findById(request.params.exerciserid)
+    Exercise.findById(request.params.id)
         .then(exercise => {
-            // Step 2A: Return the correct HTTP status code, and the user correctly formatted via serialization.
-            // return response.status(HTTP_STATUS_CODES.OK).json(user.serialize());
-            return response.resolve('/api/exercises');
+            console.log(exercise)
+                // Step 2A: Return the correct HTTP status code, and the user correctly formatted via serialization.
+                // return response.status(HTTP_STATUS_CODES.OK).json(user.serialize());
+            return response.json(exercise);
 
         })
         .catch(error => {

app/user/user.router.js

@@ -78,7 +78,7 @@ userRouter.get('/', (request, response) => {
         })
         .catch(error => {
             // Step 2B: If an error ocurred, return an error HTTP status code and the error in JSON format.
-            return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).json(error);
+            return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).send(error);
         });
 });
 // RETRIEVE ONE USER

app/workout/workout.model.js

@@ -8,45 +8,65 @@
 // https://en.wikipedia.org/wiki/List_of_weight_training_exercises
 const mongoose = require("mongoose");
 const Joi = require("joi");
+const dateFns = require('date-fns');
 
 const workoutSchema = new mongoose.Schema({
-  user: { type: mongoose.Schema.Types.ObjectId, ref: "user" },
-  exercise: { type: String, required: true },
-  set: { type: Number, required: true },
-  reps: { type: Number, required: true },
-  weight: { type: Number },
-  date: { type: Date }
+    user: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "user"
+    },
+    date: {
+        type: Date,
+        default: Date.now
+    },
+    sets: [{
+        exercise: {
+            type: String,
+            required: true
+        },
+        set: {
+            type: Number,
+            required: true
+        },
+        reps: {
+            type: Number,
+            required: true
+        },
+        weight: {
+            type: Number
+        }
+    }]
 });
 
 workoutSchema.methods.serialize = function() {
-  let user;
-  if (typeof this.user.serialize === "function") {
-    user = this.user.serialize();
-  } else {
-    user = this.user;
-  }
-  return {
-    id: this._id,
-    user: user,
-    exercise: this.exercise,
-    reps: this.reps,
-    weight: this.weight,
-    date: this.date
-  };
+    let user;
+    if (typeof this.user.serialize === "function") {
+        user = this.user.serialize();
+    } else {
+        user = this.user;
+    }
+    return {
+        id: this._id,
+        user: user,
+        exercise: this.exercise,
+        reps: this.reps,
+        weight: this.weight,
+        date: this.date
+    };
 };
 
 const Workout = mongoose.model("workout", workoutSchema);
 
 const WorkoutJoiSchema = Joi.object().keys({
-  user: Joi.string().optional(),
-  exercise: Joi.string()
-    .min(1)
-    .required(),
-  reps: Joi.number()
-    .min(1)
-    .required(),
-  weight: Joi.number().min(1),
-  date: Joi.date()
+    user: Joi.string().optional(),
+    exercise: Joi.string().min(1).required(),
+    reps: Joi.number(),
+    set: Joi.number(),
+    weight: Joi.number(),
+    date: Joi.date().min('1-1-1980')
 });
 
-module.exports = { Workout };
+module.exports = {
+    Workout,
+    WorkoutJoiSchema
+};

app/workout/workout.router.js

@@ -18,12 +18,15 @@ const {
 workoutRouter.post('/', (request, response) => {
 
         const newWorkout = {
-            // user: request.user.id,
+            user: request.body.user,
             exercise: request.body.exercise,
             reps: request.body.reps,
             weight: request.body.weight,
-            set: request.body.set
+            set: request.body.set,
+            date: request.body.date
+
         };
+        console.log(newWorkout)
 
         const validation = Joi.validate(newWorkout, WorkoutJoiSchema);
         if (validation.error) {
@@ -35,17 +38,31 @@ workoutRouter.post('/', (request, response) => {
 
         Workout.create(newWorkout)
             .then(createdWorkout => {
+                console.log("Workout Created")
                 return response.status(HTTP_STATUS_CODES.CREATED).json(createdWorkout.serialize());
             })
             .catch(error => {
-                return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).json(error);
+                console.log(error)
+                return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).send(error);
             })
     })
     // jwtPassportMiddleware,
-workoutRouter.get('/', jwtPassportMiddleware, (request, response) => {
+workoutRouter.get('/', (request, response) => {
     console.log("Your Workouts")
-    response.sendFile(path.resolve('./app/views/auth/home.html'));
-    // response.send('Text here')
+    Workout.find()
+        .then(workouts => {
+            // Step 2A: Return the correct HTTP status code, and the users correctly formatted via serialization.
+
+            return response.status(HTTP_STATUS_CODES.OK).json(
+                workouts.map(workout => workout.serialize())
+            );
+
+
+        })
+        .catch(error => {
+            // Step 2B: If an error ocurred, return an error HTTP status code and the error in JSON format.
+            return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).json(error);
+        });
 })
 
 module.exports = {