Merge pull request #82 from ArtNeplatform/feature/#12-getExhibitionList

Hongji03 · web-flow · commit e8953833a20b · 2025-02-15T03:46:53.000+09:00
[fix] 작품구매자 마이페이지 조회 오류 수정
diff --git a/src/domain/Exhibition/ExhibitionModel.js b/src/domain/Exhibition/ExhibitionModel.js
@@ -122,6 +122,45 @@ class Exhibition extends Model {
         throw error;
       }
     }
+
+    // 특정 전시가 사용자의 "마이컬렉션"에 추가되었는지 체크
+    static async getExhibitionDetail(exhibition_id, user_id) {
+      try {
+          const exhibition = await Exhibition.findOne({
+              attributes: ['id', 'title', 'image_url', 'author_id'],
+              where: { id: exhibition_id },
+          });
+
+          if (!exhibition) {
+              return null;
+          }
+
+          const author = await Author.findOne({
+              attributes: ['author_name', 'author_image_url'],
+              where: { id: exhibition.author_id },
+          });
+
+          const isFavorite = await FavoriteExhibition.findOne({
+              where: { user_id, exhibition_id },
+          });
+
+          return {
+              exhibition: {
+                  exhibition_id: exhibition.id,
+                  title: exhibition.title,
+                  image_url: exhibition.image_url,
+                  is_favorite: !!isFavorite, // `true` or `false`
+              },
+              author: {
+                  author_id: exhibition.author_id,
+                  name: author.author_name,
+                  image_url: author.author_image_url,
+              },
+          };
+      } catch (error) {
+          throw error;
+      }
+    }
 }
 // 모델 정의
 Exhibition.init(
diff --git a/src/domain/Exhibition/exhibitionRoutes.js b/src/domain/Exhibition/exhibitionRoutes.js
@@ -1,5 +1,6 @@
 import express from 'express';
 import Exhibition from './ExhibitionModel.js'; // Exhibition 모델 불러오기
+import FavoriteExhibition from '../Favorite/FavoriteExhibitionModel.js';
 import Artwork from '../Artwork/ArtworkModel.js';  // 작가의 작품 리스트 가져오기
 import Author from '../Author/AuthorModel.js';
 import User from '../User/UserModel.js';
@@ -99,6 +100,7 @@ router.post('/exhibitions', verifyToken, upload.array('exhibition_image', 1), as
 router.get('/exhibitions/:exhibition_id', async (req, res) => {
   try {
     const { exhibition_id } = req.params;
+    const user_id = req.user.id;
 
     const exhibition = await Exhibition.findOne({
       attributes: ['id', 'title', 'image_url', 'author_id'],
@@ -118,6 +120,11 @@ router.get('/exhibitions/:exhibition_id', async (req, res) => {
       return sendResponse(res, status.AUTHOR_NOT_FOUND);
     }
 
+    // 사용자가 해당 전시를 마이컬렉션에 추가했는지 확인
+    const isFavorite = await FavoriteExhibition.findOne({
+      where: { user_id, exhibition_id },
+    });
+
     const authorExhibitions = await Exhibition.findAll({
       attributes: ['id', 'title', 'image_url'],
       where: {
@@ -140,6 +147,7 @@ router.get('/exhibitions/:exhibition_id', async (req, res) => {
         exhibition_id: exhibition.id,
         title: exhibition.title,
         image_url: exhibition.image_url,
+        is_favorite: !!isFavorite, // 마이컬렉션 추가 여부
       },
       author: {
         author_id: exhibition.author_id,
@@ -163,6 +171,87 @@ router.get('/exhibitions/:exhibition_id', async (req, res) => {
   }
 });
 
+// 마이컬렉션 추가 API
+router.post('/exhibitions/:exhibition_id/favorite', verifyToken, async (req, res) => {
+  try {
+      const { email } = req.user;
+      const user = await User.findOne({ where: { email } });
+  
+      if (!user) {
+        return res.status(404).json({ message: "User not found" });
+      }
+  
+      const user_id = user.id;
+      const exhibition_id = Number(req.query.exhibition_id); // id는 숫자로 변환
+
+      if (isNaN(exhibition_id)) {
+        return res.status(400).json({ message: "Invalid exhibition_id" });
+      }
+  
+      // Exhibition 테이블의 id 컬럼과 매칭 확인
+      const existingExhibition = await Exhibition.findOne({ where: { id: exhibition_id } });
+  
+      if (!existingExhibition) {
+        return res.status(400).json({ message: "해당 전시는 존재하지 않습니다." });
+      }
+  
+      // FavoriteExhibitions 테이블에서 exhibition_id가 존재하는지 체크
+      const existingFavorite = await FavoriteExhibition.findOne({
+        where: { user_id, exhibition_id } // exhibition_id가 존재하는지 확인
+      });
+  
+      if (existingFavorite) {
+        return res.status(400).json({ message: "이미 마이컬렉션에 추가된 전시입니다." });
+      }
+  
+      // FavoriteExhibitions 테이블에 데이터 삽입
+      await FavoriteExhibition.create({
+        user_id,
+        exhibition_id, // FavoriteExhibitions의 외래 키
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      });
+
+      return res.status(200).json({ message: "마이컬렉션에 추가되었습니다." });
+  } catch (error) {
+      console.error(error);
+      return res.status(500).json({ message: "서버 오류" });
+  }
+});
+
+// 마이컬렉션 제거 API
+router.delete('/exhibitions/:exhibition_id/favorite', verifyToken, async (req, res) => {
+  try {
+      const { email } = req.user;
+      const user = await User.findOne({ where: { email } });
+
+      if (!user) {
+        return res.status(404).json({ message: "User not found" });
+      }
+
+      const user_id = user.id;
+      const exhibition_id = Number(req.query.exhibition_id); // id를 숫자로 변환
+
+      if (isNaN(exhibition_id)) {
+        return res.status(400).json({ message: "Invalid exhibition_id" });
+      }
+
+      // FavoriteExhibitions 테이블에서 해당 전시가 존재하는지 체크
+      const favorite = await FavoriteExhibition.findOne({ where: { user_id, exhibition_id } });
+
+      if (!favorite) {
+          return res.status(404).json({ message: "마이컬렉션에 없는 전시입니다." });
+      }
+
+      // 데이터 삭제
+      await favorite.destroy();
+
+      return res.status(200).json({ message: "마이컬렉션에서 제거되었습니다." });
+  } catch (error) {
+      console.error(error);
+      return res.status(500).json({ message: "서버 오류" });
+  }
+});
 
 // 전시 수정 API
 router.put('/exhibitions/:id', verifyToken, uploadMiddleware, async (req, res) => {
diff --git a/src/domain/Favorite/FavoriteExhibitionModel.js b/src/domain/Favorite/FavoriteExhibitionModel.js
@@ -0,0 +1,30 @@
+import { DataTypes, Model } from 'sequelize';
+import sequelize from '../sequelize.js';
+import User from '../User/UserModel.js';
+import Exhibition from '../Exhibition/ExhibitionModel.js';
+
+class FavoriteExhibition extends Model {}
+
+FavoriteExhibition.init(
+  {
+    id: { type: DataTypes.BIGINT, primaryKey: true, autoIncrement: true },
+    user_id: { 
+      type: DataTypes.BIGINT, 
+      references: { model: User, key: 'id' }
+    },
+    exhibition_id: { 
+      type: DataTypes.BIGINT, 
+      references: { model: Exhibition, key: 'id' }
+    },
+    createdAt: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW },
+    updatedAt: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW }
+  },
+  {
+    sequelize,
+    modelName: 'FavoriteExhibition',
+    tableName: 'FavoriteExhibitions',
+    timestamps: true
+  }
+);
+
+export default FavoriteExhibition;
diff --git a/src/domain/MyPage/MyPageModel.js b/src/domain/MyPage/MyPageModel.js
@@ -7,8 +7,8 @@ import Exhibition from '../Exhibition/ExhibitionModel.js';
 import Auction from '../Auction/AuctionModel.js';
 import AuctionBid from '../Auction/AuctionbidModel.js';
 import FavoriteArtwork from '../Favorite/FavoriteArtworkModel.js';
-import FavoriteExhibition from '../Favorite/FavoriteExhibition.js';
-import Payment from '../Payment/Payment.js';
+import FavoriteExhibition from '../Favorite/FavoriteExhibitionModel.js';
+import Payment from '../Payment/PaymentModel.js';
 
 class MyPage extends Model {
     // 작품 구매자의 마이페이지 데이터 조회
@@ -22,10 +22,11 @@ class MyPage extends Model {
 
             // 결제 진행 상황 카운트
             const paymentCounts = await Payment.findAll({
-                where: { buyer_id: user_id },
+                where: { user_id: user_id },
                 attributes: [
-                    [sequelize.fn('SUM', sequelize.literal("status = '결제 대기중'")), 'pending'],
-                    [sequelize.fn('SUM', sequelize.literal("status = '결제 완료'")), 'completed'],
+                    [sequelize.fn('SUM', sequelize.literal("payment_status = '결제 대기중'")), 'pending'],
+                    [sequelize.fn('SUM', sequelize.literal("payment_status = '결제 완료'")), 'completed'],
+                    [sequelize.fn('SUM', sequelize.literal("payment_status = '수령 완료'")), 'received'],
                 ],
                 raw: true,
             });
@@ -50,15 +51,21 @@ class MyPage extends Model {
 
             // 결제 내역 (최대 3개) + `payment_id` 추가
             const payments = await Payment.findAll({
-                where: { buyer_id: user_id },
+                where: { user_id: user_id },
                 attributes: ['id', 'auction_id', 'payment_price', 'created_at', 'payment_status'], 
                 include: [{
-                    model: Artwork,
-                    as: 'artwork',
-                    attributes: ['title'],
-                    include: [{ model: User, as: 'author', attributes: ['author_name', 'profile_image_url'] }]
+                    model: Auction,
+                    as: 'auction',
+                    attributes: ['artwork_id'], 
+                    include: [{
+                        model: Artwork,
+                        as: 'artwork',
+                        attributes: ['title'],
+                        include: [{ model: Author, as: 'author', attributes: ['author_name', 'author_image_url'] }] // 수정된 부분
+                    }]
                 }],
-                limit: 3, order: [['created_at', 'DESC']],
+                limit: 3, 
+                order: [['created_at', 'DESC']],
             });
 
             // 좋아요한 작품 조회
@@ -69,14 +76,13 @@ class MyPage extends Model {
                     model: Artwork,
                     as: 'artwork',
                     attributes: ['id', 'title', 'thumbnail_image_url', 'height', 'width'],
-                    include: [{ model: Author, as: 'author', attributes: ['author_name', 'profile_image_url'] }]
+                    include: [{ model: Author, as: 'author', attributes: ['author_name', 'author_image_url'] }]
                 }]
             });
 
             // 좋아요한 전시 조회
             const likedExhibitions = await FavoriteExhibition.findAll({
                 where: { user_id: user_id },
-                attributes: ['exhibition_id'],
                 include: [{
                     model: Exhibition,
                     as: 'exhibition',
diff --git a/src/domain/sequelizeRelations.js b/src/domain/sequelizeRelations.js
@@ -7,6 +7,7 @@ import Payment from './Payment/PaymentModel.js';
 import FavoriteArtwork from './Favorite/FavoriteArtworkModel.js'; 
 import FavoriteAuction from './Favorite/FavoriteAuctionModel.js';
 import Exhibition from './Exhibition/ExhibitionModel.js';
+import FavoriteExhibition from './Favorite/FavoriteExhibitionModel.js';
 
 Author.belongsTo(User, { foreignKey: 'user_id' }); 
 Artwork.belongsTo(Author, { foreignKey: 'author_id', as: 'author' });
@@ -24,4 +25,7 @@ FavoriteAuction.belongsTo(Auction, { foreignKey: 'auction_id' });
 Author.hasMany(Exhibition, { foreignKey: 'author_id' });
 Exhibition.belongsTo(Author, { foreignKey: 'author_id' });
 Exhibition.hasMany(Artwork, { foreignKey: 'exhibition_id', as: 'artworks' });
-Artwork.belongsTo(Exhibition, { foreignKey: 'exhibition_id', as: 'exhibition' });
+Artwork.belongsTo(Exhibition, { foreignKey: 'exhibition_id', as: 'exhibition' });
+Payment.belongsTo(Artwork, { foreignKey: 'auction_id', targetKey: 'id', as: 'artwork', through: Auction });
+FavoriteExhibition.belongsTo(User, { foreignKey: 'user_id', as: 'user' });
+FavoriteExhibition.belongsTo(Exhibition, { foreignKey: 'exhibition_id', as: 'exhibition' });
