refactored db migrations and seeds

src/server/auth/helpers.js

@@ -4,9 +4,9 @@
 
 
   const knex = require('../db/connection');
-  const userQueries = require('../db/queries.users');
-  const lessonQueries = require('../db/queries.lessons');
-  const usersLessonsQueries = require('../db/queries.users_lessons');
+  const userQueries = require('../db/queries/users');
+  const lessonQueries = require('../db/queries/lessons');
+  const usersLessonsQueries = require('../db/queries/users_lessons');
 
   // TODO: combine ensureAuthenticated() and ensureVerified() by setting up global permission logic config
 

src/server/db/_seed_helpers.js

@@ -0,0 +1,68 @@
+(function() {
+
+  'use strict';
+
+  const knex = require('./connection');
+
+  function dropTables() {
+    return Promise.all([
+      knex('chapters').del(),
+      knex('lessons').del(),
+      knex('users').del(),
+      knex('messages').del(),
+      knex('suggestions').del(),
+      knex('codes').del()
+    ]);
+  }
+
+  function insertUsers() {
+    return knex('users')
+    .insert({
+      github_username: 'Michael',
+      github_id: 987,
+      github_display_name: 'Michael Johnson',
+      github_access_token: '798',
+      github_avatar: 'https://avatars.io/static/default_128.jpg',
+      email: 'michael@johnson.com',
+      verified: false,
+      admin: false
+    });
+  }
+
+  function insertChapters() {
+    return Promise.all([
+      knex('chapters').insert({
+        order_number: 1,
+        name: 'Functions and Loops'
+      }),
+      knex('chapters').insert({
+        order_number: 2,
+        name: 'Conditional logic'
+      }),
+      knex('chapters').insert({
+        order_number: 3,
+        name: 'Lists and Dictionaries'
+      }),
+      knex('chapters').insert({
+        order_number: 4,
+        name: 'Inactive Chapter',
+        active: false
+      })
+    ]);
+  }
+
+  function getChapters() {
+    return knex('chapters')
+    .select('*')
+    .orderBy('order_number')
+    .returning('*');
+  }
+
+  module.exports = {
+    dropTables,
+    insertUsers,
+    insertChapters,
+    getChapters
+  };
+
+}());

src/server/db/queries.chapters.js → src/server/db/queries/chapters.js

@@ -1,4 +1,4 @@
-const knex = require('./connection');
+const knex = require('../connection');
 
 function getChapters(callback) {
   return knex('chapters')

src/server/db/queries.codes.js → src/server/db/queries/codes.js

@@ -1,4 +1,4 @@
-const knex = require('./connection');
+const knex = require('../connection');
 
 function addCode(obj, callback) {
   return knex('codes')

src/server/db/queries.lessons.js → src/server/db/queries/lessons.js

@@ -1,4 +1,4 @@
-const knex = require('./connection');
+const knex = require('../connection');
 
 function getAllLessons(callback) {
   return knex('lessons')

src/server/db/queries.messages.js → src/server/db/queries/messages.js

@@ -1,4 +1,4 @@
-const knex = require('./connection');
+const knex = require('../connection');
 
 function getActiveMessages(callback) {
   return knex('messages')

src/server/db/queries.suggestions.js → src/server/db/queries/suggestions.js

@@ -1,4 +1,4 @@
-var knex = require('./connection');
+var knex = require('../connection');
 
 function getAllSuggestions() {
   return knex('suggestions')

src/server/db/queries.users.js → src/server/db/queries/users.js

@@ -1,4 +1,4 @@
-var knex = require('./connection');
+var knex = require('../connection');
 
 function addUser(obj, callback) {
   return knex('users')

src/server/db/queries.users_lessons.js → src/server/db/queries/users_lessons.js

@@ -1,5 +1,5 @@
-const knex = require('./connection');
-const lessonQueries = require('./queries.lessons');
+const knex = require('../connection');
+const lessonQueries = require('./lessons');
 
 function addRow(obj, callback) {
   return knex('users_lessons')

src/server/db/seeds/01_drop.js

@@ -1,10 +1,10 @@
 exports.seed = (knex, Promise) => {
-  return Promise.all([
-    knex('chapters').del(),
-    knex('lessons').del(),
-    knex('users').del(),
-    knex('messages').del(),
-    knex('suggestions').del(),
-    knex('codes').del()
-  ]);
+  // return Promise.all([
+  //   knex('chapters').del(),
+  //   knex('lessons').del(),
+  //   knex('users').del(),
+  //   knex('messages').del(),
+  //   knex('suggestions').del(),
+  //   knex('codes').del()
+  // ]);
 };

src/server/db/seeds/01_main.js

@@ -0,0 +1,27 @@
+(function() {
+
+  'use strict';
+
+  const helpers = require('../_seed_helpers');
+
+  exports.seed = (knex, Promise) => {
+    return Promise.join(
+      helpers.dropTables()
+    )
+    .then(() => {
+      return Promise.all([
+        helpers.insertUsers(),
+        helpers.insertChapters()
+      ]);
+    })
+    .then(() => {
+      return Promise.join(
+        helpers.getChapters()
+      );
+    })
+    .then((chapters) => {
+      // console.log(chapters);
+    });
+  };
+
+}());

src/server/db/seeds/02_users.js

@@ -1,13 +1,13 @@
 exports.seed = (knex, Promise) => {
-  return knex('users')
-  .insert({
-    github_username: 'Michael',
-    github_id: 987,
-    github_display_name: 'Michael Johnson',
-    github_access_token: '798',
-    github_avatar: 'https://avatars.io/static/default_128.jpg',
-    email: 'michael@johnson.com',
-    verified: false,
-    admin: false
-  });
+  // return knex('users')
+  // .insert({
+  //   github_username: 'Michael',
+  //   github_id: 987,
+  //   github_display_name: 'Michael Johnson',
+  //   github_access_token: '798',
+  //   github_avatar: 'https://avatars.io/static/default_128.jpg',
+  //   email: 'michael@johnson.com',
+  //   verified: false,
+  //   admin: false
+  // });
 };

src/server/db/seeds/03_chapters.js

@@ -1,21 +1,21 @@
 exports.seed = (knex, Promise) => {
-  return Promise.join(
-    knex('chapters').insert({
-      order_number: 1,
-      name: 'Functions and Loops'
-    }),
-    knex('chapters').insert({
-      order_number: 2,
-      name: 'Conditional logic'
-    }),
-    knex('chapters').insert({
-      order_number: 3,
-      name: 'Lists and Dictionaries'
-    }),
-    knex('chapters').insert({
-      order_number: 4,
-      name: 'Inactive Chapter',
-      active: false
-    })
-  );
+  // return Promise.join(
+  //   knex('chapters').insert({
+  //     order_number: 1,
+  //     name: 'Functions and Loops'
+  //   }),
+  //   knex('chapters').insert({
+  //     order_number: 2,
+  //     name: 'Conditional logic'
+  //   }),
+  //   knex('chapters').insert({
+  //     order_number: 3,
+  //     name: 'Lists and Dictionaries'
+  //   }),
+  //   knex('chapters').insert({
+  //     order_number: 4,
+  //     name: 'Inactive Chapter',
+  //     active: false
+  //   })
+  // );
 };

src/server/routes/_helpers.js

@@ -1,8 +1,8 @@
-const chapterQueries = require('../db/queries.chapters');
-const userQueries = require('../db/queries.users');
-const lessonQueries = require('../db/queries.lessons');
-const messageQueries = require('../db/queries.messages');
-const usersLessonsQueries = require('../db/queries.users_lessons');
+const chapterQueries = require('../db/queries/chapters');
+const userQueries = require('../db/queries/users');
+const lessonQueries = require('../db/queries/lessons');
+const messageQueries = require('../db/queries/messages');
+const usersLessonsQueries = require('../db/queries/users_lessons');
 
 function getTotalActiveLessons(chapters) {
   var total = chapters.reduce(function(acc, chapter) {

src/server/routes/admin/admin.auth.js

@@ -1,42 +1,48 @@
-const express = require('express');
-const router = express.Router();
-
-const authHelpers = require('../../auth/helpers');
-const userQueries = require('../../db/queries.users');
-
-// *** get verification status *** //
-router.get(
-  '/verification',
-  authHelpers.ensureAdmin,
-  getVerificationStatus
-);
-
-// *** toggle verification status *** //
-router.get(
-  '/verification/toggle',
-  authHelpers.ensureAdmin,
-  toggleVerificationStatus
-);
-
-function getVerificationStatus(req, res, next) {
-  let status = false;
-  // check status
-  if (parseInt(process.env.CAN_VERIFY) === 1) status = true;
-  return res.status(200).json({
-    status: 'success',
-    verified: status
-  });
-}
-
-function toggleVerificationStatus(req, res, next) {
-  process.env.CAN_VERIFY = 1;
-  // check status
-  if (parseInt(process.env.CAN_VERIFY) === 1) process.env.CAN_VERIFY = 0;
-  req.flash('messages', {
-    status: 'success',
-    value: 'Verification status toggled.'
-  });
-  return res.redirect('/');
-}
-
-module.exports = router;
+(function() {
+
+  'use strict';
+
+  const express = require('express');
+  const router = express.Router();
+
+  const authHelpers = require('../../auth/helpers');
+  const userQueries = require('../../db/queries/users');
+
+  // *** get verification status *** //
+  router.get(
+    '/verification',
+    authHelpers.ensureAdmin,
+    getVerificationStatus
+  );
+
+  // *** toggle verification status *** //
+  router.get(
+    '/verification/toggle',
+    authHelpers.ensureAdmin,
+    toggleVerificationStatus
+  );
+
+  function getVerificationStatus(req, res, next) {
+    let status = false;
+    // check status
+    if (parseInt(process.env.CAN_VERIFY) === 1) status = true;
+    return res.status(200).json({
+      status: 'success',
+      verified: status
+    });
+  }
+
+  function toggleVerificationStatus(req, res, next) {
+    process.env.CAN_VERIFY = 1;
+    // check status
+    if (parseInt(process.env.CAN_VERIFY) === 1) process.env.CAN_VERIFY = 0;
+    req.flash('messages', {
+      status: 'success',
+      value: 'Verification status toggled.'
+    });
+    return res.redirect('/');
+  }
+
+  module.exports = router;
+
+}());

src/server/routes/admin/admin.chapters.js

@@ -2,8 +2,8 @@ const express = require('express');
 const router = express.Router();
 
 const authHelpers = require('../../auth/helpers');
-const chapterQueries = require('../../db/queries.chapters');
-const lessonQueries = require('../../db/queries.lessons');
+const chapterQueries = require('../../db/queries/chapters');
+const lessonQueries = require('../../db/queries/lessons');
 
 // *** get all chapters *** //
 router.get(

src/server/routes/admin/admin.lessons.js

@@ -2,10 +2,10 @@ const express = require('express');
 const router = express.Router();
 
 const authHelpers = require('../../auth/helpers');
-const lessonQueries = require('../../db/queries.lessons');
-const chapterQueries = require('../../db/queries.chapters');
-const userQueries = require('../../db/queries.users');
-const lessonsUsersQueries = require('../../db/queries.users_lessons');
+const lessonQueries = require('../../db/queries/lessons');
+const chapterQueries = require('../../db/queries/chapters');
+const userQueries = require('../../db/queries/users');
+const lessonsUsersQueries = require('../../db/queries/users_lessons');
 const routeHelpers = require('../_helpers');
 
 // *** get all lessons *** //

src/server/routes/admin/admin.messages.js

@@ -2,7 +2,7 @@ var express = require('express');
 var router = express.Router();
 
 var authHelpers = require('../../auth/helpers');
-var messageQueries = require('../../db/queries.messages');
+var messageQueries = require('../../db/queries/messages');
 
 // *** update message *** //
 router.get('/:messageID/update', authHelpers.ensureAdmin,

src/server/routes/admin/admin.users.js

@@ -3,9 +3,9 @@ const router = express.Router();
 
 const authHelpers = require('../../auth/helpers');
 const routeHelpers = require('../_helpers');
-const userQueries = require('../../db/queries.users');
-const lessonQueries = require('../../db/queries.lessons');
-const lessonsUsersQueries = require('../../db/queries.users_lessons');
+const userQueries = require('../../db/queries/users');
+const lessonQueries = require('../../db/queries/lessons');
+const lessonsUsersQueries = require('../../db/queries/users_lessons');
 
 // *** get all users *** //
 router.get(