From 5fe4877b1832c1ce703c86c1f4956f8185e4dd67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A1=B0=EB=8C=80=ED=9D=AC?= <joedaehui@ajou.ac.kr>
Date: Tue, 26 Nov 2024 20:53:08 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A4=91=EB=B3=B5=EB=90=98=EB=8A=94=20?=
=?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC=20?=
=?UTF-8?q?(#19)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
models/index.js | 2 --
services/meetingService.js | 24 ++++++++++++------------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/models/index.js b/models/index.js
index 9ad167a..94c499b 100644
--- a/models/index.js
+++ b/models/index.js
@@ -2,10 +2,8 @@
const sequelize = require('../config/sequelize');
const User = require('./user');
-const Friend = require('./Friend');
const Schedule = require('./Schedule');
const Meeting = require('./Meeting');
-const MeetingParticipant = require('./MeetingParticipant'); //폴더명수정
const Friend = require('./Friend');
const FcmToken = require('./fcmToken');
const MeetingParticipant = require('./MeetingParticipant');
diff --git a/services/meetingService.js b/services/meetingService.js
index 0742e55..f3d5e92 100644
--- a/services/meetingService.js
+++ b/services/meetingService.js
@@ -1,7 +1,7 @@
-const { Meeting, MeetingParticipant, User, Schedule } = require('../models');
-const ChatRoom = require('../models/chatRooms');
-const FcmToken = require('../models/fcmToken');
+// const { Meeting, MeetingParticipant, User, Schedule } = require('../models');
+// const ChatRoom = require('../models/chatRooms');
+// const FcmToken = require('../models/fcmToken');
// services/meetingService.js
const { v4: uuidv4 } = require('uuid');
const { Op } = require('sequelize');
@@ -52,15 +52,15 @@ class MeetingService {
const userFcmTokens = user.fcmTokenList.map((fcmToken) => fcmToken.token);
// 스케줄 충돌 확인
- const hasConflict = await ScheduleService.checkScheduleOverlap(
- created_by,
- new Date(start_time),
- new Date(end_time)
- );
-
- if (hasConflict) {
- throw new Error('스케줄이 겹칩니다. 다른 시간을 선택해주세요.');
- }
+ // const hasConflict = await ScheduleService.checkScheduleOverlap(
+ // created_by,
+ // new Date(start_time),
+ // new Date(end_time)
+ // );
+
+ // if (hasConflict) {
+ // throw new Error('스케줄이 겹칩니다. 다른 시간을 선택해주세요.');
+ // }
const hasConflict = await ScheduleService.checkScheduleOverlapByTime(
created_by,
--
GitLab