Merge pull request #2 from gdjy098/feature/favorites

Add recipe favorites

Author: gdjy098

__tests__/routes.test.js

@@ -106,6 +106,56 @@ describe('Routes', () => {
     expect(response.headers.location).toBe('/login');
   });
 
+  test('POST /recipes/:id/favorite should save a recipe for the user', async () => {
+    const agent = request.agent(app);
+    await agent
+      .post('/register')
+      .send({ username: 'favuser', password: 'password123' });
+
+    await agent
+      .post('/recipes')
+      .send({ title: 'Favorite Recipe', ingredients: 'Test', method: 'Test' });
+
+    const recipe = await db.get('SELECT * FROM recipes WHERE title = ?', ['Favorite Recipe']);
+    expect(recipe).toBeDefined();
+
+    const response = await agent
+      .post(`/recipes/${recipe.id}/favorite`)
+      .send();
+
+    expect(response.status).toBe(302);
+    expect(response.headers.location).toBe(`/recipes/${recipe.id}`);
+
+    const favorite = await db.get('SELECT * FROM favorites WHERE recipe_id = ?', [recipe.id]);
+    expect(favorite).toBeDefined();
+  });
+
+  test('POST /recipes/:id/unfavorite should remove a saved recipe', async () => {
+    const agent = request.agent(app);
+    await agent
+      .post('/register')
+      .send({ username: 'unfavuser', password: 'password123' });
+
+    await agent
+      .post('/recipes')
+      .send({ title: 'Unfavorite Recipe', ingredients: 'Test', method: 'Test' });
+
+    const recipe = await db.get('SELECT * FROM recipes WHERE title = ?', ['Unfavorite Recipe']);
+    expect(recipe).toBeDefined();
+
+    await agent.post(`/recipes/${recipe.id}/favorite`).send();
+
+    const response = await agent
+      .post(`/recipes/${recipe.id}/unfavorite`)
+      .send();
+
+    expect(response.status).toBe(302);
+    expect(response.headers.location).toBe(`/recipes/${recipe.id}`);
+
+    const favorite = await db.get('SELECT * FROM favorites WHERE recipe_id = ?', [recipe.id]);
+    expect(favorite).toBeUndefined();
+  });
+
     test('POST /recipes/:id/delete should delete a recipe', async () => {
       // 先插入一条菜谱
       const recipe = {

__tests__/test-database.js

@@ -30,6 +30,14 @@ async function createTables(db) {
 		username TEXT NOT NULL UNIQUE,
 		password_hash TEXT NOT NULL
 	)`)
+
+	// Create the 'favorites' table to link users to recipes
+	await db.exec(`CREATE TABLE IF NOT EXISTS favorites (
+		id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+		user_id INTEGER NOT NULL,
+		recipe_id INTEGER NOT NULL,
+		UNIQUE(user_id, recipe_id)
+	)`)
 }
 
 module.exports = { getTestDbConnection, initializeTestDb }

src/database/schema.js

@@ -14,6 +14,14 @@ async function createTables(db) {
     username TEXT NOT NULL UNIQUE,
     password_hash TEXT NOT NULL
   )`)
+
+  // Create the 'favorites' table to link users to recipes
+  await db.exec(`CREATE TABLE IF NOT EXISTS favorites (
+    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+    user_id INTEGER NOT NULL,
+    recipe_id INTEGER NOT NULL,
+    UNIQUE(user_id, recipe_id)
+  )`)
 }
 
 module.exports = { createTables }

src/routes.js

@@ -25,7 +25,17 @@ router.get('/recipes/:id', async (req, res) => {
 	const db = await getDbConnection()
 	const recipeId = req.params.id
 	const recipe = await db.get('SELECT * FROM recipes WHERE id = ?', [recipeId])
-	res.render('recipe', { recipe })
+	let isFavorited = false
+
+	if (req.session.user && recipe) {
+		const favorite = await db.get(
+			'SELECT id FROM favorites WHERE user_id = ? AND recipe_id = ?',
+			[req.session.user.id, recipeId]
+		)
+		isFavorited = Boolean(favorite)
+	}
+
+	res.render('recipe', { recipe, isFavorited })
 })
 
 router.get('/register', (req, res) => {
@@ -85,7 +95,40 @@ router.post('/logout', (req, res) => {
 })
 
 router.get('/profile', requireAuth, async (req, res) => {
-	res.render('profile', { user: req.session.user })
+	const db = await getDbConnection()
+	const favorites = await db.all(
+		`SELECT recipes.*
+		 FROM recipes
+		 INNER JOIN favorites ON favorites.recipe_id = recipes.id
+		 WHERE favorites.user_id = ?
+		 ORDER BY recipes.title ASC`,
+		[req.session.user.id]
+	)
+	res.render('profile', {
+		user: req.session.user,
+		favorites,
+		hasFavorites: favorites.length > 0,
+	})
+})
+
+router.post('/recipes/:id/favorite', requireAuth, async (req, res) => {
+	const db = await getDbConnection()
+	const recipeId = req.params.id
+	await db.run('INSERT OR IGNORE INTO favorites (user_id, recipe_id) VALUES (?, ?)', [
+		req.session.user.id,
+		recipeId,
+	])
+	res.redirect(`/recipes/${recipeId}`)
+})
+
+router.post('/recipes/:id/unfavorite', requireAuth, async (req, res) => {
+	const db = await getDbConnection()
+	const recipeId = req.params.id
+	await db.run('DELETE FROM favorites WHERE user_id = ? AND recipe_id = ?', [
+		req.session.user.id,
+		recipeId,
+	])
+	res.redirect(`/recipes/${recipeId}`)
 })
 
 router.post('/recipes', async (req, res) => {

views/profile.hbs

@@ -3,7 +3,21 @@
 
     {{#if user}}
         <p>Signed in as <strong>{{user.username}}</strong>.</p>
-        <p>Your saved recipes will appear here once the favorites feature is added.</p>
+        <h2>Saved Recipes</h2>
+        {{#if hasFavorites}}
+            <ul class="favorites-list">
+                {{#each favorites}}
+                    <li class="favorite-item">
+                        <a href="/recipes/{{id}}">{{title}}</a>
+                        <form action="/recipes/{{id}}/unfavorite" method="POST" style="display:inline; margin-left: 10px;">
+                            <button type="submit" class="btn btn-secondary">Remove</button>
+                        </form>
+                    </li>
+                {{/each}}
+            </ul>
+        {{else}}
+            <p>You have not saved any recipes yet.</p>
+        {{/if}}
     {{else}}
         <p>Please <a href="/login">login</a> to view your profile.</p>
     {{/if}}

views/recipe.hbs

@@ -5,6 +5,17 @@
             <div class="recipe-actions">
                 <button class="btn btn-primary" onclick="showEditForm()">Edit Recipe</button>
                 <a href="/recipes" class="btn btn-secondary">Back to All Recipes</a>
+                {{#if currentUser}}
+                    {{#if isFavorited}}
+                        <form action="/recipes/{{recipe.id}}/unfavorite" method="POST" style="display:inline;">
+                            <button type="submit" class="btn btn-secondary">Remove Favorite</button>
+                        </form>
+                    {{else}}
+                        <form action="/recipes/{{recipe.id}}/favorite" method="POST" style="display:inline;">
+                            <button type="submit" class="btn btn-primary">Save Favorite</button>
+                        </form>
+                    {{/if}}
+                {{/if}}
                 <form action="/recipes/{{recipe.id}}/delete" method="POST" style="display:inline;">
                     <button type="submit" class="btn btn-danger" onclick="return confirm('确定要删除该菜谱吗？')">Delete</button>
                 </form>