Skip to content

Feature/server db api #13

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.

Sign up for GitHub

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

Merged
danielkang674 merged 4 commits into from
Oct 13, 2018
Merged

Feature/server db api #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
060ca32
Implemented getTopGenres on db and db server
WalkerJG33 Oct 13, 2018
c81a710
Implemented Medium to Genre
WalkerJG33 Oct 13, 2018
5ef1943
Updated to dev
WalkerJG33 Oct 13, 2018
f0e401f
Staging final changes
WalkerJG33 Oct 13, 2018
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
41 changes: 19 additions & 22 deletions database/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ const addMedium = (mediumObj, id_token) => {
};

const addGenre = (genre_id) => {
console.log('----------------------------------\naddGenre\n----------------------------------', genreList);
// genreList.forEach(genre => {
// Genre.upsert({genre_id: genre})
// })
Expand All @@ -108,7 +107,7 @@ const addGenreToUser = async(genreList, id_token) => {
genreList.forEach((genre_id, index) => {
return Genre.upsert({ genre_id })
.then(genreResults => {
if (genreResults === false) {
if (!genreResults) {
findOneGenreByID(genre_id)
.then(results => {
const genreId = results.dataValues.id;
Expand All @@ -133,20 +132,21 @@ const addGenreToUser = async(genreList, id_token) => {
})
})
};
const addGenreToMedium = (genreList, id) => {
genreList.forEach(genre=> {
return Genre.create(genre)


const addGenreToMedium = async(genreList, id) => {
const medium = await findOneMediumByID(id);
const mediumId = medium.dataValues.id;
genreList.forEach(genre_id => {
Genre.upsert({ genre_id })
.then(results => {
findOneGenreByID(genre_id)
.then(genre => {
return findOneMediumByID(id)
.then(medium => {
if (!medium) {
return false
} else {
console.log('MEDIUM IS:',medium)
return medium.addGenre(genre);
}
})
const genreId = genre.dataValues.id;
return Medium_Genre.upsert({genreId, mediumId})
})
})
.catch(console.log);
})
};

Expand All @@ -160,8 +160,8 @@ const findOneUserByToken = (id_token) => {
return testOneUser;
};

const findOneMediumByID = (id) => {
const testOneMedium = Medium.findOne({ where: { id } });
const findOneMediumByID = (moviedb_id) => {
const testOneMedium = Medium.findOne({ where: { moviedb_id } });
return testOneMedium;
};

Expand Down Expand Up @@ -203,13 +203,10 @@ const getTopThreeGenres = async (id_token) => {
// console.log('test find one user and genre =================>', data)
// data.increment('genre_score', {by: 1})
// })
// addGenreToMedium([28, 53, 878], 27205);

module.exports = { addUser, addMedium, findOneUserByToken, getLastThreeMedia, addGenre, findOneMediumByID, addGenreToMedium, addGenreToUser, findOneGenreByID, findOneUserAndGenreRelation, getTopThreeGenres };

module.exports = { addUser, addMedium, findOneUserByToken, getLastThreeMedia, addGenre, findOneMediumByID, addGenreToMedium, addGenreToUser, findOneGenreByID, findOneUserAndGenreRelation };
module.exports.getTopThreeGenres = async (id_token) => {
const user = await findOneUserByToken(id_token);
const userId = user.dataValues.id;
return User_Genre.findAll({ where: { userId }, limit: 3, order: [['genre_score', 'DESC']]})
};

// User.sync({ force: true })
// .then(() => {
Expand Down