Merge pull request #544 from traPtitech/fix/issue541

✨ add FilterDuration and replace FilterTime in InitPostEvent…
traPtitech · Jul 1, 2024 · a9a665d · a9a665d
2 parents 959ed1d + 0b24a6a
commit a9a665d
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 3 deletions.
diff --git a/domain/filter/shorthand.go b/domain/filter/shorthand.go
@@ -1,6 +1,7 @@
 package filter
 
 import (
+	"errors"
 	"time"
 
 	"github.com/gofrs/uuid"
@@ -93,3 +94,88 @@ func AddAnd(lhs, rhs Expr) Expr {
 		Rhs:     rhs,
 	}
 }
+
+// 以下のいずれかを満たす
+// * 期間中に始まる (time_start >= since AND time_start < until)
+// * 期間中に終わる (time_end >= since AND time_end < until)
+// * 期間より前に始まり期間より後に終わる (time_start < since AND time_end >= until)
+//
+// ただしsinceがゼロのとき time_start <= until
+// untilがゼロのとき since <= time_end
+// 双方がゼロのき nil を返す
+func FilterDuration(since, until time.Time) (Expr, error) {
+	if since.IsZero() && until.IsZero() {
+		return &CmpExpr{}, nil
+	} else if since.IsZero() {
+		return &CmpExpr{
+			Attr:     AttrTimeStart,
+			Relation: LessEq,
+			Value:    until,
+		}, nil
+	} else if until.IsZero() {
+		return &CmpExpr{
+			Attr:     AttrTimeEnd,
+			Relation: GreterEq,
+			Value:    since,
+		}, nil
+	}
+
+	if since.After(until) {
+		return nil, errors.New("invalid time range")
+	}
+
+	// 期間中に始まる
+	startIn := &LogicOpExpr{
+		LogicOp: And,
+		Lhs: &CmpExpr{
+			Attr:     AttrTimeStart,
+			Relation: GreterEq,
+			Value:    since,
+		},
+		Rhs: &CmpExpr{
+			Attr:     AttrTimeStart,
+			Relation: Less,
+			Value:    until,
+		},
+	}
+
+	// 期間中に終わる
+	endIn := &LogicOpExpr{
+		LogicOp: And,
+		Lhs: &CmpExpr{
+			Attr:     AttrTimeEnd,
+			Relation: GreterEq,
+			Value:    since,
+		},
+		Rhs: &CmpExpr{
+			Attr:     AttrTimeEnd,
+			Relation: Less,
+			Value:    until,
+		},
+	}
+
+	// 期間より前に始まり期間より後に終わる
+	throughout := &LogicOpExpr{
+		LogicOp: And,
+		Lhs: &CmpExpr{
+			Attr:     AttrTimeStart,
+			Relation: Less,
+			Value:    since,
+		},
+		Rhs: &CmpExpr{
+			Attr:     AttrTimeEnd,
+			Relation: GreterEq,
+			Value:    until,
+		},
+	}
+
+	return &LogicOpExpr{
+		LogicOp: Or,
+		Lhs:     throughout,
+		Rhs: &LogicOpExpr{
+			LogicOp: Or,
+			Lhs:     endIn,
+			Rhs:     startIn,
+		},
+	}, nil
+}
diff --git a/utils/cron.go b/utils/cron.go
@@ -27,9 +27,13 @@ func InitPostEventToTraQ(repo *db.GormRepository, secret, channelID, webhookID,
 		tomorrow := now.AddDate(0, 0, 1)
 
 		rooms, _ := repo.GetAllRooms(now, tomorrow, uuid.Nil)
-		events, _ := repo.GetAllEvents(filter.FilterTime(now, tomorrow))
+		expr, err := filter.FilterDuration(now, tomorrow)
+		if err != nil {
+			fmt.Println(err)
+		}
+		events, _ := repo.GetAllEvents(expr)
 		message := createMessage(now, rooms, events, origin)
-		err := RequestWebhook(message, secret, channelID, webhookID, 1)
+		err = RequestWebhook(message, secret, channelID, webhookID, 1)
 		if err != nil {
 			fmt.Println(err)
 		}
@@ -163,7 +167,7 @@ func createMessage(t time.Time, rooms []*domain.Room, events []*db.Event, origin
 	} else {
 		for _, event := range events {
 			eventMessage += fmt.Sprintf("- [%s](%s/events/%s) %s ~ %s @%s %s\n", event.Name, origin, event.ID,
-				event.TimeStart.In(tz.JST).Format("15:04"), event.TimeEnd.In(tz.JST).Format("15:04"),
+				event.TimeStart.In(tz.JST).Format("01/02 15:04"), event.TimeEnd.In(tz.JST).Format("01/02 15:04"),
 				event.Room.Place, combined[event.AllowTogether])
 		}