use knex instead of Sequelize

1 files changed, 101 insertions, 43 deletions

diff --git a/routes/referrals.js b/routes/referrals.js
index 7d144ac1..620b60f0 100644
--- a/routes/referrals.js
+++ b/routes/referrals.js
@@ -1,4 +1,5 @@
 var express = require('express');
+// const { default: knex } = require('knex');
 var router = express.Router();
 var debug = require('debug')('debug')
 
@@ -49,11 +50,19 @@ router.post(
     var token = uuidv4()
     debug('generated token: ' + token + ' sponsored by ' + sponsor_id)
 
-    var ref = await db.Referral.create({
-      sponsor_id: sponsor_id, 
-      token: token, 
-      status: 'available'
-    })
+    // var ref = await db.Referral.create({
+    //   sponsor_id: sponsor_id, 
+    //   token: token, 
+    //   status: 'available'
+    // })
+
+    var ref = await knex.table('referrals')
+      .insert({
+          sponsor_id: sponsor_id, 
+          token: token, 
+          status: 'available'
+        }
+      )
 
     debug('generated referral: ' + JSON.stringify(ref))
     return res.send({token: token, status: 'available', expiry: expiry})
@@ -89,13 +98,30 @@ router.get(
     const {sponsor_id, expiry} = req.query
     debug('grant token..')
     var token = uuidv4()
-    debug('generated token: ' + token + ' sponsored by ' + sponsor_id)
+    debug('Generated token: ' + token + ' sponsored by ' + sponsor_id)
+
+    var users = await knex
+      .select('username')
+      .from('users')
+
+    debug('got: ' + JSON.stringify(users))
 
-    var ref = await db.Referral.create({
-      sponsor_id: sponsor_id, 
-      token: token, 
-      status: 'available'
-    })
+    debug('KNEX: ' + typeof(knex))
+    console.log(knex.constructor)
+
+    var ref = await knex.table('referrals')
+      .insert({
+          sponsor_id: sponsor_id, 
+          token: token, 
+          status: 'available'
+        }
+      )
+
+    // var ref = await db.Referral.create({
+    //   sponsor_id: sponsor_id, 
+    //   token: token, 
+    //   status: 'available'
+    // })
 
     debug('generated referral: ' + JSON.stringify(ref))
     return res.send({token: token, status: 'available', expiry: expiry})
@@ -185,29 +211,43 @@ router.get(
     const { user_id, token } = req.params;
 
     debug('verify token: ' + token)
-      
-    const found = await db.Referral.findAll({
-      attributes: ['status'],
-      where: {
-        token: token,
-        user_id: null
-      }
-    })
+    
+    const found = await knex
+      .select('status')
+      .from('referrals')
+      .where('token', 'like', token)
+      .whereNull('user_id')
+
+    // const found = await db.Referral.findAll({
+    //   attributes: ['status'],
+    //   where: {
+    //     token: token,
+    //     user_id: null
+    //   }
+    // })
 
     if (found && found.length) {
       debug('found referral: ' + JSON.stringify(found))
       if (found[0].status === 'available') {
 
-        await db.Referral.update(
-          { 
-            status: 'used',
-            user_id: user_id,
-            updated_at: new Date().toISOString().substring(0,10)
-          },
-          {
-            where: { token: token }
-          }
-        )
+        await knex('referrals')
+        .where('token', 'like', token)
+        .update({ 
+          status: 'used',
+          user_id: user_id,
+          updated_at: new Date().toISOString().substring(0,10)
+        })
+
+        // await db.Referral.update(
+        //   { 
+        //     status: 'used',
+        //     user_id: user_id,
+        //     updated_at: new Date().toISOString().substring(0,10)
+        //   },
+        //   {
+        //     where: { token: token }
+        //   }
+        // )
 
         return res.send({ verified: true, sponsor_id: found.sponsor_id, updated: found.updated_at});
       } else {
@@ -247,10 +287,16 @@ router.post(
     debug('email: ' + email)
     debug('phone: ' + phone)
     console.log(email + ' BODY: ' + JSON.stringify(req.body))
-    await db.WaitingList.create({
-      email: email,
-      phone: phone    
-    })
+    
+    await knex.table('waiting_list')
+      .insert({
+        email: email,
+        phone: phone
+      })
+      // await db.WaitingList.create({
+      //   email: email,
+      //   phone: phone    
+      // })
 
     res.send({success: true, message: 'Added ' + email + ' to waiting list ' + phone})
   })
@@ -264,10 +310,17 @@ router.get(
     debug('email: ' + email)
     debug('phone: ' + phone)
     console.log(email + ' BODY: ' + JSON.stringify(req.body))
-    await db.WaitingList.create({
-      email: email,
-      phone: phone    
-    })
+
+    await knex('waiting_list')
+      .insert({
+        email: email,
+        phone: phone
+      })
+
+    // await db.WaitingList.create({
+    //   email: email,
+    //   phone: phone    
+    // })
 
     res.send({success: true, message: 'Added ' + email + ' to waiting list ' + phone})
   })
@@ -293,12 +346,17 @@ router.get(
   ah(async (req, res) => {
     const { user_id } = req.params;
 
-    var referred = await db.Referral.findOne({
-      where: {
-        user_id: user_id,
-        status: 'used'
-      }
-    })
+    var referred = await knex('referrals')
+      .select('referrals.id')
+      .where('user_id', 'like', user_id)
+      .where('status', 'like', 'used')
+
+    // var referred = await db.Referral.findOne({
+    //   where: {
+    //     user_id: user_id,
+    //     status: 'used'
+    //   }
+    // })
     
     if (referred) {
       res.send(true)