Include available_from in active filter (#36)

kantacky · web-flow · commit 3a6dde7f54cb · 2026-04-01T22:41:56.000+09:00
diff --git a/internal/repository/announcement.go b/internal/repository/announcement.go
@@ -22,7 +22,7 @@ func (r *announcementRepository) GetAnnouncements(ctx context.Context, query dom
 	dbQuery := r.db.WithContext(ctx)
 
 	if query.FilterIsActive {
-		dbQuery = dbQuery.Where("available_until IS NULL OR available_until > NOW()")
+		dbQuery = dbQuery.Where("available_from <= NOW()").Where("available_until IS NULL OR available_until > NOW()")
 	}
 
 	sortDateDirection := func() string {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (r *announcementRepository) GetAnnouncements(ctx context.Context, query dom`
`22`	`22`	`dbQuery := r.db.WithContext(ctx)`
`23`	`23`
`24`	`24`	`if query.FilterIsActive {`
`25`		`- dbQuery = dbQuery.Where("available_until IS NULL OR available_until > NOW()")`
	`25`	`+ dbQuery = dbQuery.Where("available_from <= NOW()").Where("available_until IS NULL OR available_until > NOW()")`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`sortDateDirection := func() string {`