Fix migrations and docker compose & add tables plain sql as documentation

Author: matboehm

Dockerfile

@@ -15,8 +15,5 @@ RUN npm install --global nodemon db-migrate db-migrate-mysql
 # Install dependencies from package.json
 RUN npm install --quiet --no-warnings
 
-# Run database migrations
-#RUN db-migrate up
-
 # Expose port from container so host can access 1337
 EXPOSE 1337

core/db.js

@@ -40,7 +40,7 @@ exports.isValidApiKey = function(secret, callback){
     pool.getConnection(function(err, connection) {
         if(err) { console.log(err); callback(true); return; }
 
-        let sql  = "SELECT valid from apikeys WHERE secret = '?';";
+        let sql  = "SELECT * from apikeys WHERE secret = ?;";
 
         // make the query
         connection.query(sql, [secret], function(err, results) {
@@ -74,7 +74,7 @@ exports.getUserByHash = function(hash, callback){
     pool.getConnection(function(err, connection) {
         if (err) { console.log(err); callback(true); return; }
 
-        let sql  = "SELECT email, firstname from entries WHERE confirm_key = '?';";
+        let sql  = "SELECT email, firstname from entries WHERE confirm_key = ?;";
 
         // make the query
         connection.query(sql, [hash], function(err, results) {
@@ -121,7 +121,7 @@ exports.saveEntry = function(fields, callback){
         if(err) { console.log(err); callback(true); return; }
         let data = prepareEntry(fields);
 
-        let sqlEmailExists  = "SELECT count(*) as cnt FROM entries WHERE email = '?';";
+        let sqlEmailExists  = "SELECT count(*) as cnt FROM entries WHERE email = ?;";
         connection.query(sqlEmailExists, [data.email], function(err, results) {
             if(!err) {
                 if(results[0]['cnt'] > 0){
@@ -130,7 +130,7 @@ exports.saveEntry = function(fields, callback){
                 }else{
                     let sql  = "INSERT INTO entries (firstname, lastname, email, country, message, anon, ipv4, image, "
                         + "created_at, updated_at, confirm_key, beta, newsletter, pax) "
-                        + "VALUES ('?', '?', '?', '?', '?', ?, '?', '?', ?, ?, '?', ?, ?, ?);";
+                        + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
 
                     // run the query
                     connection.query(
@@ -153,6 +153,7 @@ exports.saveEntry = function(fields, callback){
                         ],
                         function(err, results) {
                             connection.release();
+                            console.log('this.sql', this.sql); //command/query
                             if(err) { callback(true); return; }
                             callback(false, results);
                         }

docker-compose.yml

@@ -25,5 +25,5 @@ services:
       - MYSQL_PASS=123456
     depends_on:
       - db
-    command: bash -c "db-migrate up && npm run start"
+    command: bash -c "sleep 5 && db-migrate up && npm run start"
     #entrypoint: /docker-entrypoint.sh

documentation/tables.sql

@@ -0,0 +1,26 @@
+CREATE TABLE IF NOT EXISTS `apikeys` (
+  `secret` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `valid` int(1) DEFAULT NULL,
+  UNIQUE KEY `secret` (`secret`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `entries` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `firstname` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `lastname` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `email` varchar(320) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `country` char(2) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `message` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `anon` int(1) DEFAULT '0',
+  `ipv4` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `image` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `updated_at` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `confirm_key` varchar(75) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `beta` int(1) DEFAULT '0',
+  `newsletter` int(1) DEFAULT '0',
+  `pax` int(1) DEFAULT '0',
+  `email_confirmed` int(1) DEFAULT '0',
+  `status` int(1) DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

migrations/20190206134449-entries.js

@@ -55,7 +55,7 @@ exports.up = function(db, callback) {
     },
     ipv4: {
       type: 'string',
-      length: 15,
+      length: 40,
       defaultValue : null,
     },
     image: {
@@ -64,30 +64,43 @@ exports.up = function(db, callback) {
       defaultValue : null,
     },
     created_at: {
-      type: 'int',
-      length: 11,
+      type: 'string',
+      length: 15,
       defaultValue : null,
     },
     updated_at: {
-      type: 'int',
-      length: 11,
+      type: 'string',
+      length: 15,
       defaultValue : null,
     },
     confirm_key: {
       type: 'string',
-      length: 60,
+      length: 75,
       defaultValue : null,
     },
     beta: {
       type: 'int',
+      length: 1,
       defaultValue : 0,
     },
     newsletter: {
       type: 'int',
+      length: 1,
       defaultValue : 0,
     },
     pax: {
       type: 'int',
+      length: 1,
+      defaultValue : 0,
+    },
+    email_confirmed: {
+      type: 'int',
+      length: 1,
+      defaultValue : 0,
+    },
+    status: {
+      type: 'int',
+      length: 1,
       defaultValue : 0,
     },
   }, function(err) {

migrations/20190206140226-apikeys.js

@@ -16,23 +16,6 @@ exports.setup = function(options, seedLink) {
 
 exports.up = function(db, callback) {
   db.createTable('apikeys', {
-    entry_id: {
-      type: 'int',
-      unsigned: true,
-      length: 11,
-      notNull: true,
-      foreignKey: {
-        name: 'fk_entry_id',
-        table: 'entries',
-        rules: {
-          onDelete: 'RESTRICT',
-          onUpdate: 'RESTRICT'
-        },
-        mapping: {
-          entry_id: 'id'
-        }
-      }
-    },
     secret: {
       type: 'string',
       length: 100,