diff --git a/models/index.js b/models/index.js index 9ad167a836d1ae5924d17bfd1d1f4671a2ab8916..94c499b692695e50655f62d04237f64ae8a8962e 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 0742e555addff1509c7297e1490382a6e8c1c818..f3d5e921dcd3b9c612ab1be39b57a421b073fddd 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,