Merge branch 'main' into filestore-test-server

Author: ackleymi

config/configuration.go

@@ -35,6 +35,7 @@ const (
 	EndTime                      string = "EndTime"
 	StartDay                     string = "StartDay"
 	EndDay                       string = "EndDay"
+	Weekdays                     string = "Weekdays"
 	TimeZone                     string = "TimeZone"
 	DataDictionary               string = "DataDictionary"
 	TransportDataDictionary      string = "TransportDataDictionary"

config/doc.go

@@ -84,16 +84,22 @@ Time of day that this FIX session becomes deactivated. Valid Values:
 
 # StartDay
 
-For week long sessions, the starting day of week for the session. Use in combination with StartTime. Valid Values:
+For week long sessions, the starting day of week for the session. Use in combination with StartTime. Incompatible with Weekdays. Valid Values:
 
 	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
 
 # EndDay
 
-For week long sessions, the ending day of week for the session. Use in combination with EndTime. Valid Values:
+For week long sessions, the ending day of week for the session. Use in combination with EndTime. Incompatible with Weekdays. Valid Values:
 
 	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
 
+# Weekdays
+
+For daily sessions that are only active on specific days of the week. Use in combination with StartTime and EndTime. Incompatible with StartDay and EndDay. Valid Values:
+
+	Comma delimited list of days of the week in English, or 3 letter abbreviation (e.g. "Monday,Tuesday,Wednesday" or "Mon,Tue,Wed" would both be valid values).
+
 # EnableLastMsgSeqNumProcessed
 
 Add the last message sequence number processed in the header (optional tag 369).  Valid Values:

internal/time_range.go

@@ -36,42 +36,67 @@ func ParseTimeOfDay(str string) (TimeOfDay, error) {
 // TimeRange represents a time band in a given time zone.
 type TimeRange struct {
 	startTime, endTime TimeOfDay
+	weekdays           []time.Weekday
 	startDay, endDay   *time.Weekday
 	loc                *time.Location
 }
 
 // NewUTCTimeRange returns a time range in UTC.
-func NewUTCTimeRange(start, end TimeOfDay) *TimeRange {
-	return NewTimeRangeInLocation(start, end, time.UTC)
+func NewUTCTimeRange(start, end TimeOfDay, weekdays []time.Weekday) (*TimeRange, error) {
+	return NewTimeRangeInLocation(start, end, weekdays, time.UTC)
 }
 
 // NewTimeRangeInLocation returns a time range in a given location.
-func NewTimeRangeInLocation(start, end TimeOfDay, loc *time.Location) *TimeRange {
+func NewTimeRangeInLocation(start, end TimeOfDay, weekdays []time.Weekday, loc *time.Location) (*TimeRange, error) {
+
 	if loc == nil {
-		panic("time: missing Location in call to NewTimeRangeInLocation")
+		return nil, errors.New("time: missing Location in call to NewTimeRangeInLocation")
 	}
 
-	return &TimeRange{startTime: start, endTime: end, loc: loc}
+	return &TimeRange{
+		startTime: start,
+		endTime:   end,
+		weekdays:  weekdays,
+		loc:       loc,
+	}, nil
 }
 
 // NewUTCWeekRange returns a weekly TimeRange.
-func NewUTCWeekRange(startTime, endTime TimeOfDay, startDay, endDay time.Weekday) *TimeRange {
+func NewUTCWeekRange(startTime, endTime TimeOfDay, startDay, endDay time.Weekday) (*TimeRange, error) {
 	return NewWeekRangeInLocation(startTime, endTime, startDay, endDay, time.UTC)
 }
 
 // NewWeekRangeInLocation returns a time range in a given location.
-func NewWeekRangeInLocation(startTime, endTime TimeOfDay, startDay, endDay time.Weekday, loc *time.Location) *TimeRange {
-	r := NewTimeRangeInLocation(startTime, endTime, loc)
+func NewWeekRangeInLocation(startTime, endTime TimeOfDay, startDay, endDay time.Weekday, loc *time.Location) (*TimeRange, error) {
+	r, err := NewTimeRangeInLocation(startTime, endTime, []time.Weekday{}, loc)
+	if err != nil {
+		return nil, err
+	}
 	r.startDay = &startDay
 	r.endDay = &endDay
 
-	return r
+	return r, nil
 }
 
 func (r *TimeRange) isInTimeRange(t time.Time) bool {
 	t = t.In(r.loc)
 	ts := NewTimeOfDay(t.Clock()).d
 
+	if len(r.weekdays) > 0 {
+		found := false
+
+		for _, weekday := range r.weekdays {
+			if t.Weekday() == weekday {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			return false
+		}
+	}
+
 	if r.startTime.d < r.endTime.d {
 		return r.startTime.d <= ts && ts <= r.endTime.d
 	}