diff --git a/controllers/meetingController.js b/controllers/meetingController.js index 12ee66a740228e3ee825b171ef6df7a5d1060ccc..b6cc752aac2d645e21f1c5bca4a0e01ff10d95d0 100644 --- a/controllers/meetingController.js +++ b/controllers/meetingController.js @@ -116,6 +116,23 @@ class MeetingController { res.status(500).json({ error: err.message || '모임 상세 조회 실패' }); } } + /* + Delete /api/meetings/:meetingId + */ + async closeMeeting(req,res) + { + + const { meetingId } = req.params; + const userid=req.user.id; + try { + const meetingDetail = await MeetingService.leaveMeeting(meetingId,userId); + res.status(200).json('모임 삭제성공!'); + } catch (err) { + console.error('모임 삭제 오류', err); + res.status(500).json({ error: err.message || '모임삭제 실패' }); + } + } + } module.exports = new MeetingController(); diff --git a/models/fcmToken.js b/models/fcmToken.js index f9fa9207dcf3adaf53875e9c78fd040ee78f4eec..855b833ed49fe0de3b033f59676ce3fbe17c1077 100644 --- a/models/fcmToken.js +++ b/models/fcmToken.js @@ -1,3 +1,4 @@ +//models/friend.js const { DataTypes } = require('sequelize'); const sequelize = require('../config/sequelize'); const User = require('./user'); // 올바른 경로 확인 diff --git a/passport/googleStrategy.js b/passport/googleStrategy.js index 7acaf173e06eef64c1bf1dc82b22b181154801c6..cd23c9d71bce1b6ef26e59ee92bb8d3d3ef1f829 100644 --- a/passport/googleStrategy.js +++ b/passport/googleStrategy.js @@ -5,7 +5,7 @@ const User = require('../models/user'); module.exports = new GoogleStrategy( { - clientID: process.env.GOOGLE_CLIENT_ID, // .env 파일에 설정 + clientID: process.env.GOOGLE_CLIENT_ID, clientSecret: process.env.GOOGLE_CLIENT_SECRET, callbackURL: process.env.CALLBACK_URL, }, diff --git a/services/schedule.test.js b/services/schedule.test.js index 373d1e5b67bb78e5e043483ed798a012bbb1f114..1002f0acca632b902c9e6384d6f0f66c00b92fab 100644 --- a/services/schedule.test.js +++ b/services/schedule.test.js @@ -1,16 +1,14 @@ // test/scheduleService.test.js -const sequelize = require('../config/sequelize'); // 실제 경로에 맞게 수정 +const sequelize = require('../config/sequelize'); const { Schedule, User } = require('../models'); -const ScheduleService = require('../services/scheduleService'); // Uppercase 'S'로 가져오기 +const ScheduleService = require('../services/scheduleService'); const ScheduleResponseDTO = require('../dtos/ScheduleResponseDTO'); beforeAll(async () => { - // 테스트 스위트가 시작되기 전에 데이터베이스를 동기화합니다. await sequelize.sync({ force: true }); }); beforeEach(async () => { - // 각 테스트가 시작되기 전에 기존 데이터를 삭제합니다. await Schedule.destroy({ where: {} }); await User.destroy({ where: {} });