Merge pull request #197 from WebJamApps/dev

Promote for IPU Release

Author: JoshuaVSherman

auth/google.js

@@ -7,7 +7,7 @@ const peopleApiUrl = 'https://www.googleapis.com/plus/v1/people/me/openIdConnect
 
 class Google {
   static authenticate(req, res) {
-    console.log(req);
+    console.log(req.body);
     const params = {
       code: req.body.code,
       client_id: req.body.clientId,
@@ -38,6 +38,7 @@ class Google {
             const user = new User();
             user.name = profile.name;
             user.email = profile.email;
+            user.isOhafUser = req.body.isOhafUser;
             user.save((err) => {
               console.log('token sent');
               res.send({ token: authUtils.createJWT(user) });

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 8.4.0
+    version: 8.5.0
 dependencies:
   pre:
     - npm install -g istanbul yarn codeclimate-test-reporter

lib/router-base.js

@@ -0,0 +1,4 @@
+const Router = require('express').Router;
+const router = new Router();
+
+module.exports = router;

model/charity/charity-router.js

@@ -1,6 +1,6 @@
 const controller = require('./charity-controller');
-const Router = require('express').Router;
-const router = new Router();
+// const Router = require('express').Router;
+const router = require('../../lib/router-base');
 
 router.route('/create')
 .post((...args) => controller.create(...args));

model/signup/signup-controller.js

@@ -2,7 +2,7 @@ const Controller = require('../../lib/controller');
 const signupModel  = require('./signup-facade');
 
 class SignupController extends Controller {
-  find(req, res, next) {
+  findByUserId(req, res, next) {
     console.log('this is the user id: ' + req.params.id);
     return this.model.find({ userId:req.params.id })
     .then((collection) => {
@@ -32,6 +32,18 @@ class SignupController extends Controller {
     });
   }
 
+  removeByUserId(req, res, next) {
+    console.log('this is the user id: ' + req.params.id);
+    return this.model.remove({ userId:req.params.id })
+    .then((doc) => {
+      console.log(doc);
+      // if (!doc) {
+      //   return res.status(404).send({ message: 'Delete id is invalid' });
+      // }
+      return res.status(204).end();
+    });
+  }
+
 }
 
 module.exports = new SignupController(signupModel);

model/signup/signup-router.js

@@ -5,9 +5,15 @@ const router = new Router();
 // router.route('/')
 //   .post((...args) => controller.find(...args));
 //
+router.route('/getall')
+.get((...args) => controller.find(...args));
+
+router.route('/remove/:id')
+.delete((...args) => controller.removeByUserId(...args));
+
 router.route('/:id')
 // .put((...args) => controller.update(...args))
-.get((...args) => controller.find(...args)) // this is the user id
+.get((...args) => controller.findByUserId(...args)) // this is the user id
 .delete((...args) => controller.remove(...args)); // this is the event id
 
 router.route('/create')

model/user/user-schema.js

@@ -5,9 +5,12 @@ const Schema   = mongoose.Schema;
 const userSchema = new Schema({
   name: { type: String, required: true },
   email: { type: String, required: true, unique: true },
+  isOhafUser: { type: Boolean, required: false },
   userPhone: { type: Number, required: false },
   userType: { type: String, required: false },
+  userStreetAddress: { type: String, required: false },
   userCity: { type: String, required: false },
+  userState: { type: String, required: false },
   userZip: { type: String, required: false },
   userDetails:{ type: String, required: false },
   volTravelDistMiles: { type: Number, required: false },

model/volOpp/volOpp-schema.js

@@ -11,6 +11,7 @@ const volOppSchema = new Schema({
   voZipCode: { type: String, required: false },
   voStatus: { type: String, required: false },
   voNumPeopleNeeded: { type: Number, required: false },
+  // voNumPeopleScheduled: { type: Number, required: false },
   voDescription: { type: String, required: false },
   voWorkTypes: { type: [String], required: false },
   voWorkTypeOther: { type: String, required: false },

package.json

@@ -1,16 +1,16 @@
 {
   "name": "web-jam-back",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "web-jam.com",
   "main": "index.js",
   "engines": {
-    "node": "8.4.0",
-    "npm": "5.4.1",
-    "yarn": "1.0.1"
+    "node": "8.5.0",
+    "npm": "5.4.2",
+    "yarn": "1.0.2"
   },
   "license": "MIT",
   "scripts": {
-    "preinstall": "npm install -g yarn@1.0.1",
+    "preinstall": "npm install -g yarn@1.0.2 && npm install -g npm",
     "postinstall": "./postinstall.sh",
     "dev": "nodemon index.js",
     "build:prod": "(cd frontend || exit; npm run vulc && npm start -- build)",

test/functional/signup_crud.js

@@ -39,6 +39,17 @@ describe('The signup feature',  () => {
     });
   });
 
+  it('should get all signups', (done) => {
+    chai.request(server)
+    .get('/signup/getall')
+    .set({ origin: allowedUrl })
+    .set('authorization', 'Bearer ' + authUtils.createJWT('foo2@example.com'))
+    .end((err, res) => {
+      expect(res).to.have.status(200);
+      done();
+    });
+  });
+
   it('should find the signups by event id', (done) => {
     chai.request(server)
     .get('/signup/event/1223')
@@ -66,6 +77,22 @@ describe('The signup feature',  () => {
     });
   });
 
+  it('should delete a signup by user id', (done) => {
+    const signup2 = new Signup1();
+    signup2.voloppId = 'foo';
+    signup2.userId = '12345';
+    signup2.numPeople = 123;
+    signup2.save();
+    chai.request(server)
+    .delete('/signup/remove/12345')
+    .set({ origin: allowedUrl })
+    .set('authorization', 'Bearer ' + authUtils.createJWT('foo2@example.com'))
+    .end((err, res) => {
+      expect(res).to.have.status(204);
+      done();
+    });
+  });
+
   // it('should not delete a signup with invalid event id', (done) => {
   //   const signup2 = new Signup1();
   //   signup2.voloppId = 'foo';