[#9] fix - jjim api 수정

jjim id로 변경하도록
siliconValleyTeamA · Jan 16, 2021 · bc89d4a · bc89d4a
1 parent 2bdc5d5
commit bc89d4a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/db/project.js b/db/project.js
@@ -59,7 +59,7 @@ async function getProjectDetail({ projectId }) {
 //프로젝트 찜 여부 조회
 async function getUserJjim({ projectId, userId }) {
   const [rows, fields] = await connection.query(
-    `SELECT * from jjim INNER JOIN project ON project.id=jjim.project_id WHERE jjim.user_id=${userId} and project.id=${projectId}`
+    `SELECT *,jjim.id as jjim_id from jjim INNER JOIN project ON project.id=jjim.project_id WHERE jjim.user_id=${userId} and project.id=${projectId}`
   );
   return rows;
 }

diff --git a/db/user.js b/db/user.js
@@ -78,7 +78,7 @@ async function deleteCart(req) {
 //찜 조회
 async function getJjim(req) {
   let [rows, fields] = await connection.query(
-    `SELECT *,jjim.id as jjim_id FROM project INNER JOIN jjim ON project.id=jjim.project_id WHERE user_id=${req.user.id}`
+    `SELECT *,jjim.id as jjim_id FROM project_detail INNER JOIN jjim ON project_detail.id=jjim.project_id WHERE user_id=${req.user.id}`
   );
   return rows;
 }
@@ -95,10 +95,9 @@ async function addJjim({ date, projectId, userId }) {
 }
 
 //찜 삭제
-async function deleteJjim({ projectId, userId }) {
-  const query = mysql.format(
-    `DELETE FROM jjim WHERE project_id = ${projectId} AND user_id = ${userId}`
-  );
+async function deleteJjim(req) {
+  const jjimId = req.body.jjimId;
+  const query = mysql.format(`DELETE FROM jjim WHERE id = ${jjimId}`);
   let [rows, fields] = await connection.query(query);
   return rows;
 }

diff --git a/routes/project.js b/routes/project.js
@@ -50,8 +50,8 @@ router.get("/:projectId/jjim", async function (req, res, next) {
   const projectId = req.params.projectId;
   const userId = 3;
   const rows = await getUserJjim({ projectId, userId });
-  if (rows.length != 0) res.json({ success: true });
-  res.json({ success: false });
+  if (rows.length != 0) res.json(rows[0]);
+  else res.json({ success: false });
 });
 
 module.exports = router;
diff --git a/routes/user.js b/routes/user.js
@@ -110,7 +110,7 @@ router.get("/jjim", async function (req, res, next) {
 
 //찜 추가
 router.post("/jjim", async function (req, res, next) {
-  const projectId = parseInt(req.body.projectId);
+  const projectId = req.body.projectId;
   const userId = 3;
   await addJjim({
     date: new Date(),
@@ -122,12 +122,7 @@ router.post("/jjim", async function (req, res, next) {
 
 //찜 삭제
 router.delete("/jjim", async function (req, res, next) {
-  const projectId = parseInt(req.body.projectId);
-  const userId = 3;
-  await deleteJjim({
-    projectId: projectId,
-    userId: userId,
-  });
+  await deleteJjim(req);
   res.json({ success: true });
 });