Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
WebBack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
websystem
WebBack
Commits
4cdd8110
Commit
4cdd8110
authored
5 months ago
by
조대희
Browse files
Options
Downloads
Patches
Plain Diff
fix: 중복되는 코드 주석 처리 (
#19
)
parent
81cafc34
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
models/index.js
+0
-2
0 additions, 2 deletions
models/index.js
services/meetingService.js
+12
-12
12 additions, 12 deletions
services/meetingService.js
with
12 additions
and
14 deletions
models/index.js
+
0
−
2
View file @
4cdd8110
...
@@ -2,10 +2,8 @@
...
@@ -2,10 +2,8 @@
const
sequelize
=
require
(
'
../config/sequelize
'
);
const
sequelize
=
require
(
'
../config/sequelize
'
);
const
User
=
require
(
'
./user
'
);
const
User
=
require
(
'
./user
'
);
const
Friend
=
require
(
'
./Friend
'
);
const
Schedule
=
require
(
'
./Schedule
'
);
const
Schedule
=
require
(
'
./Schedule
'
);
const
Meeting
=
require
(
'
./Meeting
'
);
const
Meeting
=
require
(
'
./Meeting
'
);
const
MeetingParticipant
=
require
(
'
./MeetingParticipant
'
);
//폴더명수정
const
Friend
=
require
(
'
./Friend
'
);
const
Friend
=
require
(
'
./Friend
'
);
const
FcmToken
=
require
(
'
./fcmToken
'
);
const
FcmToken
=
require
(
'
./fcmToken
'
);
const
MeetingParticipant
=
require
(
'
./MeetingParticipant
'
);
const
MeetingParticipant
=
require
(
'
./MeetingParticipant
'
);
...
...
This diff is collapsed.
Click to expand it.
services/meetingService.js
+
12
−
12
View file @
4cdd8110
const
{
Meeting
,
MeetingParticipant
,
User
,
Schedule
}
=
require
(
'
../models
'
);
//
const { Meeting, MeetingParticipant, User, Schedule } = require('../models');
const
ChatRoom
=
require
(
'
../models/chatRooms
'
);
//
const ChatRoom = require('../models/chatRooms');
const
FcmToken
=
require
(
'
../models/fcmToken
'
);
//
const FcmToken = require('../models/fcmToken');
// services/meetingService.js
// services/meetingService.js
const
{
v4
:
uuidv4
}
=
require
(
'
uuid
'
);
const
{
v4
:
uuidv4
}
=
require
(
'
uuid
'
);
const
{
Op
}
=
require
(
'
sequelize
'
);
const
{
Op
}
=
require
(
'
sequelize
'
);
...
@@ -52,15 +52,15 @@ class MeetingService {
...
@@ -52,15 +52,15 @@ class MeetingService {
const
userFcmTokens
=
user
.
fcmTokenList
.
map
((
fcmToken
)
=>
fcmToken
.
token
);
const
userFcmTokens
=
user
.
fcmTokenList
.
map
((
fcmToken
)
=>
fcmToken
.
token
);
// 스케줄 충돌 확인
// 스케줄 충돌 확인
const
hasConflict
=
await
ScheduleService
.
checkScheduleOverlap
(
//
const hasConflict = await ScheduleService.checkScheduleOverlap(
created_by
,
//
created_by,
new
Date
(
start_time
),
//
new Date(start_time),
new
Date
(
end_time
)
//
new Date(end_time)
);
//
);
if
(
hasConflict
)
{
//
if (hasConflict) {
throw
new
Error
(
'
스케줄이 겹칩니다. 다른 시간을 선택해주세요.
'
);
//
throw new Error('스케줄이 겹칩니다. 다른 시간을 선택해주세요.');
}
//
}
const
hasConflict
=
await
ScheduleService
.
checkScheduleOverlapByTime
(
const
hasConflict
=
await
ScheduleService
.
checkScheduleOverlapByTime
(
created_by
,
created_by
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment