switching to fix-login

server/routes/activities/participants/controllers/createParticipantController.js.orig

@@ -0,0 +1,115 @@
+/**
+ * Created by rui on 5/16/17.
+ */
+const Activity = require("../../../../models/").Activity;
+const Participant = require("../../../../models/").Participant;
+const ParticipantValidator = require("../../../../models").ParticipantValidator;
+const ObjectIdIsValid = require("mongoose").Types.ObjectId.isValid;
+
+const createErrorHandler = require("../../../utils").createErrorHandler;
+const HttpStatus = require("http-status-codes");
+
+const properties = ['name', 'image', 'email', 'surveyResponses'];
+
+const images = [
+    "https://react.semantic-ui.com/assets/images/avatar/large/jenny.jpg",
+    "https://react.semantic-ui.com/assets/images/avatar/large/justen.jpg",
+    "https://react.semantic-ui.com/assets/images/avatar/large/stevie.jpg",
+    "https://react.semantic-ui.com/assets/images/avatar/large/veronika.jpg",
+    "https://semantic-ui.com/images/avatar/large/steve.jpg",
+    "https://semantic-ui.com/images/avatar2/large/kristy.png",
+    "https://semantic-ui.com/images/avatar2/large/matthew.png",
+    "https://semantic-ui.com/images/avatar2/large/molly.png",
+    "https://semantic-ui.com/images/avatar2/large/elyse.png",
+    "https://semantic-ui.com/images/avatar/large/daniel.jpg",
+    "https://semantic-ui.com/images/avatar/large/helen.jpg",
+
+];
+
+let randomBetween = (minVal, maxVal) => {
+    return Math.floor(Math.random() * (maxVal-minVal+1)) + minVal;
+};
+
+function pickImage () {
+    return images[randomBetween(0, images.length-1)];
+};
+
+function validateInput(req) {
+    let payload = req.body;
+    return validateParameters(req.params) && validateFormat(payload, properties)
+        && ParticipantValidator(payload.name, payload.email, payload.image, payload.surveyResponses);
+}
+
+
+function validateParameters(prm) {
+    return prm.hasOwnProperty('activityId') && typeof prm.activityId === 'string'
+        && ObjectIdIsValid(prm.activityId);
+}
+
+
+function validateFormat(payload, properties){
+    let res = true;
+    properties.forEach(function (property) {
+        res = res && payload.hasOwnProperty(property);
+    });
+    return res;
+}
+
+
+module.exports = function (req, res, next) {
+    if (!validateInput(req)) {
+        const errorMessage = 'please give valid activityID in URL and correct payload';
+        createErrorHandler(res, HttpStatus.BAD_REQUEST)(errorMessage);
+        return;
+    }
+
+    const payload = req.body;
+    const activityId = req.params.activityId;
+<<<<<<< HEAD
+
+    console.log(payload);
+    console.log(payload.surveyResponses);
+=======
+>>>>>>> a165bb757d8a7aad48820d6f96d783d3fc4c9c50
+
+    // check if the activity is full. If so, then no other one can participate in
+    Activity.findOne({_id: activityId, isDeleted: false})
+        .exec()
+        .then(function (activity){
+            if (activity === null){
+                const errorMessage = "Cannot find activity has id: " + activityId + " in which to create new participant";
+                return createErrorHandler(res, HttpStatus.NOT_FOUND)(errorMessage);
+            }
+            if (activity.totalCapacity <= activity.currentCapacity){
+                const errorMessage = "The activity is full, no other one can participate in";
+                return createErrorHandler(res, HttpStatus.NOT_FOUND)(errorMessage);
+            }
+            // save a new participant
+            const newParticipant = new Participant({
+                _activity: activityId,
+                _creator: activity._creator,
+                email: payload.email,
+                name: payload.name,
+                image: pickImage(),
+                surveyResponses: payload.surveyResponses,
+            });
+            newParticipant.save()
+                .then(function(participant){
+
+                    // update activity
+                    activity.participants.push({_id: participant.id});
+                    activity.lastModifiedTime = Date.now();
+                    activity.currentCapacity ++;
+
+                    activity.save().then(function(act){
+                        return res.status(HttpStatus.CREATED).json({
+                            participant: participant.getPublicFields()
+                        })
+                    }).catch(createErrorHandler(res, HttpStatus.INTERNAL_SERVER_ERROR));
+                })
+                .catch(createErrorHandler(res, HttpStatus.INTERNAL_SERVER_ERROR));
+
+
+        }).catch(createErrorHandler(res, HttpStatus.INTERNAL_SERVER_ERROR));
+
+};

src/routes/Activity/components/GroupCard/GroupCard.js

@@ -166,7 +166,7 @@ class GroupCard extends React.Component {
                             { this.props.participants.map((participant) =>
                                 <DraggableCard 
                                     participant={ participant } 
-                                    key={ participant.participantId } 
+                                    key={ participant.get('participantId') } 
                                     setCurrentlySelected={ (v) => console.log(v)  }
                                     unlocked= { this.props.unlocked }
                                 />