From 476327cd151c014e39bfced78edb59d68fb783a2 Mon Sep 17 00:00:00 2001
From: tpgus2603 <kakaneymar2424@gmail.com>
Date: Mon, 2 Dec 2024 21:57:38 +0900
Subject: [PATCH] =?UTF-8?q?refactor;=20=EB=AF=B8=ED=8C=85=EC=BB=A8?=
=?UTF-8?q?=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90=20=EB=AF=B8=ED=8C=85?=
=?UTF-8?q?=EB=82=98=EA=B0=80=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80(#22)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
controllers/meetingController.js | 17 +++++++++++++++++
models/fcmToken.js | 1 +
passport/googleStrategy.js | 2 +-
services/schedule.test.js | 6 ++----
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/controllers/meetingController.js b/controllers/meetingController.js
index 12ee66a..b6cc752 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 f9fa920..855b833 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 7acaf17..cd23c9d 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 373d1e5..1002f0a 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: {} });
--
GitLab