Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 fix timeRangeSub logic #580

Merged
merged 2 commits into from
Jan 28, 2025
Merged

🎨 fix timeRangeSub logic #580

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093d6d5
:art: fix timeRangeSub logic
iChemy Jan 16, 2025
3323e5a
:pencil: revise some comments for condition branches of timeRangeSub
iChemy Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions domain/room.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
type Room struct {
ID uuid.UUID
Place string
// Verifeid indicates if the room has been verified by privileged users.
// Verified indicates if the room has been verified by privileged users.
Verified bool
TimeStart time.Time
TimeEnd time.Time
Expand Down Expand Up @@ -69,6 +69,8 @@ func (r *Room) CalcAvailableTime(allowTogether bool) []StartEndTime {
return availabletime
}

// as: 利用可能な時間帯のリスト
// b: イベントの時間
func timeRangesSub(as []StartEndTime, b StartEndTime) (cs []StartEndTime) {
for _, a := range as {
cs = append(cs, timeRangeSub(a, b)...)
Expand Down Expand Up @@ -96,16 +98,12 @@ func timeRangeSub(a StartEndTime, b StartEndTime) []StartEndTime {
return []StartEndTime{a}
}

/*
a: s###########e
b: ----s####e---
-> s###e----s##e
*/
// 期間 b が 期間 a に包含される場合
if a.TimeStart.Unix() <= b.TimeStart.Unix() && b.TimeEnd.Unix() <= a.TimeEnd.Unix() {
/*
a: --s######e---
b: --s#####e----
-> --------se---
b: --s####e-----
-> -------s#e---
*/
if a.TimeStart.Unix() == b.TimeStart.Unix() {
return []StartEndTime{
Expand All @@ -115,14 +113,20 @@ func timeRangeSub(a StartEndTime, b StartEndTime) []StartEndTime {

/*
a: --s######e---
b: ----s###e----
b: ----s####e---
-> --s#e--------
*/
if a.TimeEnd.Unix() == b.TimeStart.Unix() {
if a.TimeEnd.Unix() == b.TimeEnd.Unix() {
return []StartEndTime{
{a.TimeStart, b.TimeStart},
}
}

/*
a: -s##########e
b: ----s####e---
-> -s##e----s##e
*/
return []StartEndTime{
{a.TimeStart, b.TimeStart},
{b.TimeEnd, a.TimeEnd},
Expand Down
Loading