Skip to content

Ryan oberly #328

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

Open
wants to merge 2 commits into
base: main
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
66 changes: 66 additions & 0 deletions api/recipes_model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
const db = require('../data/db-config')

async function getRecipeById(recipe_id) {
const recipe = await db('recipes as r')
.leftJoin('steps as s', 'r.recipe_id', 's.recipe_id')
.leftJoin('ingredient_quantities as iq', 'iq.step_id','s.step_id')
.leftJoin('ingredients as i', 'i.ingredient_id', 'iq.ingredient_id')
.select(
'r.recipe_id',
'r.recipe_name',
'r.created_at',
's.step_id',
's.step_number',
's.step_instructions',
'i.ingredient_id',
'i.ingredient_name',
'iq.quantity'
)
.orderBy('s.step_number')
.where('r.recipe_id', recipe_id)


const recipeObj = {
recipe_id: recipe[0].recipe_id,
recipe_name: recipe[0].recipe_name,
created_at: recipe[0].created_at,
steps: recipe.reduce((acc, row) => {
if (!row.ingredient_id) {
return acc.concat({
step_id: row.step_id,
step_number: row.step_number,
step_instructions: row.step_instructions,
})
}
if (row.ingredient_id && !acc.find(step => step.step_id === row.step_id)) {
return acc.concat({
step_id: row.step_id,
step_number: row.step_number,
step_instructions: row.step_instructions,
ingredients: [
{
ingredient_id: row.ingredient_id,
ingredient_name: row.ingredient_name,
quantity: row.quantity
}
]
})
}

const currentStep = acc.find(step => step.step_id === row.step_id)
currentStep.ingredients.push({
ingredient_id: row.ingredient_id,
ingredient_name: row.ingredient_name,
quantity: row.quantity
})
return acc
}, [])
}
// console.log(recipeObj)
return recipeObj;

}

module.exports = {
getRecipeById,
}
15 changes: 15 additions & 0 deletions api/recipes_router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const express = require('express')
const Recipe = require('./recipes_model')

const router = express.Router();

router.get('/recipes/:id', async (req, res, next) => {
const { id } = req.params

Recipe.getRecipeById(id)
.then(recipe => {
res.status(200).json(recipe)
})
})

module.exports = router
18 changes: 18 additions & 0 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const express = require('express');
const helmet = require('helmet');
const router = require('./recipes_router');

const server = express();

server.use(helmet());
server.use(express.json());
server.use('/api', router);

server.use((err, req, res, next) => { // eslint-disable-line
res.status(500).json({
message: err.message,
stack: err.stack,
});
});

module.exports = server;
5 changes: 5 additions & 0 deletions data/db-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const knex = require('knex')

const config = require('../knexfile')

module.exports = knex(config.development)
61 changes: 61 additions & 0 deletions data/migrations/20230919012330_first-migration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = async function(knex) {
await knex.schema
.createTable('recipes', table => {
table.increments('recipe_id')
table.string('recipe_name').notNullable()
table.timestamp('created_at').defaultTo(knex.fn.now());
})
.createTable('ingredients', table => {
table.increments('ingredient_id')
table.string('ingredient_name').notNullable()
table.string('units')
})
.createTable('steps', table => {
table.increments('step_id')
table.integer('step_number')
table.string('step_instructions')
table.integer('recipe_id')
.unsigned()
.notNullable()
.references('recipe_id')
.inTable('recipes')
.onDelete('RESTRICT')
.onUpdate('RESTRICT')
})

.createTable('ingredient_quantities', table => {
table.increments('iq_id')
table.string('quantity')
table.float('step_id')
.unsigned()
.notNullable()
.references('step_id')
.inTable('steps')
.onDelete('RESTRICT')
.onUpdate('RESTRICT')
table.integer('ingredient_id')
.unsigned()
.notNullable()
.references('ingredient_id')
.inTable('ingredients')
.onDelete('RESTRICT')
.onUpdate('RESTRICT')

})
};

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = async function(knex) {
await knex.schema
.dropTableIfExists('ingredient_quantities')
.dropTableIfExists('ingredients')
.dropTableIfExists('steps')
.dropTableIfExists('recipes')
};
Binary file added data/recipes.db3
Binary file not shown.
8 changes: 8 additions & 0 deletions data/seeds/00-cleanup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const cleaner = require('knex-cleaner');

exports.seed = function(knex) {
return cleaner.clean(knex, {
mode: 'truncate', // resets ids
ignoreTables: ['knex_migrations', 'knex_migrations_lock'], // don't empty migration tables
});
};
5 changes: 5 additions & 0 deletions data/seeds/01-recipes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
exports.seed = function(knex, Promise) {
return knex('recipes').insert([
{recipe_name: "Bananas Foster"}
]);
};
6 changes: 6 additions & 0 deletions data/seeds/02-ingredients.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
exports.seed = function(knex, Promise) {
return knex('ingredients').insert([
{ ingredient_name: "bananas" },
{ ingredient_name: "banana sauce"}
]);
};
6 changes: 6 additions & 0 deletions data/seeds/03-steps.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
exports.seed = function(knex, Promise) {
return knex('steps').insert([
{ step_number: 1, step_instructions: "gather ingredients", recipe_id: 1 },
{ step_number: 2, step_instructions: "combine ingredients", recipe_id: 1}
]);
};
7 changes: 7 additions & 0 deletions data/seeds/04-ingredient_quantities.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
exports.seed = function(knex, Promise) {
return knex('ingredient_quantities').insert([
{quantity: 0.4, step_id: 1, ingredient_id: 1},
{quantity: 9, step_id: 2, ingredient_id: 2},
{quantity: 5, step_id: 1, ingredient_id: 2}
]);
};
8 changes: 8 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const server = require('./api/server')
require('dotenv').config();

const PORT = process.env.PORT

server.listen(PORT, () => {
console.log(`Listening on port ${PORT}`);
})
15 changes: 15 additions & 0 deletions knexfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
development: {
client: 'sqlite3',
useNullAsDefault: true, // needed for sqlite
connection: {
filename: './data/recipes.db3',
},
migrations: {
directory: './data/migrations'
},
seeds: {
directory: './data/seeds'
},
},
};
Loading