#158457036 Send invites to player and control number of players #12

Onnassiz · 2018-07-11T19:13:09Z

What does this PR do?

This PR allows users to search for other users and send an invitation to these users. It also prevents a game start when the number of connected users is less than 3 and notifies the 13th user trying to join a game that the game slot is full.

Description of Task to be completed?

search for users
send an email invitation to users
secure search and send-invitation endpoints
design reusable modal
implement modal warnings when necessary
test backend and frontend features
etc.

How should this be manually tested?

This PR can be tested using the review app link below

What are the relevant pivotal tracker stories?

[158457036]

Any background context you want to add?

Screenshots

houndci-bot · 2018-07-12T08:20:11Z

public/js/services/global.js

-          console.log('userDonated success', results);
-        });
+          .then(function (results) {
+            console.log('userDonated success', results);


Unexpected console statement no-console

houndci-bot · 2018-07-12T08:20:12Z

public/js/services/game.js


+    socket.on('gameFilledUp', function (data) {


'data' is defined but never used no-unused-vars

houndci-bot · 2018-07-12T08:20:12Z

public/js/services/game.js

+    var notificationQueue = [];
+    var timeout = false;
+    var self = this;
+    var joinOverrideTimeout = 0;


'joinOverrideTimeout' is assigned a value but never used no-unused-vars

houndci-bot · 2018-07-12T08:20:12Z

public/js/services/game.js

+
+    var notificationQueue = [];
+    var timeout = false;
+    var self = this;


'self' is assigned a value but never used no-unused-vars

houndci-bot · 2018-07-12T08:20:12Z

public/js/directives.js

    return {
      restrict: 'EA',
-      link: function(scope, elem, attr) {
+      link(scope, elem, attr) {


'attr' is defined but never used no-unused-vars

houndci-bot · 2018-07-12T08:20:13Z

public/js/controllers/game.js

 angular.module('mean.system')
-.controller('GameController', ['$scope', 'game', '$timeout', '$location', 'MakeAWishFactsService', '$dialog', function ($scope, game, $timeout, $location, MakeAWishFactsService, $dialog) {
+  .controller('GameController', ['$scope', '$http', '$q', 'game', '$timeout', '$location', 'MakeAWishFactsService', '$dialog', '$rootScope', ($scope, $http, $q, game, $timeout, $location, MakeAWishFactsService, $rootScope) => {    


'$rootScope' is defined but never used no-unused-vars

houndci-bot · 2018-07-12T08:20:13Z

public/js/controllers/auth.js

+        localStorage.setItem('#cfhetusertoken', response.token);
+        $location.path('/app');
+      }, (error) => {
+        console.log(error);


Unexpected console statement no-console

houndci-bot · 2018-07-12T08:20:13Z

public/js/controllers/auth.js

+        localStorage.setItem('#cfhetusertoken', response.token);
+        $location.path('/app');
+      }, (error) => {
+        console.log(error);


Unexpected console statement no-console

houndci-bot · 2018-07-12T08:20:14Z

public/css/common.scss

+    -webkit-box-shadow: 0px 0px 0px 0px transparent !important;
+    -moz-box-shadow: 0px 0px 0px 0px transparent !important;
+    box-shadow: 0px 0px 0px 0px transparent !important;
+    -webkit-border-radius: 8px !important;


Line should be indented 2 spaces, but was indented 4 spaces
!important should not be used
Avoid vendor prefixes.

houndci-bot · 2018-07-12T08:20:14Z

public/css/common.scss

+.crDonateWidget {
+    -webkit-box-shadow: 0px 0px 0px 0px transparent !important;
+    -moz-box-shadow: 0px 0px 0px 0px transparent !important;
+    box-shadow: 0px 0px 0px 0px transparent !important;


Line should be indented 2 spaces, but was indented 4 spaces
!important should not be used
0px should be written without units as 0

houndci-bot · 2018-07-12T08:33:02Z

backend-test/user/model.js

+      });
+    });
+
+    after((done) => {


'after' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/user/model.js


-        after(function(done) {
-            done();
+      it('should be able to show an error when try to save without name', (done) => {


'it' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/user/model.js

-            });
-        });
+    describe('Method Save', () => {
+      it('should be able to save without problems', done => user.save((err) => {


'it' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/user/model.js

-                });
-            });
-        });
+    describe('Method Save', () => {


'describe' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/user/model.js

+// The tests
+describe('<Unit Test>', () => {
+  describe('Model User:', () => {
+    before((done) => {


'before' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/user/model.js

-    app = require('../../server'),
-    mongoose = require('mongoose'),
-    User = mongoose.model('User');
+const should = require('should');


'require' is not defined no-undef

houndci-bot · 2018-07-12T08:33:03Z

backend-test/integration/inviteUsers.test.js

@@ -0,0 +1,78 @@
+import 'babel-polyfill';


Parsing error: 'import' and 'export' may appear only with 'sourceType: module'

houndci-bot · 2018-07-12T08:33:04Z

backend-test/integration/findUsers.test.js

@@ -0,0 +1,70 @@
+import 'babel-polyfill';


Parsing error: 'import' and 'export' may appear only with 'sourceType: module'

houndci-bot · 2018-07-12T08:33:04Z

public/js/services/game.js

@@ -66,6 +66,10 @@ angular.module('mean.system')
      game.timeLimits = data.timeLimits;
    });

+    socket.on('gameFilledUp', function (data) {


'data' is defined but never used no-unused-vars

houndci-bot · 2018-07-12T08:33:04Z

config/socket/socket.js

      socket.join(game.gameID);
      socket.gameID = game.gameID;
+      console.log(socket.id,'has joined newly created game',game.gameID);


Unexpected console statement no-console

- Implements receipt of jwt token on signup - Implements correct controller on signup/login page - Implements caching of data in browser [Finishes #158457035]

-setup api endpoint for finding users -setup api endpoint for sending email to users -create a nodemailer function for sending email -create an email and url validator -write test cases for finding players and sending email -modify angular game controller -added validation to search field by creating a directive -styled text field and buttons -etc [#158457036]

-setup materialize -modal design for less that 3 players -modal design for more than 11 players [#158457036]

-remove multiple modals -use reusable modal -add questions and answers to db -change maximum player limit to 12 -link start button modal to game [#158457036]

-removed submit button from search form -added search on key press -modify karma config for test [#158457036]

-modify request header from controller -add middleware to routes -modify auth verification [#158457036]

-resolve package-lock.json errors -change play as guest href -move files into view folder [#158457036]

- Add new modal - Emit socket event when max player limit is reached - refactor fireGame function [#158457036]

coveralls · 2018-07-12T13:50:05Z

Pull Request Test Coverage Report for Build 195

165 of 194 (85.05%) changed or added relevant lines in 10 files are covered.
8 unchanged lines in 1 file lost coverage.
Overall coverage increased (+1.0%) to 63.459%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
app/helpers/sendInvitationEmail.js	13	14	92.86%
app/middleware/auth.js	9	18	50.0%
config/socket/socket.js	53	72	73.61%

Files with Coverage Reduction	New Missed Lines	%
config/socket/socket.js	8	72.25%

Totals
Change from base Build 184:	1.0%
Covered Lines:	747
Relevant Lines:	1038

💛 - Coveralls

houndci-bot · 2018-07-12T13:50:49Z

karma.conf.js

@@ -40,9 +42,11 @@ module.exports = (config) => {
    colors: true,

    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || 


Trailing spaces not allowed no-trailing-spaces

houndci-bot · 2018-07-12T13:50:50Z

config/routes.js

@@ -4,13 +4,17 @@ import * as answers from '../app/controllers/answers';
 import questions from '../app/controllers/questions';
 import avatars from '../app/controllers/avatars';
 import index from '../app/controllers/index';
+import middleware from '../app/middleware/auth';


Missing file extension for "../app/middleware/auth" import/extensions

houndci-bot · 2018-07-12T13:50:50Z

backend-test/integration/inviteUsers.test.js

+import request from 'supertest';
+import { expect } from 'chai';
+import app from '../../server';
+import { Tokenizer } from '../../app/helpers/tokenizer';


Missing file extension for "../../app/helpers/tokenizer" import/extensions

houndci-bot · 2018-07-12T13:50:50Z

backend-test/integration/inviteUsers.test.js

@@ -0,0 +1,77 @@
+import request from 'supertest';
+import { expect } from 'chai';
+import app from '../../server';


Missing file extension for "../../server" import/extensions

houndci-bot · 2018-07-12T13:50:50Z

backend-test/integration/inviteUsers.test.js

@@ -0,0 +1,77 @@
+import request from 'supertest';
+import { expect } from 'chai';


Missing file extension for "chai" import/extensions

houndci-bot · 2018-07-12T13:50:51Z

backend-test/helpers/sendEmail.test.js

@@ -0,0 +1,29 @@
+import { expect } from 'chai';
+import sendInvitationEmail from '../../app/helpers/sendInvitationEmail';


Missing file extension for "../../app/helpers/sendInvitationEmail" import/extensions

houndci-bot · 2018-07-12T13:50:52Z

backend-test/helpers/sendEmail.test.js

@@ -0,0 +1,29 @@
+import { expect } from 'chai';


Missing file extension for "chai" import/extensions

houndci-bot · 2018-07-12T13:50:52Z

app/middleware/auth.js

+const auth = (req, res, next) => {
+  let token = req.headers.authorization || req.headers['x-access-token'];
+  token = token.replace('Bearer ', '');
+


Trailing spaces not allowed no-trailing-spaces

houndci-bot · 2018-07-12T13:50:52Z

app/middleware/auth.js

@@ -0,0 +1,39 @@
+import jwt from 'jsonwebtoken';


Missing file extension for "jsonwebtoken" import/extensions

houndci-bot · 2018-07-12T13:50:52Z

app/helpers/sendInvitationEmail.js

+    if (error) {
+      return console.log(error);
+    }
+    console.log('Message sent: %s', info.messageId);


Unexpected console statement no-console

houndci-bot · 2018-07-12T14:04:54Z

app/helpers/sendInvitationEmail.js

+  // send mail with defined transport object
+  transporter.sendMail(mailOptions, (error, info) => {
+    if (error) {
+      return console.log(error);


Unexpected console statement no-console

houndci-bot · 2018-07-12T14:04:55Z

app/helpers/sendInvitationEmail.js

@@ -0,0 +1,56 @@
+/* eslint no-useless-escape: 0 */
+import nodemailer from 'nodemailer';
+import IsUrl from 'is-url';


Missing file extension for "is-url" import/extensions

houndci-bot · 2018-07-12T14:04:55Z

app/helpers/sendInvitationEmail.js

@@ -0,0 +1,56 @@
+/* eslint no-useless-escape: 0 */
+import nodemailer from 'nodemailer';


Missing file extension for "nodemailer" import/extensions

houndci-bot · 2018-07-12T14:04:55Z

app/controllers/users.js

+ * @description Controller for handling requests to '/api/auth/login', 
+ * returns token in response as JSON.
+ * @param {object} passport - passport with all the startegies registered
+ * @description Controller for handling requests to '/api/auth/login', 


Trailing spaces not allowed no-trailing-spaces

houndci-bot · 2018-07-12T14:04:55Z

app/controllers/users.js

@@ -44,6 +48,12 @@ const signin = (req, res) => {
 * @param {object} res - response object provided by express
 * @param {function} next - next function for passing the request to next handler
 * @description Controller for handling requests to '/api/auth/login', returns token in response as JSON.
+ * @param {object} passport - passport with all the startegies registered
+ * @description Controller for handling requests to '/api/auth/login', 


Trailing spaces not allowed no-trailing-spaces

houndci-bot · 2018-07-12T14:04:55Z

app/controllers/users.js

@@ -6,30 +8,32 @@ import mongoose from 'mongoose';
 import passport from 'passport';
 import avatarsList from './avatars';
 import { Tokenizer } from '../helpers/tokenizer';
+import sendInvitationEmail from '../helpers/sendInvitationEmail';


Missing file extension for "../helpers/sendInvitationEmail" import/extensions

- Mock http request for angular - write unit test cases for controller methods - modified controller methods to return promise [Finishes #158457036]

Onnassiz temporarily deployed to et-cfh-staging-pr-12 July 11, 2018 19:13 Inactive

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 1972fee to 132d454 Compare July 12, 2018 05:52

Onnassiz had a problem deploying to et-cfh-staging-pr-12 July 12, 2018 05:52 Failure

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 132d454 to 84bf260 Compare July 12, 2018 06:06

Onnassiz had a problem deploying to et-cfh-staging-pr-12 July 12, 2018 06:06 Failure

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 84bf260 to 0602483 Compare July 12, 2018 06:16

Onnassiz temporarily deployed to et-cfh-staging-pr-12 July 12, 2018 06:16 Inactive

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 0602483 to 3062b4c Compare July 12, 2018 06:18

Onnassiz temporarily deployed to et-cfh-staging-pr-12 July 12, 2018 06:19 Inactive

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 3062b4c to 43d6215 Compare July 12, 2018 06:31

Onnassiz temporarily deployed to et-cfh-staging-pr-12 July 12, 2018 06:31 Inactive

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 43d6215 to cf3bee5 Compare July 12, 2018 08:19

Onnassiz temporarily deployed to et-cfh-staging-pr-12 July 12, 2018 08:20 Inactive

houndci-bot reviewed Jul 12, 2018

View reviewed changes

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from cf3bee5 to ee2637b Compare July 12, 2018 08:32

Onnassiz deployed to et-cfh-staging-pr-12 July 12, 2018 08:32 View deployment

houndci-bot reviewed Jul 12, 2018

View reviewed changes

Hasstrup and others added 8 commits July 12, 2018 14:41

[Feat]: receive jwt on signup

2a5e55b

- Implements receipt of jwt token on signup - Implements correct controller on signup/login page - Implements caching of data in browser [Finishes #158457035]

ft(modals) create modals

4fdf9e2

-setup materialize -modal design for less that 3 players -modal design for more than 11 players [#158457036]

ft(game) get game started

d307498

-remove multiple modals -use reusable modal -add questions and answers to db -change maximum player limit to 12 -link start button modal to game [#158457036]

ft(game) modify find player feature and start controller test

96c0e50

-removed submit button from search form -added search on key press -modify karma config for test [#158457036]

ft(game) secure findUser/invitePlayers endpoints

a4a0fff

-modify request header from controller -add middleware to routes -modify auth verification [#158457036]

bg(refractor) refractor app for deploy

4dea2f8

-resolve package-lock.json errors -change play as guest href -move files into view folder [#158457036]

Add modal prompt for more than 12 players

fcbbe72

- Add new modal - Emit socket event when max player limit is reached - refactor fireGame function [#158457036]

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from ee2637b to 7b11fff Compare July 12, 2018 13:44

houndci-bot reviewed Jul 12, 2018

View reviewed changes

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 7b11fff to 9ce92b7 Compare July 12, 2018 14:01

houndci-bot reviewed Jul 12, 2018

View reviewed changes

ch(test) Add frontend controller test units

e7b10bd

- Mock http request for angular - write unit test cases for controller methods - modified controller methods to return promise [Finishes #158457036]

Onnassiz force-pushed the ft-send-invites-to-at-most-11-users-158457036 branch from 9ce92b7 to e7b10bd Compare July 12, 2018 14:07

Onnassiz closed this Jul 12, 2018

Onnassiz deleted the ft-send-invites-to-at-most-11-users-158457036 branch July 12, 2018 14:14

Onnassiz restored the ft-send-invites-to-at-most-11-users-158457036 branch July 12, 2018 14:15

		@@ -0,0 +1,77 @@
		import request from 'supertest';
		import { expect } from 'chai';

		@@ -0,0 +1,29 @@
		import { expect } from 'chai';
		import sendInvitationEmail from '../../app/helpers/sendInvitationEmail';

		@@ -0,0 +1,56 @@
		/* eslint no-useless-escape: 0 */
		import nodemailer from 'nodemailer';

#158457036 Send invites to player and control number of players #12

#158457036 Send invites to player and control number of players #12

Conversation

Onnassiz commented Jul 11, 2018

What does this PR do?

Description of Task to be completed?

How should this be manually tested?

What are the relevant pivotal tracker stories?

Any background context you want to add?

Screenshots

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jul 12, 2018 • edited Loading

Pull Request Test Coverage Report for Build 195

💛 - Coveralls

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jul 12, 2018 •

edited

Loading