'half way through DB setup'

Author: Joshua Baert

controllers/testCtrl.js

@@ -8,7 +8,7 @@
 const exec = require('child_process').exec;
 
 let script = `let addTwo = (x) => {return x+2};`;
-let test = `Test.assertEquals(addTwo(2), 4)`;
+let test = `Test.assertEquals(addTwo(2), 4);`;
 
 
 // This is where wer run a script.. I have verified that so long as we get it in string format we run unit tests

db/start/tables.sql

@@ -0,0 +1,48 @@
+DROP TABLE IF EXISTS rating, solutions, kata, users;
+
+CREATE TABLE users (
+  id serial primary key,
+  github_id varchar(255),
+  first_name varchar(40),
+  last_name varchar(40),
+  email varchar(255),
+  username varchar (40)
+
+);
+
+CREATE TABLE kata (
+  id serial primary key,
+  kyu integer not null,
+  test text not null,
+  description text,
+  starter_code text not null,
+  name varchar(255)
+);
+
+CREATE TABLE solutions (
+  id serial primary key,
+  user_id integer references users(id),
+  kata_id integer references kata(id),
+  script text not null
+);
+
+CREATE TABLE rating (
+  id serial primary key,
+  user_id integer references users(id),
+  kata_id integer references kata(id),
+  solution_id integer references solutions(id),
+  liked boolean not null
+);
+
+INSERT INTO users (github_id, first_name, last_name, email, username)
+VALUES (null, 'bob', 'smith', 'bob@smith.com', 'bobIScool');
+
+INSERT INTO kata (kyu, test, description, starter_code, name)
+VALUES (8, 'Test.assertEquals(a, 1)', 'a should equal 1', 'var a = 1', 'Sumbit This');
+
+INSERT INTO solutions (user_id, kata_id, script)
+VALUES (1, 1, 'var a = 1'),
+(1,2, 'let a = 1');
+
+INSERT INTO rating (user_id, kata_id, solution_id, liked)
+VALUES (1, null, 1, true);

restartDb.js

@@ -0,0 +1,21 @@
+/**
+ * Created by Joshua Baert on 12/16/2016.
+ */
+
+const massive = require('massive');
+
+const config =  require('./config');
+	
+let db = massive.connect({
+	connectionString: config.connectionString
+}, (err, db) => {
+	db.start.tables([], function (err, dbRes) {
+		if (err) {
+			console.log(err)
+		} else {
+			console.log('Reset the database.');
+			process.exit();
+		}
+	})
+	
+});

server.js

@@ -1,29 +1,29 @@
-var express = require('express');
-var bodyParser = require('body-parser');
-var session = require('express-session');
-var cors = require('cors');
-var config = require('./config.js');
-var massive = require('massive');
-var connectionString = config.connectionString;
+const express = require('express');
+const bodyParser = require('body-parser');
+const session = require('express-session');
+const cors = require('cors');
+const config = require('./config.js');
+const massive = require('massive');
+const connectionString = config.connectionString;
 
-var app = module.exports = express();
+const app = module.exports = express();
 
-var massiveInstance = massive.connectSync({connectionString : connectionString});
+const massiveInstance = massive.connectSync({connectionString : connectionString});
 
-app.use(express.static(__dirname + '/public'));
+app.use(express.static(__dirname + '/dist'));
 app.use(bodyParser.json());
 app.use(cors());
 
 app.set('db', massiveInstance);
 
-var db = app.get('db');
+let db = app.get('db');
 
 app.use(session({
   secret: config.sessionSecret,
   saveUninitialized: false,
   resave: false
 }));
 
-app.listen(config.port, function() {
+app.listen(config.port, () => {
   console.log('listening to port', config.port);
 });