Skip to content

Ricardo medina #335

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 5 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,5 @@ dist
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

.vscode
63 changes: 63 additions & 0 deletions api/recipes/recipes-model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
const db= require('../../data/db.config')

async function getRecipeById(recipe_id){
const recipeRows= await db('recipes as r')
.leftJoin('steps as s','r.recipe_id', 's.recipe_id')
.leftJoin('step_ingredients as si', 'si.step_id', 's.step_id')
.leftJoin('ingredients as i', 'i.ingredient_id', 'si.ingredient_id')
.select(
'r.recipe_id',
'r.recipe_name',
's.step_id',
's.step_number',
's.step_text',
'i.ingredient_id',
'i.ingredient_name'
)
.orderBy('s.step_number')
.where('r.recipe_id', recipe_id)

const recipes ={
recipe_id: recipeRows[0].recipe_id,
recipe_name: recipeRows[0].recipe_name,
steps: recipeRows.reduce((acc, row)=>{
//its a new step without any ingredients
if(!row.ingredient_id){
return acc.concat({
step_id: row.step_id,
step_number: row.step_number,
step_text: row.step_text
})
}
if(row.ingredient_id && !acc.find(step => step.step_id === row.step_id)){
//its a new step with the ingredient
return acc.concat({
step_id: row.step_id,
step_number: row.step_number,
step_text: row.step_text,
ingredients:[
{
ingredient_id: row.ingredient_id,
ingredient_name: row.ingredient_name,
quantity: row.quantity,
}
]
})
}
//its a step we have encountered before
const repeatingStep= acc.find(step => step.step_id === row.step_id)
repeatingStep.ingredients.push({
ingredient_id: row.ingredient_id,
ingredient_name: row.ingredient_name,
quantity: row.quantity,
})
return acc
}, [])

}
return recipes
}

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


router.get('/:recipe_id', (req, res, next)=>{
Recipe.getRecipeById(req.params.recipe_id)
.then(resource =>{
res.status(200).json(resource)
})
.catch(next)
})












router.use((err, req, res, next)=>{ //eslint-disable-line
res.status(500).json({
customMessage: 'something bad happened',
message: err.message,
stack: err.stack
})
})
module.exports= router
13 changes: 13 additions & 0 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const express = require("express");
const recipesRouter = require("./recipes/recipes-router");
const server = express();

server.use(express.json());


server.use("/api/recipes", recipesRouter);

server.use('*', (req, res)=>{
res.json({api: 'up'})
})
module.exports = server;
Binary file added data/cook_book.db3
Binary file not shown.
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 configurations = require('../knexfile.js')
const environment = process.env.NODE_ENV

module.exports = knex(configurations[environment])
58 changes: 58 additions & 0 deletions data/migrations/20231208005234_initial-migration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
exports.up = async function (knex) {
await knex.schema
.createTable('recipes', table =>{
table.increments('recipe_id')
table.string('recipe_name', 200).notNullable().unique()
})
.createTable('ingredients', table =>{
table.increments('ingredient_id')
table.string('ingredient_name', 200).notNullable().unique()
table.string('ingredient_unit', 50)
})
// ...

.createTable('steps', (table) => {
table.increments('step_id');
table.string('step_text', 200).notNullable();
table.integer('step_number').notNullable();
table
.integer('recipe_id')
.unsigned()
.notNullable()
.references('recipe_id')
.inTable('recipes') // Corrected table name here
.onDelete('RESTRICT')
.onUpdate('RESTRICT');
})

.createTable('step_ingredients', table =>{
table.increments('step_ingredient_id')
table.float('quantity').notNullable()
table.integer('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('step_ingredients')
.dropTableIfExists('steps')
.dropTableIfExists('ingredients')
.dropTableIfExists('recipes')
};
10 changes: 10 additions & 0 deletions data/seeds/01-cleanup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const { clean } = require('knex-cleaner')

exports.seed = function (knex) {
return clean(knex, {
mode:'truncate',
ignoreTables:['knex_migrations', 'knex_migrations_lock']
})

}

44 changes: 44 additions & 0 deletions data/seeds/02-make-recipes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
const recipes = [
{recipe_name: 'Brocoli Pesto Pasta'},
{recipe_name: 'Lemon Chicken'},
{recipe_name: 'Salmon em Papillote'},
]
const ingredients = [
{ ingredient_name: 'Broccoli', ingredient_unit: 'lbs'},
{ ingredient_name: 'Pesto', ingredient_unit: 'lbs'},
{ ingredient_name: 'Pasta', ingredient_unit: 'lbs'},
{ ingredient_name: 'Lemon', ingredient_unit: 'slices'},
{ ingredient_name: 'Chicken', ingredient_unit: 'kilos'},
{ ingredient_name: 'Salmon', ingredient_unit: 'grams'},

]
const step_ingredients=[
//broccoli
{step_id:2, ingredient_id:1, quantity:1},
{step_id:3, ingredient_id:2, quantity:1.5},
{step_id:3, ingredient_id:3, quantity:2},
//lemon chicken
{step_id:5, ingredient_id:4, quantity:1},
{step_id:5, ingredient_id:5, quantity:0.4},
//salmon
{step_id:7, ingredient_id:6, quantity:1},
]
const steps = [
//Broccoli pesto pasta
{step_text:'Heat pan', step_number:1, recipe_id:1},
{step_text:'Add brocoli', step_number:2, recipe_id:1},
{step_text:'Add pesto mixed with pasta', step_number:3, recipe_id:1},
//Lemon chicken
{step_text:'Heat Oven', step_number:1, recipe_id:2},
{step_text:'Put chicken and lemon in oven', step_number:2, recipe_id:2},
{step_text:'Put in oven at 500 degrees', step_number:3, recipe_id:2},
//salmon
{step_text:'Fish a salmon in the pajaro river', step_number:1, recipe_id:3},
{step_text:'Cook salmon', step_number:2, recipe_id:3},
]
exports.seed = async function(knex){
await knex('recipes').insert(recipes)
await knex('ingredients').insert(ingredients)
await knex('steps').insert(steps)
await knex("step_ingredients").insert(step_ingredients)
}
7 changes: 7 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
require('dotenv').config()

const server= require('./api/server.js')

const port = process.env.PORT

server.listen(port, ()=> console.log(`\nApi running on port ${port}\n`))
21 changes: 21 additions & 0 deletions knexfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const sharedConfig = {
client: 'sqlite3',
migrations:{directory: './data/migrations'},
seeds: {directory:'./data/seeds'},
//sqlite3
useNullAsDefault: true,
pool: {afterCreate: (conn, done) => conn.run('PRAGMA foreign_keys = ON', done)},
}

module.exports ={
development:{
...sharedConfig,
connection: {filename: './data/cook_book.db3'},

},
testing:{
...sharedConfig,
connection: {filename: './data/cook_book.test.db3'},

}
}
Loading