Skip to content
Snippets Groups Projects
Commit 5fe4877b authored by 조대희's avatar 조대희
Browse files

fix: 중복되는 코드 주석 처리 (#19)

parent aebab4f5
No related branches found
No related tags found
2 merge requests!31Develop,!26[#19] 통합 테스트 제작 및 서비스 로직 추가/수정
......@@ -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');
......
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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment