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
cbd630dd
Commit
cbd630dd
authored
4 months ago
by
조대희
Browse files
Options
Downloads
Patches
Plain Diff
feat: 스케줄 시간 유효성 검사 (
#5
)
parent
3defd9a6
No related branches found
Branches containing commit
No related tags found
2 merge requests
!31
Develop
,
!6
[#5] Schedule 서비스 로직 개발
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
services/scheduleService.js
+60
-1
60 additions, 1 deletion
services/scheduleService.js
with
60 additions
and
1 deletion
services/scheduleService.js
+
60
−
1
View file @
cbd630dd
...
@@ -20,6 +20,18 @@ class schedulService {
...
@@ -20,6 +20,18 @@ class schedulService {
*/
*/
async
createSchedule
({
userId
,
title
,
start_time
,
end_time
,
is_fixed
})
{
async
createSchedule
({
userId
,
title
,
start_time
,
end_time
,
is_fixed
})
{
try
{
try
{
// 일정 시작 시간 - 종료 시간 유효성 검사
if
(
new
Date
(
start_time
)
>=
new
Date
(
end_time
))
{
throw
new
Error
(
'
Start time must be before end time
'
);
}
// 중복 검사
const
overlap
=
await
this
.
checkScheduleOverlap
(
userId
,
start_time
,
end_time
);
if
(
overlap
)
{
throw
new
Error
(
'
Schedule overlaps with existing schedule
'
);
}
const
scehduleData
=
{
const
scehduleData
=
{
user_id
:
userId
,
user_id
:
userId
,
title
,
title
,
...
@@ -49,6 +61,17 @@ class schedulService {
...
@@ -49,6 +61,17 @@ class schedulService {
throw
new
Error
(
'
schedule not found
'
);
throw
new
Error
(
'
schedule not found
'
);
}
}
// 일정 시작 시간 - 종료 시간 유효성 검사
if
(
new
Date
(
updateData
.
start_time
)
>=
new
Date
(
updateData
.
end_time
))
{
throw
new
Error
(
'
Start time must be before end time
'
);
}
// 중복 검사
const
overlap
=
await
this
.
checkScheduleOverlap
(
userId
,
updateData
.
start_time
,
updateData
.
end_time
);
if
(
overlap
)
{
throw
new
Error
(
'
Schedule overlaps with existing schedule
'
);
}
// 스케줄 타입 변경하지 못하도록 update값 삭제 -> 기존값 유지
// 스케줄 타입 변경하지 못하도록 update값 삭제 -> 기존값 유지
delete
updateData
.
is_fixed
;
delete
updateData
.
is_fixed
;
...
@@ -153,7 +176,43 @@ class schedulService {
...
@@ -153,7 +176,43 @@ class schedulService {
throw
new
Error
(
`Failed to clean expired schedules:
${
error
.
message
}
`
);
throw
new
Error
(
`Failed to clean expired schedules:
${
error
.
message
}
`
);
}
}
}
}
/**
* 스케줄 중복 검사 -> 기존 스케줄 시간대에 추가 못하도록
*/
async
checkScheduleOverlap
(
userId
,
start_time
,
end_time
,
excludeId
=
null
)
{
try
{
const
where
=
{
user_id
:
userId
,
[
Op
.
or
]:
[
{
// 새로운 스케줄이 기존 스케줄 내 존재
[
Op
.
and
]:
[
{
start_time
:
{
[
Op
.
lte
]:
start_time
}
},
{
end_time
:
{
[
Op
.
gte
]:
start_time
}
}
]
},
{
// 새로운 스케줄이 기존 스케줄을 포함
[
Op
.
and
]:
[
{
start_time
:
{
[
Op
.
gte
]:
start_time
}
},
{
start_time
:
{
[
Op
.
lte
]:
end_time
}
}
]
}
]
};
if
(
excludeId
)
{
where
.
id
=
{
[
Op
.
ne
]:
excludeId
};
}
const
overlappingSchedule
=
await
Schedule
.
findOne
({
where
});
return
overlappingSchedule
;
}
catch
(
error
)
{
throw
new
Error
(
`Failed to check schedule overlap:
${
error
.
message
}
`
);
}
}
}
}
module
.
exports
=
new
scheduleService
();
module
.
exports
=
new
scheduleService
();
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