Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Daniel - tweedr #112

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions controllers/pokemon.js

This file was deleted.

155 changes: 155 additions & 0 deletions controllers/tweedr_controllers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
const sha256 = require('js-sha256');

module.exports = (db) => {

/**
* ===========================================
* Controller logic
* ===========================================
*/


//////////////////////////
//GET request callbacks///
//////////////////////////

const indexGetController = (req, res) => {
const name = req.cookies['username'];

//show all tweets
db.tweedrModels.getAll(name, (err, tweedResult, hashtagResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else {
const data = {'tweeds': tweedResult, 'hashtags': hashtagResult}
res.render('index', data);
}
})
}

// register page
const registerGetController = (req, res) => {
if (req.cookies['login_status'] === sha256('yes_true')){
return res.redirect('/');
}
res.render('register');
}

// login page
const loginGetController = (req, res) => {
if (req.cookies['login_status'] === sha256('yes_true')){
return res.redirect('/');
}
res.render('login');
}

//////////////////////////
//POST request callbacks//
//////////////////////////

const registerPostController = (req, res) => {

const name = req.body.name;
const password = sha256(req.body.password);

db.tweedrModels.register(name, password, (err, tweedResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else {
if (queryResult) {
res.cookie('username', name);
res.cookie('login_status', sha256('yes_true'));
res.redirect('/')
} else {
res.send('user already in database');
}
}
})
}

const loginPostController = (req, res) => {
const name = req.body.name;
const password = sha256(req.body.password);
db.tweedrModels.login(name, password, (err, queryResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else {
if (queryResult) {
res.cookie('username', name);
res.cookie('login_status', sha256('yes_true'));
res.redirect('/');
} else {
res.send('wrong user or password');
}
}
})
}

const createPostController = (req, res) => {
const name = req.cookies['username'];
const tweed_content = req.body.content;
const hashtag_lst = req.body.hashtag;

db.tweedrModels.createTweed(name, tweed_content, hashtag_lst, (err, queryResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else {
res.redirect('/')
}
})
}

const hashtagPostController = (req, res) => {
const name = req.cookies['username'];
const hashtag = req.body.hashtag;

db.tweedrModels.createHashtag(hashtag, (err, queryResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else {
res.redirect('/')
}
})
}

const favoritePostController = (req, res) => {
const tweedContent = req.body.tweed;

db.tweedrModels.insertFav(tweedContent, (err, queryResult) => {
if (err) {
console.error('query error:', err.stack);
res.send('query error');
} else if (queryResult){
console.log(queryResult)
res.send('TWEED IS ADDED TO FAVORITES!!!')
}
})

}

/**
* ===========================================
* Export controller functions as a module
* ===========================================
*/
return {
//GET request callbacks
indexGet: indexGetController,
registerGet: registerGetController,
loginGet: loginGetController,

//POST request callbacks
registerPost: registerPostController,
loginPost: loginPostController,
createPost: createPostController,
hashtagPost: hashtagPostController,
favoritePost: favoritePostController

};

}
11 changes: 6 additions & 5 deletions db.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
const pg = require('pg');
const url = require('url');


var configs;

if( process.env.DATABASE_URL ){
Expand All @@ -33,9 +34,9 @@ if( process.env.DATABASE_URL ){

}else{
configs = {
user: 'akira',
user: 'Mac',
host: '127.0.0.1',
database: 'testdb',
database: 'tweedr',
port: 5432
};
}
Expand All @@ -62,9 +63,9 @@ pool.on('error', function (err) {
*/


const allPokemonModelsFunction = require('./models/pokemon');
const allTweedrModelsFunction = require('./models/tweedr_models');

const pokemonModelsObject = allPokemonModelsFunction( pool );
const tweedrModelsObject = allTweedrModelsFunction( pool );



Expand Down Expand Up @@ -95,5 +96,5 @@ module.exports = {
*/

// users: userModelsObject,
pokemon: pokemonModelsObject
tweedrModels: tweedrModelsObject
};
38 changes: 0 additions & 38 deletions models/pokemon.js

This file was deleted.

139 changes: 139 additions & 0 deletions models/tweedr_models.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
/**
* ===========================================
* Export model functions as a module
* ===========================================
*/
module.exports = (dbPoolInstance) => {
// `dbPoolInstance` is accessible within this function scope

// model functions to do SQL queries
const registerModel = (name, password, callbackFunc) => {
const query = 'INSERT INTO users (name, password)' +
'SELECT $1, $2 WHERE NOT EXISTS (SELECT 1 FROM users WHERE name=$1) ' +
'RETURNING *;';
const values = [name, password];

dbPoolInstance.query(query, values, (err, result) => {
if (err) {
callbackFunc(err, null);
} else {
if (result.rows.length > 0){
callbackFunc(null, result.rows);
} else {
callbackFunc(null, null);
}
}

})
}

const loginModel = (name, password, callbackFunc) => {
const query = 'SELECT 1 FROM users WHERE name=$1 AND password=$2;';
const values = [name, password];

dbPoolInstance.query(query, values, (err, result) => {
if (err) {
callbackFunc(err, null);
} else {
if (result.rows.length > 0){
callbackFunc(null, result.rows);
} else {
callbackFunc(null, null);
}
}
})
}

const getAllModel = (name, callbackFunc) => {
const first_query = 'SELECT content FROM tweeds INNER JOIN users ' +
'ON tweeds.user_id = users.id WHERE users.name = $1;'
const first_values = [name];

dbPoolInstance.query(first_query, first_values, (err, first_result) => {
if (err) {
callbackFunc(err, null, null);
} else {
if (first_result.rows.length > 0){
const second_query = 'SELECT * FROM hashtags;'

dbPoolInstance.query(second_query, (err, second_result) => {
if (err) {
callbackFunc(err, first_result, null);
} else if (second_result.rows.length > 0){
callbackFunc(null, first_result.rows, second_result.rows)
} else {
callbackFunc(null, null, null)
}
})
}
}
})
}

const createTweedModel = (name, content, hashtag_lst, callbackFunc) => {
const query = 'INSERT INTO tweeds (content, user_id, hashtag_id) ' +
'SELECT $2, users.id FROM users WHERE users.name =$1 RETURNING content;'
let hashtags_added = 0;

hashtag_lst.forEach(hashtag => {
const values = [name, content, hashtag];
dbPoolInstance.query(query, values, (err, result) => {
hashtags_added += 1;
if (err) {
callbackFunc(err, null);
} else {
if (hashtags_added === hashtag_lst.length && result.rows.length > 0 ){
callbackFunc(null, result.rows);
} else {
callbackFunc(null, null);
}
}
})
})
}

const createHashtagModel = (hashtag, callbackFunc) => {
const query = 'INSERT INTO hashtags (hashtag) VALUES ($1);'
const values = [hashtag];

dbPoolInstance.query(query, values, (err, result) => {
if (err) {
callbackFunc(err, null);
} else {
if (result.rows.length > 0){
callbackFunc(null, result.rows);
} else {
callbackFunc(null, null);
}
}
})
}

const insertFavModel = (tweedContent, callbackFunc) => {
const query = 'INSERT INTO favorites (user_id, tweed_id) SELECT user_id, tweeds.id FROM users '+
'INNER JOIN tweeds ON (users.id = tweeds.user_id) WHERE tweeds.content = $1 RETURNING *;'
const values = [tweedContent];

dbPoolInstance.query(query, values, (err, result) => {
if (err) {
callbackFunc(err, null);
} else {
if (result.rows.length > 0){
callbackFunc(null, result.rows);
} else {
callbackFunc(null, null);
}
}
})
}

return {
register: registerModel,
login: loginModel,
createTweed: createTweedModel,
getAll: getAllModel,
createHashtag: createHashtagModel,
insertFav: insertFavModel

};
};
Loading