Merge pull request CodewarsClone#24 from CodewarsClone/testCtrl

Finished Oauth and testing suite ability

Author: Jon Myrick

controllers/testCtrl.js

@@ -5,56 +5,54 @@
  *
  */
 
-// This is where wer run a script.. I have verified that so long as we get it in string format we run unit tests
-
-/*exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
- (err, stdout, stderr) => {
- if (err) console.log('err', err);
- console.log(typeof stdout);
- console.log('stdout', stdout);
- console.log('stderr', stderr);
- });*/
 
 const app = require('../server');
-
 const db = app.get('db');
-
+const Q = require('q');
 const exec = require('child_process').exec;
 
-let test = `Test.assertEquals(addTwo(2), 4)`;
 
 module.exports = {
-	testScript: (req, res, next) => {
-		console.log('body');
-		console.log(req.body);
-		console.log('params', req.params);
+	testKata: (req, res, next) => {
+		console.log('hit testCtrl');
 
 		let body = req.body;
 
 
 		db.read.kata_by_id([req.params.kataId], (err, kataArray)=>{
 			if(err) console.log(err);
 			let kata = kataArray[0];
+			let promiseArr = [];
+			
+			
+			
 
-			exec(`docker run --rm codewars/node-runner run -l javascript -c "${body.script}" -t cw -f "${kata.test}"`,
-				(err, stdout, stderr) => {
-					if (err) {
-						console.log('err', err);
-					} else if (stdout) {
-						res.json(stdout);
-					} else if (stderr) {
-						res.json(stderr);
-					}
-					return
-				});
+			kata.test_script.forEach((ele, i) =>{
+				let deffered = Q.defer();
+				
+				exec(`docker run --rm codewars/node-runner run -l javascript -c "${body.script}" -t cw -f "${ele.test}"`,
+					(err, stdOut, stdErr) => {
+						if (err) {
+							console.log(err);
+						} else if (stdOut) {
+							deffered.resolve(stdOut);
+							ele.result = stdOut;
+						} else if (stdErr) {
+							deffered.resolve(stdErr);
+							ele.result = stdErr;
+						}
+					});
+				
+				promiseArr.push(deffered.promise)
+			});
+			
+			
+			Q.all(promiseArr).then((response) => {
+				res.json(kata.test_script);
+			})
 		});
 
 
-		
-	},
-	
-	testKata: (req, res, next) => {
-		
 	},
 
 	testExamplesKata: (req, res, next) => {

db/create/new_user_from_github.sql

@@ -0,0 +1,2 @@
+INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
+VALUES ($1, null, null, $2, $3, $4);

db/read/user_by_github_id.sql

@@ -0,0 +1,2 @@
+select * from users
+where github_id = $1;

db/start/tables.sql

@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS rating, solutions, kata, users;
+DROP TABLE IF EXISTS ratings, rating,  solutions, katas, kata, users;
 
 CREATE TABLE users (
   id serial primary key,
@@ -14,33 +14,33 @@ CREATE TABLE users (
 CREATE TABLE katas (
   id serial primary key,
   kyu integer not null,
-  test_script text not null,
+  test_script json not null,
   description text,
   starter_code text not null,
   name varchar(255),
-  examples text
+  examples json
 );
 
 CREATE TABLE solutions (
   id serial primary key,
   user_id integer references users(id),
-  kata_id integer references kata(id),
+  kata_id integer references katas(id),
   script text not null
 );
 
 CREATE TABLE ratings (
   id serial primary key,
   user_id integer references users(id),
-  kata_id integer references kata(id),
+  kata_id integer references katas(id),
   solution_id integer references solutions(id),
   liked boolean not null
 );
 
-INSERT INTO users (github_id, first_name, last_name, email, username, picture_url)
-VALUES (null, 'bob', 'smith', 'bob@smith.com', 'bobIScool', null);
+INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
+VALUES ('12', 'bob', 'smith', 'bob@smith.com', 'bobIScool', null);
 
-INSERT INTO katas (kyu, test_script, description, starter_code, name, examples)
-VALUES (8, 'Test.assertEquals(a, 1)', 'a should equal 1', 'var a = 1', 'Sumbit This', null);
+INSERT INTO katas (kyu, description, starter_code, name, examples, test_script)
+VALUES (8, 'var a should equal 1', 'var a = 1', 'Sumbit This', '[{"test":"Test.assertEquals(a, 1)","result":""}]', '[{"test":"Test.assertEquals(a, 0)","result":""},{"test":"Test.assertEquals(a, 2)","result":""},{"test":"Test.assertEquals(a, 1)","result":""}]');
 
 INSERT INTO solutions (user_id, kata_id, script)
 VALUES (1, 1, 'var a = 1'),

package.json

@@ -34,6 +34,7 @@
     "gulp-uglify": "^2.0.0",
     "massive": "^2.5.0",
     "passport": "^0.3.2",
-    "passport-github2": "^0.1.10"
+    "passport-github2": "^0.1.10",
+    "q": "^1.4.1"
   }
 }

server.js

@@ -22,10 +22,35 @@ passport.use(new GithubStrategy({
 	clientSecret: config.githubSecret,
 	callbackURL: '/auth/github/callback'
 }, (accessToken, refreshToken, profile, done) => {
-	// code goes here
-	// go to database and look for profile.id
-	// create user using profile.id
-	return done(null/*error*/, profile/*info that goes on session*/);
+	db.read.user_by_github_id([profile.id], (err, user) => {
+		console.log(user);
+		if (err) {
+			console.log(err);
+		} else if (user [0]) {
+			done(null, user);
+		} else {
+			console.log('attempting account creation')
+			db.create.new_user_from_github([profile.id, profile._json.email, profile.displayName, profile._json.avatar_url],
+				(err) => {
+					if (err) {
+						console.log(err);
+					}	else {
+						db.read.user_by_github_id([profile.id], (err, newUser) => {
+							if(err) {
+								console.log(err);
+							} else {
+								console.log(newUser);
+								done(null, newUser[0])
+							}
+						});
+					}
+				})
+		}
+		
+	});
+
+
+//	return done(null, profile);
 }));
 
 
@@ -57,7 +82,7 @@ app.use(passport.session());
 
 
 
-app.get('/auth/github', passport.authenticate('github'));
+app.get('/auth/github', passport.authenticate('github', {scope: ['user:email', 'user']}));
 
 app.get('/auth/github/callback',
 	passport.authenticate('github', {failureRedirect: '/login'}),
@@ -79,8 +104,6 @@ app.post('/test/:kataId', testCtrl.testKata);
 app.post('/test/examples/:kataId', testCtrl.testExamplesKata);
 app.post('/solution/:kataId', kataCtrl.postSolution);
 
-app.put('/test/:kataId', testCtrl.testScript);
-
 
 
 app.listen(config.port, function () {

src/login.html

@@ -12,7 +12,7 @@
         <p class='font16-reg logo-font logo'>clonewars</p><br><br>
       </div>
       <div>
-        <a href='http://www.github.com' style=>
+        <a href='/auth/github' style=>
           <div class='button font12-reg'>
             <div>
               <!--<img src='../src/assets/imgs/ST.png' class='button-icon'>-->